rebase to DEV300_m100

author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> 2011-02-14 16:17:22 +0100
committer: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> 2011-02-14 16:17:22 +0100
commit: 0b4b8235de8c85f887d6eafbdce2415c00917806 (patch)
tree: 44c9a0f4b1b5b7e7eff127a9bb3fd8038915727d /testautomation
parent: 6e3b8dfd54a1c9de8a1dd273d2c7e12d6743a6d4 (diff)
parent: cbd577ba3a737b0863156cfcfe46d45189ea95fa (diff)
253 files changed, 687 insertions, 696 deletions
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
deleted file mode 100755
index d61c6183086a..000000000000
--- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
+++ /dev/null
@@ -1,67 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : oliver.craemer@oracle.com
-'*
-'* short description : Load/Save test for chart files - Input: ODS, Output: SDC
-'*
-'\************************************************************************
-
-Global gsFileFormat as String
-Global gsDirectoryInSourcePath as String
-Global gsOutputFileCustomExtension as String
-
-sub main          
-    gsFileFormat = "StarCalc 5.0"        
-    'Important for determination of input file source path
-    '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\"
-    gsDirectoryInSourcePath = "ods"
-    
-    'Custom output file extension. Can be different to result from hGetFilternameExtension.
-    'e.g. "_excel95.xls"
-    gsOutputFileCustomExtension = ".sdc"
-        
-    Printlog "--------------------------------------------------"
-    Printlog "---       Load charts in ODS - SaveAS SDC      ---"
-    Printlog "--------------------------------------------------"
-
-    use "chart2/optional/includes/loadsave/ch2_losa.inc"
-    use "chart2/tools/ch_tools_common.inc"
-    
-    Call hStatusIn("Chart2", "ch2_losa_ods_to_sdc.bas")       
-        call subLoSaFromTo   
-    Call hStatusOut                                 
-end sub
-'
-'-------------------------------------------------------------------------
-'
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    gApplication   = "CALC"
-    Call GetUseFiles
-end sub
diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
deleted file mode 100755
index 7c8e8726f580..000000000000
--- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
+++ /dev/null
@@ -1,68 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : oliver.craemer@oracle.com
-'*
-'* short description : Load/Save test for chart files - Input: SXC, Output: SDC
-'*
-'\************************************************************************
-
-Global gsFileFormat as String
-Global gsDirectoryInSourcePath as String
-Global gsOutputFileCustomExtension as String
-
-sub main      
-    gsFileFormat = "StarCalc 5.0"
-        
-    'Important for determination of input file source path
-    '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\"
-    gsDirectoryInSourcePath = "sxc"
-    
-    'Custom output file extension. Can be different to result from hGetFilternameExtension.
-    'e.g. "_excel95.xls"
-    gsOutputFileCustomExtension = ".sdc"
-    
-    Printlog "--------------------------------------------------"
-    Printlog "---       Load charts in SXC - SaveAS SDC      ---"
-    Printlog "--------------------------------------------------"
-
-    use "chart2/optional/includes/loadsave/ch2_losa.inc"
-    use "chart2/tools/ch_tools_common.inc"
-    
-    Call hStatusIn("Chart2", "ch2_losa_sxc_to_sdc.bas")       
-        Call subLoSaFromTo   
-    Call hStatusOut                                 
-end sub
-'
-'-------------------------------------------------------------------------
-'
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    gApplication   = "CALC"
-    Call GetUseFiles
-end sub
diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
index 0151f5021b3e..f2a6e24e45a2 100644
--- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
+++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
@@ -239,10 +239,10 @@ testcase tDataSeriesWizardCalc
         call DialogTest ( TabChartTypeDataSeries )                    
         printlog "Check if the data series listbox is enabled and contains three entries"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 3 then
-            printlog "    All 3 data series are available"
+        if iDataSeries = 4 then
+            printlog "    All 4 data series are available"
         else
-            warnlog "There are " & iDataSeries & " data series instead of 3"
+            warnlog "There are " & iDataSeries & " data series instead of 4"
         endif                
         printlog "Check if the ADD button is enabled and click the button"
         if AddButton.IsEnabled then
@@ -253,10 +253,10 @@ testcase tDataSeriesWizardCalc
         endif                    
         printlog "Check if there are now four entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 4 then
+        if iDataSeries = 5 then
             printlog "    Adding a data series was successfull"
         else
-            warnlog "There are " & iDataSeries & " data series instead of 4"
+            warnlog "There are " & iDataSeries & " data series instead of 5"
         endif                
         printlog "Check if the second data series was added below the highlighted one"
         if DataSeries.GetSelIndex = 2 then
@@ -271,9 +271,9 @@ testcase tDataSeriesWizardCalc
         else
             warnlog "REMOVE button is not enabled"
         endif                
-        printlog "Check if there are now 3 entries in the data series listbox"
+        printlog "Check if there are now 4 entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
-        if iDataSeries = 3 then
+        if iDataSeries = 4 then
             printlog "    Removing a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 3"
@@ -302,13 +302,14 @@ testcase tDataSeriesWizardCalc
         DataSeries.Select(1)
         if MoveDown.IsEnabled then
             printlog "    The MoveDown button is enabled"            
-            printlog "Click Move Down button twice"
+            printlog "Click Move Down button three times"
+            MoveDown.Click
             MoveDown.Click
             MoveDown.Click
         else
             warnlog "The MoveDown button is disabled"
         endif
-        if DataSeries.GetSelIndex = 3 then
+        if DataSeries.GetSelIndex = 4 then
             printlog "    Moving data series was successfull"
             if MoveDown.IsEnabled then
                 warnlog "MoveDown button is not disabled on first entry"
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 02cc2c883269..806f0f220ed2 100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -71,8 +71,6 @@ sub main
     call tFileSaveAsSTC
     call tFileSaveAsXLS
     call tFileSaveAsXLT
-    call tFileSaveAsSDC
-    call tFileSaveAsVOR
     call tFileReload                
     printLog Chr(13) + "----------  Chart2 View Menu -----------"
     Call tViewToolbars
@@ -112,6 +110,7 @@ sub main
     Call tFormatAxisSecondaryXAxis
     Call tFormatAxisSecondaryYAxis
     Call tFormatAxisAllAxes
+    Call tFormatDateAxis
     Call tFormatXAxisMainGrid
     Call tFormatYAxisMainGrid
     Call tFormatZAxisMainGrid
diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc
index f7166df9c82e..51e41398532e 100644
--- a/testautomation/chart2/required/includes/ch2_file.inc
+++ b/testautomation/chart2/required/includes/ch2_file.inc
@@ -37,8 +37,6 @@
 ' #1 tFileSaveAsSTC
 ' #1 tFileSaveAsXLS
 ' #1 tFileSaveAsXLT
-' #1 tFileSaveAsSDC
-' #1 tFileSaveAsVOR
 ' #1 tFileReload
 '*
 '\************************************************************************
@@ -295,82 +293,7 @@ testcase tFileSaveAsXLT
 endcase
 '
 '-------------------------------------------------------------
-'
-testcase tFileSaveAsSDC
-'///<u><b>Save the test file as StarCalc 5.0 (.sdc)</b></u> 
-    Dim sOutputFile as string
-   
-    sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.sdc" )
 
-    '/// Load simple chart document 
-    if fLoadVerySimpleChartAndSaveLocal() > 0 then
-        warnlog "Loading test document seems to have failed -> Check this out!"
-        goto endsub
-    endif
-    '/// Select chart using navigator 
-    call fSelectFirstOLE
-    '/// Invoke Edit::Object::Edit to enter Inplace Mode 
-    EditObjectEdit
-    '/// Convert chart to 3D (just to edit document) 
-    if NOT fConvertChartTo3D() then
-        warnlog "Conversion of chart to 3D failed -> Quit testcase"
-        Call hCloseDocument
-        goto endsub
-    endif
-    '/// Unselect chart using Escape key 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    '/// Save document as StarCalc 5.0 (.sdc) 
-    if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0" ) then
-        warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting"
-        call hCloseDocument
-        goto endsub
-    endif
-    '/// Close document 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    Call hCloseDocument
-endcase
-'
-'-------------------------------------------------------------
-'
-testcase tFileSaveAsVOR
-'///<u><b>Save the test file as StarCalc 5.0 Template(.vor)</b></u> 
-    Dim sOutputFile as string
-           
-    sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.vor" )
-
-    '/// Load simple chart document 
-    if fLoadVerySimpleChartAndSaveLocal() > 0 then
-        warnlog "Loading test document seems to have failed -> Check this out!"
-        goto endsub
-    endif
-    '/// Select chart using navigator 
-    call fSelectFirstOLE
-    '/// Invoke Edit::Object::Edit to enter Inplace Mode 
-    EditObjectEdit
-    '/// Convert chart to 3D (just to edit document) 
-    if NOT fConvertChartTo3D() then
-        warnlog "Conversion of chart to 3D failed -> Quit testcase"
-        Call hCloseDocument
-        goto endsub
-    endif
-    '/// Unselect chart using Escape key 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    '/// Save document as StarCalc 5.0 Template(.vor) 
-    if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0 Vorlage/Template" ) then
-        warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting"
-        call hCloseDocument
-        goto endsub
-    endif
-    '/// Close document 
-    Kontext "DocumentCalc"
-    DocumentCalc.TypeKeys "<Escape>"
-    Call hCloseDocument
-endcase
-'
-'-------------------------------------------------------------
 '
 testcase tFileReload
     printlog "Load simple chart document" 
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index 42048cbbb7de..27575ca4324f 100644
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -47,6 +47,7 @@
 ' #1 tFormatAxisSecondaryXAxis
 ' #1 tFormatAxisSecondaryYAxis
 ' #1 tFormatAxisAllAxes
+' #1 tFormatDateAxis
 '*
 '\************************************************************************
 
@@ -1404,4 +1405,40 @@ testcase tFormatAxisAllAxes
 
 
 endcase
+'
+'-------------------------------------------------------------
+'
+testcase tFormatDateAxis
 
+    printlog "Load simple chart document"
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog " Select chart using navigator"
+    call fSelectFirstOLE
+    printlog "Edit / Object / Edit"
+    EditObjectEdit
+    sleep(1)
+    printlog "Invoke Format::Axis::X Axis"
+    FormatAxisXAxis
+    printlog "Goto tab page Scale"
+    Kontext
+    Active.SetPage TabChartAxisScale
+    Kontext "TabChartAxisScale"
+    printlog " Switch axis type to Date"
+    AxisType.Select (3)
+    printlog " Verify that the date controls are available"
+    if MinorIntervalUnit.exists then
+        call DialogTest ( TabChartAxisScale,2 )
+        else
+            warnlog "Datecontrols are not available"
+    end if
+    printlog " Close dialog"
+    TabChartAxisScale.Cancel
+    printlog "Close document"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    Call hCloseDocument
+
+endcase
diff --git a/testautomation/dbaccess/optional/dba_rpt_Charts.bas b/testautomation/dbaccess/optional/dba_rpt_Charts.bas
new file mode 100644
index 000000000000..abe7817c7842
--- /dev/null
+++ b/testautomation/dbaccess/optional/dba_rpt_Charts.bas
@@ -0,0 +1,47 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : marc.neumann@oracle.com
+'*
+'* short description : Charts in Reports
+'*
+'\***********************************************************************
+
+sub main
+
+    use "dbaccess/optional/includes/rpt_Charts.inc"
+
+    call rpt_Charts
+
+end sub
+
+sub LoadIncludeFiles
+   use "dbaccess/tools/dbinit.inc"
+   Call sDBInit
+   Call GetUseFiles
+   gApplication   = "WRITER"
+end sub
diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
index 93f864d7e0d4..cc3be846569c 100644
--- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
@@ -192,13 +192,13 @@ testcase db_JDBCMySQL
 
     dbok = fCreateMySQL_JDBC_Datasource(sFileName,aDatabaseProperties(3),aDatabaseProperties(2),aDatabaseProperties(4),aDatabaseProperties(5))
     if dbok = true then
-        'call fOpendatabase(sFileName,aDatabaseProperties(6))
-        'call fCreateTable( aFieldTypeContent(), sTableName)
-        'call fInsertIntoTable( aFieldContent(), sTableName)
-        'call fCloseDatabase
+        call fOpendatabase(sFileName,aDatabaseProperties(6))
+        call fCreateTable( aFieldTypeContent(), sTableName)
+        call fInsertIntoTable( aFieldContent(), sTableName)
+        call fCloseDatabase
 
-        'use "dbaccess/optional/includes/b_lvl1_Query.inc"
-        'call b_lvl1_Query(sFileName,"dbase")
+        use "dbaccess/optional/includes/db_Query.inc"
+        call db_Query(sFileName,"MYSQL_JDBC",aDatabaseProperties(6))
 
         call tRelation( sFileName, aDatabaseProperties(6), "rel1", "rel2" )
 
diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc
index 46dce6e903c6..b9d88142698f 100644
--- a/testautomation/dbaccess/optional/includes/db_Query.inc
+++ b/testautomation/dbaccess/optional/includes/db_Query.inc
@@ -45,7 +45,9 @@ function db_Query( sFileName , optional sType , optional sPassword)
             case "ODBC", "JDBC"
                 sType = "2"
             case "HSQLDB"
-                sType = "2"   
+                sType = "2"
+            case "MYSQL_JDBC"
+                sType = "3"
             case else
                 sType = "1"
         end select
@@ -57,6 +59,10 @@ function db_Query( sFileName , optional sType , optional sPassword)
         call tQueryJoin( sFileName , sType, sPassword )
         call tQueriesInQueries(sFileName)
     endif
+
+    if sType = "3" then 'run only with database type MYSQL_JDBC
+        call tCastQuery( sFileName , sPassword )
+    endif
     
     call tSortQueryWithAlias(sFileName , sPassword)
     
@@ -825,6 +831,46 @@ sub tTest8
     sleep(2)
 end sub
 '--------------------------------------------------------------------
+sub tCastQuery( sFileName , sPassword )
+
+    fOpenDatabase(sFileName,sPassword)
+
+    if ( fOpenNewQueryDesign ) then
+        if ( fChooseTableInQueryAddTableDialog("TT_Query3") ) then
+            Kontext "QueryDesignCriterion"
+                sleep(1)
+                QueryDesignCriterion.TypeKeys "<MOD1 PAGEUP>" , true
+                sleep(1)
+                QueryDesignCriterion.TypeKeys "cast(f_date_s as date)" , true
+                sleep(1)
+                QueryDesignCriterion.TypeKeys "<RETURN>" , true
+                sleep(1)
+            Kontext "Toolbar"
+                printlog "- Executing query"
+                ExecuteBtn.Click
+                sleep(5)
+
+            Kontext "TableView"
+                    if TableView.Exists(3) then
+
+                            DataWindow.TypeKeys "<MOD1 C>"
+                            if GetClipboard <> "40219" then 
+                                warnlog "the result should be 40219 but it is " + GetClipboard 
+                            else
+                                printlog "the result is OK"
+                            endif
+                    else
+                        warnlog "Execution of a query failed!"
+                    end if
+
+            call fCloseQueryDesign
+
+        endif
+    endif
+    call fCloseDatabase
+
+end sub
+'--------------------------------------------------------------------
 function tSortQueryWithAlias(sFileName, optional sPassword) ' test for isse 27832
 
     if IsMissing(sPassword) then
diff --git a/testautomation/dbaccess/optional/includes/rpt_Charts.inc b/testautomation/dbaccess/optional/includes/rpt_Charts.inc
new file mode 100644
index 000000000000..cb7fc8ab1ce4
--- /dev/null
+++ b/testautomation/dbaccess/optional/includes/rpt_Charts.inc
@@ -0,0 +1,94 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner :
+'*
+'* short description :
+'*
+'\***********************************************************************
+
+sub rpt_Charts
+
+    tInsertChart
+
+end sub
+'--------------------------------------------------------------------------------------
+testcase tInsertChart
+
+    printlog "open Bibliography database"
+    call fOpenDataBase(gOfficePath + ConvertPath("user/database/biblio.odb"))
+
+    printlog "open the report designer"
+    call fOpenNewReportDesign
+
+    sleep(1)
+
+    printlog "select the first table in the content list box"
+    Kontext "ReportDataProperties"
+        Content.select 1
+        Content.typeKeys("<RETURN>",true) ' important to leave the listbox
+
+    'close the Add Field dialog to get the focus back to the design
+    call fCloseAddFieldDialog
+
+    printlog "insert a chart"
+  	Kontext "StandardBar"
+   	    CreateChart.Click
+        sleep(1)
+
+    Kontext "ReportDesign"
+        ReportDesign.MouseDown ( 30, 10 )
+        ReportDesign.MouseMove ( 40, 20 )
+        ReportDesign.MouseUp ( 40, 20 )
+
+    sleep(1)
+
+    '/// execute the report
+    printlog "execute the report"
+    call fExecuteReport
+
+    sleep(10)
+
+    '/// check if the report is created
+    printlog "check if the report is created"
+    Kontext "DocumentWriter"
+        if (DocumentWriter.exists(10)) then
+            hFileSaveAsKill(gOfficePath + ConvertPath("user/work/report01.odt"))
+            call fCloseReportView
+        else
+            warnlog "No report is created."
+        endif
+
+    '/// close the report designer
+    printlog "close the report designer"
+    call fCloseReportDesign
+
+    '/// close the database
+    printlog "close the database"
+    call fCloseDatabase
+
+endcase
+\ No newline at end of file
diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
index 91270481ca7b..7ba19ac8e449 100644
--- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
@@ -40,12 +40,7 @@ end sub
 '-------------------------------------------------------------------------
 '-------------------------------------------------------------------------
 '-------------------------------------------------------------------------
-testcase tExecute
-    
-    if (iSprache = 7) then
-        qaerrorlog "due to issue i94729 this testcase does not work under russian."
-        goto endsub
-    endif    
+testcase tExecute     
 
     '/// open Bibliography database
     printlog "open Bibliography database"    
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index cc99d8d203c5..034b1d18fef1 100644
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -1377,14 +1377,7 @@ function fRegisterDatabaseFile( sFileName, sName)
     Kontext "CreateDatabaseLink"
     
         RegisteredName.setText(sName)
-
-        ' this does not work due to issue 115468
-        ' DatabaseFile.setText(sFileName)
-        ' workaround
-        CreatedatabaseLink.typeKeys("<shift tab>")
-        CreatedatabaseLink.typeKeys("<shift tab>")
-        CreatedatabaseLink.typeKeys(sFileName)
-        ' -
+        DatabaseFile.setText(sFileName)
 
         CreateDatabaseLink.OK
         
diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc
index 99c4abf723b3..461ef8ff2da3 100644
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@ -340,6 +340,7 @@ function fCreateTable(aFieldTypeContent(),sTableName,optional sCatalog,optional
         sleep 1
         FieldType.TypeKeys "<RETURN>" , TRUE
         Description.TypeKeys "<RETURN>" , TRUE
+        CellDescription.TypeKeys "<RETURN>" , TRUE
         printlog "-------------------------------"
     next 
     sleep(1)    
diff --git a/testautomation/extensions/optional/e_display_name.bas b/testautomation/extensions/optional/e_display_name.bas
index c05ce235cb25..b0cafa1a8c71 100755
--- a/testautomation/extensions/optional/e_display_name.bas
+++ b/testautomation/extensions/optional/e_display_name.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension display names
 '*
diff --git a/testautomation/extensions/optional/e_fileopen.bas b/testautomation/extensions/optional/e_fileopen.bas
index 63afebe693ba..47223ff61209 100755
--- a/testautomation/extensions/optional/e_fileopen.bas
+++ b/testautomation/extensions/optional/e_fileopen.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : CWS oxtsysint01 enables installing extensions via file open dialog
 '*
diff --git a/testautomation/extensions/optional/e_help.bas b/testautomation/extensions/optional/e_help.bas
index 79420ad9d4de..c68005f75142 100755
--- a/testautomation/extensions/optional/e_help.bas
+++ b/testautomation/extensions/optional/e_help.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extensible help
 '*
diff --git a/testautomation/extensions/optional/e_identifiers.bas b/testautomation/extensions/optional/e_identifiers.bas
index 3eea26b9d46f..fe10332cec61 100755
--- a/testautomation/extensions/optional/e_identifiers.bas
+++ b/testautomation/extensions/optional/e_identifiers.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Use unique identifiers instead of filenames for extensions
 '*
diff --git a/testautomation/extensions/optional/e_issues.bas b/testautomation/extensions/optional/e_issues.bas
index cd3a4fe2f2ad..0e7659d8b7b4 100755
--- a/testautomation/extensions/optional/e_issues.bas
+++ b/testautomation/extensions/optional/e_issues.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension publisher string
 '*
diff --git a/testautomation/extensions/optional/e_location.bas b/testautomation/extensions/optional/e_location.bas
index cfe2f0c0fb19..cfc660bba2d4 100755
--- a/testautomation/extensions/optional/e_location.bas
+++ b/testautomation/extensions/optional/e_location.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the extension locator service
 '*
diff --git a/testautomation/extensions/optional/e_meta-inf.bas b/testautomation/extensions/optional/e_meta-inf.bas
index 1e4e80dc1f0b..0758fd0d1600 100755
--- a/testautomation/extensions/optional/e_meta-inf.bas
+++ b/testautomation/extensions/optional/e_meta-inf.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Case sensitive META-INF file
 '*
diff --git a/testautomation/extensions/optional/e_online_update.bas b/testautomation/extensions/optional/e_online_update.bas
index 0a23d2ad4aa7..8e21d9cd2a34 100755
--- a/testautomation/extensions/optional/e_online_update.bas
+++ b/testautomation/extensions/optional/e_online_update.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Hit update button for an extension
 '*
diff --git a/testautomation/extensions/optional/e_options.bas b/testautomation/extensions/optional/e_options.bas
index bfa0a14e16a5..1f7b6a3e2342 100755
--- a/testautomation/extensions/optional/e_options.bas
+++ b/testautomation/extensions/optional/e_options.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Options for extensions
 '*
diff --git a/testautomation/extensions/optional/e_platforms.bas b/testautomation/extensions/optional/e_platforms.bas
index 3884e374317f..8287060abb2f 100755
--- a/testautomation/extensions/optional/e_platforms.bas
+++ b/testautomation/extensions/optional/e_platforms.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Supported extension platforms
 '*
diff --git a/testautomation/extensions/optional/e_publisher.bas b/testautomation/extensions/optional/e_publisher.bas
index e87d84d05f49..320064c8b633 100755
--- a/testautomation/extensions/optional/e_publisher.bas
+++ b/testautomation/extensions/optional/e_publisher.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension publisher string
 '*
diff --git a/testautomation/extensions/optional/includes/display_name.inc b/testautomation/extensions/optional/includes/display_name.inc
index 080c22fa3a98..e7663c7dc8b6 100644
--- a/testautomation/extensions/optional/includes/display_name.inc
+++ b/testautomation/extensions/optional/includes/display_name.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension display names
 '*
diff --git a/testautomation/extensions/optional/includes/fileopen.inc b/testautomation/extensions/optional/includes/fileopen.inc
index 922e5ece9adc..8c3800f007d8 100644
--- a/testautomation/extensions/optional/includes/fileopen.inc
+++ b/testautomation/extensions/optional/includes/fileopen.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : CWS oxtsysint01 enables installing extensions via file open dialog
 '*
diff --git a/testautomation/extensions/optional/includes/help.inc b/testautomation/extensions/optional/includes/help.inc
index 004fd70ac429..5e6aa357e4b6 100644
--- a/testautomation/extensions/optional/includes/help.inc
+++ b/testautomation/extensions/optional/includes/help.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extensible help
 '*
diff --git a/testautomation/extensions/optional/includes/identifiers.inc b/testautomation/extensions/optional/includes/identifiers.inc
index 1a183f6c8025..dd4d42ca160d 100644
--- a/testautomation/extensions/optional/includes/identifiers.inc
+++ b/testautomation/extensions/optional/includes/identifiers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Use unique identifiers instead of filenames for extensions
 '*
diff --git a/testautomation/extensions/optional/includes/issue110083.inc b/testautomation/extensions/optional/includes/issue110083.inc
index 73f7ad108322..8bd6c38dacee 100755
--- a/testautomation/extensions/optional/includes/issue110083.inc
+++ b/testautomation/extensions/optional/includes/issue110083.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : CWS sb112 fixes a problem with configuration schemas
 '*
diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc
index 262495666cbb..2c1cc45f0b07 100644
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the extension locator service
 '*
diff --git a/testautomation/extensions/optional/includes/meta-inf.inc b/testautomation/extensions/optional/includes/meta-inf.inc
index 4d36586dd908..e9fbd91bf7b3 100644
--- a/testautomation/extensions/optional/includes/meta-inf.inc
+++ b/testautomation/extensions/optional/includes/meta-inf.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Case sensitive META-INF in packages
 '*
diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc
index ce3da2df0622..9f125c1c8a2c 100644
--- a/testautomation/extensions/optional/includes/online_update.inc
+++ b/testautomation/extensions/optional/includes/online_update.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Hit update button for an extension
 '*
diff --git a/testautomation/extensions/optional/includes/options.inc b/testautomation/extensions/optional/includes/options.inc
index ff30ba00847b..e3cc82ba15f2 100644
--- a/testautomation/extensions/optional/includes/options.inc
+++ b/testautomation/extensions/optional/includes/options.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Options for extensions
 '*
diff --git a/testautomation/extensions/optional/includes/platforms.inc b/testautomation/extensions/optional/includes/platforms.inc
index eaac40b777cb..3ba5d4b2bc7f 100644
--- a/testautomation/extensions/optional/includes/platforms.inc
+++ b/testautomation/extensions/optional/includes/platforms.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Supported extension platforms
 '*
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 4fec6ab1bab2..8df7f96724a9 100644
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension publisher and release notes
 '*
diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas
index 89c85cb139fc..7761fae5ebe2 100755
--- a/testautomation/extensions/required/e_update.bas
+++ b/testautomation/extensions/required/e_update.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc
index 22fe13395413..3f63beab2ff0 100644
--- a/testautomation/extensions/required/includes/e_update.inc
+++ b/testautomation/extensions/required/includes/e_update.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/framework/optional/f_basic_dialog_i18n.bas b/testautomation/framework/optional/f_basic_dialog_i18n.bas
index 0c65064803c1..db3b3ddcb705 100755
--- a/testautomation/framework/optional/f_basic_dialog_i18n.bas
+++ b/testautomation/framework/optional/f_basic_dialog_i18n.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Testing the dialog i18n feature of the BASIC IDE
 '*
diff --git a/testautomation/framework/optional/f_basic_documents.bas b/testautomation/framework/optional/f_basic_documents.bas
index 48e78dc2c0c6..40d49e7b7635 100755
--- a/testautomation/framework/optional/f_basic_documents.bas
+++ b/testautomation/framework/optional/f_basic_documents.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : BASIC organizers and documents
 '*
diff --git a/testautomation/framework/optional/f_basic_first.bas b/testautomation/framework/optional/f_basic_first.bas
index d8f749380625..c4d3ecae6448 100755
--- a/testautomation/framework/optional/f_basic_first.bas
+++ b/testautomation/framework/optional/f_basic_first.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : BASIC IDE / Macro dialogs
 '*
diff --git a/testautomation/framework/optional/f_basic_formcontrols.bas b/testautomation/framework/optional/f_basic_formcontrols.bas
index c0f6931d0a19..d3189961f4a2 100755
--- a/testautomation/framework/optional/f_basic_formcontrols.bas
+++ b/testautomation/framework/optional/f_basic_formcontrols.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Form controls in BASIC-IDE dialogs
 '*
diff --git a/testautomation/framework/optional/f_basic_gridcontrol.bas b/testautomation/framework/optional/f_basic_gridcontrol.bas
index dc5f9a392988..de92175ab5ec 100644
--- a/testautomation/framework/optional/f_basic_gridcontrol.bas
+++ b/testautomation/framework/optional/f_basic_gridcontrol.bas
@@ -39,6 +39,7 @@ sub main
 
     hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW )
     call tGridcontrolLoad
+    call tTabcontrolLoad
     hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
 
     call hStatusOut()
diff --git a/testautomation/framework/optional/f_basic_issues.bas b/testautomation/framework/optional/f_basic_issues.bas
index 57e94aa505e4..7dbb5e2855f3 100755
--- a/testautomation/framework/optional/f_basic_issues.bas
+++ b/testautomation/framework/optional/f_basic_issues.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Regression tests for especially annoying BASIC issues
 '*
diff --git a/testautomation/framework/optional/f_basic_library_export_import.bas b/testautomation/framework/optional/f_basic_library_export_import.bas
index f3fc06196a03..73e755ba7926 100755
--- a/testautomation/framework/optional/f_basic_library_export_import.bas
+++ b/testautomation/framework/optional/f_basic_library_export_import.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC libraries
 '*
diff --git a/testautomation/framework/optional/f_basic_modules.bas b/testautomation/framework/optional/f_basic_modules.bas
index ec92e75da4e9..f890b90ea2d7 100755
--- a/testautomation/framework/optional/f_basic_modules.bas
+++ b/testautomation/framework/optional/f_basic_modules.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Modules in BASIC-IDE
 '*
diff --git a/testautomation/framework/optional/f_basic_package_export_import.bas b/testautomation/framework/optional/f_basic_package_export_import.bas
index dd299bda71bb..785f4596475f 100755
--- a/testautomation/framework/optional/f_basic_package_export_import.bas
+++ b/testautomation/framework/optional/f_basic_package_export_import.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC libraries
 '*
diff --git a/testautomation/framework/optional/f_basic_protected_libraries.bas b/testautomation/framework/optional/f_basic_protected_libraries.bas
index db372cc4a232..e0eb4d72dd26 100755
--- a/testautomation/framework/optional/f_basic_protected_libraries.bas
+++ b/testautomation/framework/optional/f_basic_protected_libraries.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test protected libraries
 '*
diff --git a/testautomation/framework/optional/f_basic_shared_modules.bas b/testautomation/framework/optional/f_basic_shared_modules.bas
index d62d56f4e24c..6ff20f05c65a 100755
--- a/testautomation/framework/optional/f_basic_shared_modules.bas
+++ b/testautomation/framework/optional/f_basic_shared_modules.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Access modules below OpenOffice.org macros
 '*
diff --git a/testautomation/framework/optional/f_basic_templatedocuments.bas b/testautomation/framework/optional/f_basic_templatedocuments.bas
index f701417c8648..ba40f8279270 100755
--- a/testautomation/framework/optional/f_basic_templatedocuments.bas
+++ b/testautomation/framework/optional/f_basic_templatedocuments.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : My Macros/standard execution with user defined template
 '*
diff --git a/testautomation/framework/optional/f_basic_vba-compat.bas b/testautomation/framework/optional/f_basic_vba-compat.bas
index 1d867b61edee..3f5d3e376652 100755
--- a/testautomation/framework/optional/f_basic_vba-compat.bas
+++ b/testautomation/framework/optional/f_basic_vba-compat.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA import options and compatibility switches
 '*
diff --git a/testautomation/framework/optional/f_extras_labels.bas b/testautomation/framework/optional/f_extras_labels.bas
index 51722ac38a32..493c55f4aa7d 100755
--- a/testautomation/framework/optional/f_extras_labels.bas
+++ b/testautomation/framework/optional/f_extras_labels.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the names of all labels
 '*
diff --git a/testautomation/framework/optional/f_extras_samplefileopen.bas b/testautomation/framework/optional/f_extras_samplefileopen.bas
index f8484c3f5310..cc435bb6c06a 100755
--- a/testautomation/framework/optional/f_extras_samplefileopen.bas
+++ b/testautomation/framework/optional/f_extras_samplefileopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : open all samples via file-open dialog
 '*
diff --git a/testautomation/framework/optional/f_extras_sampleopen.bas b/testautomation/framework/optional/f_extras_sampleopen.bas
index aa96bb6ab4fa..d7797bb87944 100755
--- a/testautomation/framework/optional/f_extras_sampleopen.bas
+++ b/testautomation/framework/optional/f_extras_sampleopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : open/save/load samples via template dialog
 '*
diff --git a/testautomation/framework/optional/f_extras_samplepreview.bas b/testautomation/framework/optional/f_extras_samplepreview.bas
index 070d7eaf0c39..01e0bed22a2e 100755
--- a/testautomation/framework/optional/f_extras_samplepreview.bas
+++ b/testautomation/framework/optional/f_extras_samplepreview.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : display all samples as preview in template dialog
 '*
diff --git a/testautomation/framework/optional/f_extras_tableautoformat.bas b/testautomation/framework/optional/f_extras_tableautoformat.bas
index 2081369b40c0..a2f816c5f7b7 100755
--- a/testautomation/framework/optional/f_extras_tableautoformat.bas
+++ b/testautomation/framework/optional/f_extras_tableautoformat.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check all names of table autoformats
 '*
diff --git a/testautomation/framework/optional/f_extras_templatefileopen.bas b/testautomation/framework/optional/f_extras_templatefileopen.bas
index 5907f2cb00e5..e8e25ceb109f 100755
--- a/testautomation/framework/optional/f_extras_templatefileopen.bas
+++ b/testautomation/framework/optional/f_extras_templatefileopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : open all templates via file-open dialog
 '*
diff --git a/testautomation/framework/optional/f_extras_templateopen.bas b/testautomation/framework/optional/f_extras_templateopen.bas
index 0b184af060eb..414fdad4f564 100755
--- a/testautomation/framework/optional/f_extras_templateopen.bas
+++ b/testautomation/framework/optional/f_extras_templateopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : open all templates via template dialog
 '*
diff --git a/testautomation/framework/optional/f_extras_templatepreview.bas b/testautomation/framework/optional/f_extras_templatepreview.bas
index 1d50569b42b3..9e3e5d7f2ad4 100755
--- a/testautomation/framework/optional/f_extras_templatepreview.bas
+++ b/testautomation/framework/optional/f_extras_templatepreview.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : show all templates as preview in template dialog
 '*
diff --git a/testautomation/framework/optional/f_filedlg_allowed_names.bas b/testautomation/framework/optional/f_filedlg_allowed_names.bas
index c3d44ee82754..37c58a414ce4 100755
--- a/testautomation/framework/optional/f_filedlg_allowed_names.bas
+++ b/testautomation/framework/optional/f_filedlg_allowed_names.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_autocompletion.bas b/testautomation/framework/optional/f_filedlg_autocompletion.bas
index 21f3addd2af4..e10ac78d17bd 100755
--- a/testautomation/framework/optional/f_filedlg_autocompletion.bas
+++ b/testautomation/framework/optional/f_filedlg_autocompletion.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : Filedialog - check autocompletion and wildcards
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_cjk_files.bas b/testautomation/framework/optional/f_filedlg_cjk_files.bas
index a3e807edad9a..10248a2b8d61 100755
--- a/testautomation/framework/optional/f_filedlg_cjk_files.bas
+++ b/testautomation/framework/optional/f_filedlg_cjk_files.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_dialogtest.bas b/testautomation/framework/optional/f_filedlg_dialogtest.bas
index 8a14571ffe14..a0b299b99ab4 100755
--- a/testautomation/framework/optional/f_filedlg_dialogtest.bas
+++ b/testautomation/framework/optional/f_filedlg_dialogtest.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check the internal file dialog (Dialog)
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_folder_navigation.bas b/testautomation/framework/optional/f_filedlg_folder_navigation.bas
index feacdd291253..6e5620703bff 100755
--- a/testautomation/framework/optional/f_filedlg_folder_navigation.bas
+++ b/testautomation/framework/optional/f_filedlg_folder_navigation.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check the internal file dialog (Folders/Navigation)
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas b/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas
index f2a05d765b05..5e8d2d7e0f0c 100755
--- a/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas
+++ b/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_multiselection.bas b/testautomation/framework/optional/f_filedlg_multiselection.bas
index f25fe68fce74..ce581103000e 100755
--- a/testautomation/framework/optional/f_filedlg_multiselection.bas
+++ b/testautomation/framework/optional/f_filedlg_multiselection.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Select a huge number of documents and load
 '*
diff --git a/testautomation/framework/optional/f_filedlg_passwords.bas b/testautomation/framework/optional/f_filedlg_passwords.bas
index dac9a5258ac4..1dd3af8d51b4 100755
--- a/testautomation/framework/optional/f_filedlg_passwords.bas
+++ b/testautomation/framework/optional/f_filedlg_passwords.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : save and load passworded files
 '*
diff --git a/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas b/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas
index 81359724a57c..661f15361e07 100755
--- a/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas
+++ b/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas b/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas
index 1ca74f352f67..ea47663a6eec 100755
--- a/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas
+++ b/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_help_bookmarks.bas b/testautomation/framework/optional/f_help_bookmarks.bas
index c61241437303..10323714400c 100755
--- a/testautomation/framework/optional/f_help_bookmarks.bas
+++ b/testautomation/framework/optional/f_help_bookmarks.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Bookmarks in the help browser
 '*
diff --git a/testautomation/framework/optional/f_help_compare_applications.bas b/testautomation/framework/optional/f_help_compare_applications.bas
index 2f1d9418477c..e0fd6109a940 100755
--- a/testautomation/framework/optional/f_help_compare_applications.bas
+++ b/testautomation/framework/optional/f_help_compare_applications.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Compare lists from the Help Viewer against references
 '*
diff --git a/testautomation/framework/optional/f_help_compare_content.bas b/testautomation/framework/optional/f_help_compare_content.bas
index 2df5ddc8eb00..a44a54e5253e 100755
--- a/testautomation/framework/optional/f_help_compare_content.bas
+++ b/testautomation/framework/optional/f_help_compare_content.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Compare lists from the Help Viewer against references
 '*
diff --git a/testautomation/framework/optional/f_help_compare_topics.bas b/testautomation/framework/optional/f_help_compare_topics.bas
index 6ac22c441bbe..7e53e77f6aa4 100755
--- a/testautomation/framework/optional/f_help_compare_topics.bas
+++ b/testautomation/framework/optional/f_help_compare_topics.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Compare lists from the Help Viewer against references
 '*
diff --git a/testautomation/framework/optional/f_help_search.bas b/testautomation/framework/optional/f_help_search.bas
index 7479644d0daf..65dfacfd4278 100755
--- a/testautomation/framework/optional/f_help_search.bas
+++ b/testautomation/framework/optional/f_help_search.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Search for a string, apply limitations
 '*
diff --git a/testautomation/framework/optional/f_help_view_topics.bas b/testautomation/framework/optional/f_help_view_topics.bas
index 1cfa9fd5ab30..7be052e96d02 100755
--- a/testautomation/framework/optional/f_help_view_topics.bas
+++ b/testautomation/framework/optional/f_help_view_topics.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : load all index pages in help
 '*
diff --git a/testautomation/framework/optional/f_scripting_organizers.bas b/testautomation/framework/optional/f_scripting_organizers.bas
index 999b40e15a8c..e046b20745cd 100755
--- a/testautomation/framework/optional/f_scripting_organizers.bas
+++ b/testautomation/framework/optional/f_scripting_organizers.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test scripting-organizers / document-stored scripts
 '*
diff --git a/testautomation/framework/optional/f_security_broken_signature.bas b/testautomation/framework/optional/f_security_broken_signature.bas
index 465465d5f39a..ef09f008e2fd 100755
--- a/testautomation/framework/optional/f_security_broken_signature.bas
+++ b/testautomation/framework/optional/f_security_broken_signature.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Document with macro and broken signature
 '*
diff --git a/testautomation/framework/optional/f_security_certification_dialogs.bas b/testautomation/framework/optional/f_security_certification_dialogs.bas
index da7c4a576249..5f200ba11184 100755
--- a/testautomation/framework/optional/f_security_certification_dialogs.bas
+++ b/testautomation/framework/optional/f_security_certification_dialogs.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Walk through a number of dialogs related to digital signatures
 '*
diff --git a/testautomation/framework/optional/f_security_certified_docs.bas b/testautomation/framework/optional/f_security_certified_docs.bas
index cbedea197802..e08bb5104891 100755
--- a/testautomation/framework/optional/f_security_certified_docs.bas
+++ b/testautomation/framework/optional/f_security_certified_docs.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load certified documents and verify the certificate
 '*
diff --git a/testautomation/framework/optional/f_security_evilmacro.bas b/testautomation/framework/optional/f_security_evilmacro.bas
index b34174b70412..ff1bf33dad49 100755
--- a/testautomation/framework/optional/f_security_evilmacro.bas
+++ b/testautomation/framework/optional/f_security_evilmacro.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/f_security_incorrect_password.bas b/testautomation/framework/optional/f_security_incorrect_password.bas
index f10835af3e72..97f711ab2f3d 100755
--- a/testautomation/framework/optional/f_security_incorrect_password.bas
+++ b/testautomation/framework/optional/f_security_incorrect_password.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that documents really get password protected
 '*
diff --git a/testautomation/framework/optional/f_security_macrosecurity.bas b/testautomation/framework/optional/f_security_macrosecurity.bas
index 27bf1de7da4e..047e9961a3d4 100755
--- a/testautomation/framework/optional/f_security_macrosecurity.bas
+++ b/testautomation/framework/optional/f_security_macrosecurity.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Macros with all security-levels
 '*
diff --git a/testautomation/framework/optional/f_security_recommend_password.bas b/testautomation/framework/optional/f_security_recommend_password.bas
index 2807b6f7cd0d..1fdaf3ed0b12 100755
--- a/testautomation/framework/optional/f_security_recommend_password.bas
+++ b/testautomation/framework/optional/f_security_recommend_password.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : checkbox to recommend password protection 
 '*
diff --git a/testautomation/framework/optional/f_security_trusted_path.bas b/testautomation/framework/optional/f_security_trusted_path.bas
index 1d1b21a0eefb..4f667f4c69e1 100755
--- a/testautomation/framework/optional/f_security_trusted_path.bas
+++ b/testautomation/framework/optional/f_security_trusted_path.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Execute macros from trusted path
 '*
diff --git a/testautomation/framework/optional/f_toolbar_items.bas b/testautomation/framework/optional/f_toolbar_items.bas
index 3bacf71ac7af..09340f17554f 100755
--- a/testautomation/framework/optional/f_toolbar_items.bas
+++ b/testautomation/framework/optional/f_toolbar_items.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Update/resource-test for toolbars
 '*
diff --git a/testautomation/framework/optional/f_usage_tracking.bas b/testautomation/framework/optional/f_usage_tracking.bas
index c056aa239624..4be8077635ff 100755
--- a/testautomation/framework/optional/f_usage_tracking.bas
+++ b/testautomation/framework/optional/f_usage_tracking.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Usage tracking
 '*
diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc
index c35900b012e4..72a073f9d68b 100644
--- a/testautomation/framework/optional/includes/basic_delete_modules.inc
+++ b/testautomation/framework/optional/includes/basic_delete_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Delete modules while BASIC is running
 '*
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
index c3db79efc08d..f9b28ff67180 100755..100644
--- a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
+++ b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Copy a control with i18n data
 '*
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
index 89d5614c5b11..6d31d635bc55 100644
--- a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
+++ b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test correct handling of the default language
 '*
diff --git a/testautomation/framework/optional/includes/basic_documents.inc b/testautomation/framework/optional/includes/basic_documents.inc
index 7e6613cdfcbc..1f2d62eaa70c 100644
--- a/testautomation/framework/optional/includes/basic_documents.inc
+++ b/testautomation/framework/optional/includes/basic_documents.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : BASIC organizers and documents
 '*
diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc
index 68d6ae7c80ef..36a4ae35e1ab 100644
--- a/testautomation/framework/optional/includes/basic_formcontrols.inc
+++ b/testautomation/framework/optional/includes/basic_formcontrols.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Basic form-controls
 '*
diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc
index 61d7837df3cb..95bad4d09463 100644
--- a/testautomation/framework/optional/includes/basic_gridcontrol.inc
+++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc
@@ -32,7 +32,6 @@
 '\******************************************************************************
 
 testcase tGridcontrolLoad
-
     const MACRO_NAME = "Show"
     const FILE_NAME  = "framework/optional/input/gridcontrol.odt"
 
@@ -91,7 +90,58 @@ testcase tGridcontrolLoad
     printlog( "Test exit, cleanup" )
     hFileCloseAll()
     hDeleteFile( gLastWorkFile )
+endcase
+
+
+testcase tTabcontrolLoad
+    const MACRO_NAME = "ShowTab"
+    const FILE_NAME  = "framework/optional/input/gridcontrol.odt"
+
+    dim i as integer
+    dim a as integer
 
+    printlog( "Open the test document: " & FILE_NAME )
+    call hFileOpenLocally( gTestToolPath & FILE_NAME )
+
+    printlog "Start the macro, that performs the test"
+    hExecMacro( MACRO_NAME )
+    
+    Kontext "tabcontroldialog"
+    if tabcontroldialog.exists(5) then
+        if tabcontainer.getPageCount = 2 then
+            printlog "There are 2 tabs"
+        else
+            warnlog "There are NOT 2 tabs, there are: " + tabcontainer.getpagecount
+        endif
+        if tabcontainer.getPage = "tabcontrol_1" then
+            printlog "Default tab page is page 1"
+        else
+            warnlog "Default tab page is NOT page 1"
+        endif
+        tabcontainer.setPage tabcontrol_2
+        wait 1000
+        if tabcontainer.getPage = "tabcontrol_2" then
+            printlog "Switching to tab 2 works"
+        else
+            warnlog "Switching to tab 2 failed"
+        endif
+        tabcontainer.setPage tabcontrol_1
+        wait 1000
+        if tabcontainer.getPage = "tabcontrol_1" then
+            printlog "Switching to tab 1 works"
+        else
+            warnlog "Switching to tab 1 failed"
+        endif
+
+        Kontext "tabcontroldialog"
+        tabcontroldialog.close
+    else
+        warnlog "tabcontrol Dialog did not come up after pressing button"
+    endif
+
+    printlog( "Test exit, cleanup" )
+    hFileCloseAll()
+    hDeleteFile( gLastWorkFile )
 endcase
 
 
diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc
index eabaadf3176a..6537b8f8c80f 100644
--- a/testautomation/framework/optional/includes/basic_ide.inc
+++ b/testautomation/framework/optional/includes/basic_ide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Macro Dialogs opened from Basic-IDE
 '*
diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc
index 3fec49f61fbe..32ddb1390d85 100755
--- a/testautomation/framework/optional/includes/basic_issues.inc
+++ b/testautomation/framework/optional/includes/basic_issues.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Regression tests for especially annoying BASIC issues
 '*
diff --git a/testautomation/framework/optional/includes/basic_library_export.inc b/testautomation/framework/optional/includes/basic_library_export.inc
index 9d539e2a82a0..942d87b25062 100644
--- a/testautomation/framework/optional/includes/basic_library_export.inc
+++ b/testautomation/framework/optional/includes/basic_library_export.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC library (flat)
 '*
diff --git a/testautomation/framework/optional/includes/basic_library_import.inc b/testautomation/framework/optional/includes/basic_library_import.inc
index f6b62e99c7ea..cb82055e95f1 100644
--- a/testautomation/framework/optional/includes/basic_library_import.inc
+++ b/testautomation/framework/optional/includes/basic_library_import.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Import BASIC library (flat)
 '*
diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc
index dc58e21f1dea..cc8ff04fb408 100644
--- a/testautomation/framework/optional/includes/basic_macros.inc
+++ b/testautomation/framework/optional/includes/basic_macros.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : check macro-dialogs / BASIC-IDE ( 1. part )
 ' **
diff --git a/testautomation/framework/optional/includes/basic_modulehide.inc b/testautomation/framework/optional/includes/basic_modulehide.inc
index fe492590c41b..c6daea7e834f 100644
--- a/testautomation/framework/optional/includes/basic_modulehide.inc
+++ b/testautomation/framework/optional/includes/basic_modulehide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that hiding modules works
 '*
diff --git a/testautomation/framework/optional/includes/basic_modulenames.inc b/testautomation/framework/optional/includes/basic_modulenames.inc
index 6b166c54680a..ed076927f2c1 100644
--- a/testautomation/framework/optional/includes/basic_modulenames.inc
+++ b/testautomation/framework/optional/includes/basic_modulenames.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test modulenames on the tabbar
 '*
diff --git a/testautomation/framework/optional/includes/basic_modules.inc b/testautomation/framework/optional/includes/basic_modules.inc
index 14e3aedca6db..9a227484846c 100644
--- a/testautomation/framework/optional/includes/basic_modules.inc
+++ b/testautomation/framework/optional/includes/basic_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Edit several modules and dialogs in basic ide
 '*
diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index b389c750e51d..6b80282185be 100644
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Export BASIC libraries as package
 '*
diff --git a/testautomation/framework/optional/includes/basic_package_import.inc b/testautomation/framework/optional/includes/basic_package_import.inc
index 80fe04cc92d4..ef9a5938c799 100644
--- a/testautomation/framework/optional/includes/basic_package_import.inc
+++ b/testautomation/framework/optional/includes/basic_package_import.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Import BASIC library via Package Manager GUI as UNO Package
 '*
diff --git a/testautomation/framework/optional/includes/basic_protected_libraries.inc b/testautomation/framework/optional/includes/basic_protected_libraries.inc
index 6162352d710f..3ea033129924 100644
--- a/testautomation/framework/optional/includes/basic_protected_libraries.inc
+++ b/testautomation/framework/optional/includes/basic_protected_libraries.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test protected libraries
 '*
diff --git a/testautomation/framework/optional/includes/basic_shared_modules.inc b/testautomation/framework/optional/includes/basic_shared_modules.inc
index 497d69103bf6..48f97094b449 100644
--- a/testautomation/framework/optional/includes/basic_shared_modules.inc
+++ b/testautomation/framework/optional/includes/basic_shared_modules.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Access modules below OpenOffice.org macros
 '*
diff --git a/testautomation/framework/optional/includes/basic_spectemplate.inc b/testautomation/framework/optional/includes/basic_spectemplate.inc
index 7fc265837f78..245eab9115c9 100644
--- a/testautomation/framework/optional/includes/basic_spectemplate.inc
+++ b/testautomation/framework/optional/includes/basic_spectemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load the spec template via http and enable macros
 '*
diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc
index 97ec55c91505..a96d4aa81406 100644
--- a/testautomation/framework/optional/includes/basic_usertemplate.inc
+++ b/testautomation/framework/optional/includes/basic_usertemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : My Macros/standard execution with user defined template
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
index e35fc8ae3494..39fd57f643f7 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
index 81b2764a28f1..a3c8109941e2 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
index 970b8249a412..f889f77da58f 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
index dfade69eaafb..7959e5d3a8ac 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
index 2dd9f6228455..5589d5b420e6 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
index 201dd8eb9862..fa3abab3078f 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
index 4c6f7c20a076..524c65c31227 100644
--- a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*  
 '*  short description : Test VBA compatibility switches
 '*
diff --git a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
index 8fc37badb55f..d2f684743405 100644
--- a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
+++ b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Small helpers for Excel BASIC import modes
 '*
diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc
index b4de32acd917..969c45247d58 100644
--- a/testautomation/framework/optional/includes/extras_file_open.inc
+++ b/testautomation/framework/optional/includes/extras_file_open.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_labels.inc b/testautomation/framework/optional/includes/extras_labels.inc
index 27e2ae8dced7..2c670ed494a6 100755..100644
--- a/testautomation/framework/optional/includes/extras_labels.inc
+++ b/testautomation/framework/optional/includes/extras_labels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.co
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : test names of labels
 '*
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index 9500e7609e24..b76782e6468a 100644
--- a/testautomation/framework/optional/includes/extras_modify_objects.inc
+++ b/testautomation/framework/optional/includes/extras_modify_objects.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_preview.inc b/testautomation/framework/optional/includes/extras_preview.inc
index ca3a24ec9995..33b6832bdf6f 100644
--- a/testautomation/framework/optional/includes/extras_preview.inc
+++ b/testautomation/framework/optional/includes/extras_preview.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_table_autoformat.inc b/testautomation/framework/optional/includes/extras_table_autoformat.inc
index 7ecb2ce9bf30..f3f5042a2e26 100644
--- a/testautomation/framework/optional/includes/extras_table_autoformat.inc
+++ b/testautomation/framework/optional/includes/extras_table_autoformat.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the autoformat-feature for tables
 '*
diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc
index c52ae61c0945..a53f6614ed64 100644
--- a/testautomation/framework/optional/includes/f_usage_tracking.inc
+++ b/testautomation/framework/optional/includes/f_usage_tracking.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Usage tracking
 '*
@@ -88,7 +88,7 @@ testcase tUsageTracking3
         endif
         
         if ( ShowData.isEnabled() ) then
-            warnlog( "#i97340# - Show data button should not be enabled if nothing is logged" )
+            warnlog( "#i116461# - Show data button should not be enabled if nothing is logged" )
     
             ShowData.click()
             
@@ -100,7 +100,7 @@ testcase tUsageTracking3
             
             kontext "Active"
             if ( Active.exists( 2 ) ) then
-                warnlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
+                warnlog( "Messagebox not required as control should not be enabled (see #i116461#)" )
                 Active.ok()
             
                 kontext "TextImport"
diff --git a/testautomation/framework/optional/includes/filedlg_allowed_names.inc b/testautomation/framework/optional/includes/filedlg_allowed_names.inc
index a6d54077f4b5..60c0f6d53481 100644
--- a/testautomation/framework/optional/includes/filedlg_allowed_names.inc
+++ b/testautomation/framework/optional/includes/filedlg_allowed_names.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
index bfa424378ef4..e49bdfb98551 100644
--- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc
+++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Autocompletion feature
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
index f9a049c6dbc9..c0777190ddb1 100644
--- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc
+++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc
index cdeb2f922c98..9470a9e70190 100644
--- a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc
+++ b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_document_properties.inc b/testautomation/framework/optional/includes/filedlg_document_properties.inc
index 53917531e275..b350797ff18a 100644
--- a/testautomation/framework/optional/includes/filedlg_document_properties.inc
+++ b/testautomation/framework/optional/includes/filedlg_document_properties.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Access document properties
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc
index 1d0b91e2710d..db09ceaa48ab 100644
--- a/testautomation/framework/optional/includes/filedlg_filternames.inc
+++ b/testautomation/framework/optional/includes/filedlg_filternames.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that all filters are listed in the filter listbox
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders1.inc b/testautomation/framework/optional/includes/filedlg_folders1.inc
index 99cf0831f12c..01bd9467a816 100644
--- a/testautomation/framework/optional/includes/filedlg_folders1.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders2.inc b/testautomation/framework/optional/includes/filedlg_folders2.inc
index e7b6f6e0dcbf..c8e9ac646fec 100644
--- a/testautomation/framework/optional/includes/filedlg_folders2.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders3.inc b/testautomation/framework/optional/includes/filedlg_folders3.inc
index 354c95fbc23c..f0a132c4a494 100644
--- a/testautomation/framework/optional/includes/filedlg_folders3.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders4.inc b/testautomation/framework/optional/includes/filedlg_folders4.inc
index 6c0bbb881730..4482fba90283 100644
--- a/testautomation/framework/optional/includes/filedlg_folders4.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders4.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders5.inc b/testautomation/framework/optional/includes/filedlg_folders5.inc
index ed3959a6e7e4..b4f4a5690973 100644
--- a/testautomation/framework/optional/includes/filedlg_folders5.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders5.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders6.inc b/testautomation/framework/optional/includes/filedlg_folders6.inc
index e82589bbe1d0..afca7a57aaa3 100644
--- a/testautomation/framework/optional/includes/filedlg_folders6.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders6.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog 
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_folders7.inc b/testautomation/framework/optional/includes/filedlg_folders7.inc
index df9c399c7253..048ab7f5ca70 100644
--- a/testautomation/framework/optional/includes/filedlg_folders7.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders7.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
index b4b538b85cf6..f40b956b9c36 100644
--- a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
+++ b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc
index 32754ec00553..3d0cf3606260 100644
--- a/testautomation/framework/optional/includes/filedlg_multiselection.inc
+++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Select a huge number of documents and load
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_passwords.inc b/testautomation/framework/optional/includes/filedlg_passwords.inc
index b9442cd2bfbd..a52db4690552 100644
--- a/testautomation/framework/optional/includes/filedlg_passwords.inc
+++ b/testautomation/framework/optional/includes/filedlg_passwords.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : save and load passworded files
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_rename.inc b/testautomation/framework/optional/includes/filedlg_rename.inc
index 513a652b8f36..c5f983db8c95 100644..100755
--- a/testautomation/framework/optional/includes/filedlg_rename.inc
+++ b/testautomation/framework/optional/includes/filedlg_rename.inc
@@ -26,7 +26,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Remane files dialog
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
index 7758fbe55783..af6e67b53ce7 100644
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
index 48ed1a59e4a3..ec4119ca8518 100644
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_tools.inc b/testautomation/framework/optional/includes/filedlg_tools.inc
index b04fdc3f92ec..06c86bce75aa 100644
--- a/testautomation/framework/optional/includes/filedlg_tools.inc
+++ b/testautomation/framework/optional/includes/filedlg_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( 1. part )
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_triggers.inc b/testautomation/framework/optional/includes/filedlg_triggers.inc
index 1e39d2900895..68c715326769 100644
--- a/testautomation/framework/optional/includes/filedlg_triggers.inc
+++ b/testautomation/framework/optional/includes/filedlg_triggers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Alternative ways to open file-dialogs / slot availablilty
 '*
diff --git a/testautomation/framework/optional/includes/help_bookmarks.inc b/testautomation/framework/optional/includes/help_bookmarks.inc
index 04a16951c0a9..22cd3d0dde03 100644
--- a/testautomation/framework/optional/includes/help_bookmarks.inc
+++ b/testautomation/framework/optional/includes/help_bookmarks.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Bookmarks in the help browser
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_applications.inc b/testautomation/framework/optional/includes/help_compare_applications.inc
index 3028c41ecedf..ca1874d6a63d 100644
--- a/testautomation/framework/optional/includes/help_compare_applications.inc
+++ b/testautomation/framework/optional/includes/help_compare_applications.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_content.inc b/testautomation/framework/optional/includes/help_compare_content.inc
index 73c11940e0dc..a65e27b27d04 100644
--- a/testautomation/framework/optional/includes/help_compare_content.inc
+++ b/testautomation/framework/optional/includes/help_compare_content.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_compare_topics.inc b/testautomation/framework/optional/includes/help_compare_topics.inc
index ef060eb18275..a067e814f3ab 100644
--- a/testautomation/framework/optional/includes/help_compare_topics.inc
+++ b/testautomation/framework/optional/includes/help_compare_topics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_search.inc b/testautomation/framework/optional/includes/help_search.inc
index 92243b538c4f..e485b267da9c 100644
--- a/testautomation/framework/optional/includes/help_search.inc
+++ b/testautomation/framework/optional/includes/help_search.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Search for a string, apply restrictions, verify
 '*
diff --git a/testautomation/framework/optional/includes/help_view_topics.inc b/testautomation/framework/optional/includes/help_view_topics.inc
index b14c5d5a8511..6c7cd35bb510 100644
--- a/testautomation/framework/optional/includes/help_view_topics.inc
+++ b/testautomation/framework/optional/includes/help_view_topics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Display each help topic
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_html.inc b/testautomation/framework/optional/includes/options_loadsave_html.inc
index d1b7790f539b..fa65c21a8368 100644
--- a/testautomation/framework/optional/includes/options_loadsave_html.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_html.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test the Load/Save HTML compatibility page
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
index c04a110e7ce5..9a9e258e3e8b 100644
--- a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test Load/Save MS-Office settings page
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_vba.inc b/testautomation/framework/optional/includes/options_loadsave_vba.inc
index be367449553b..e227b0d9dc77 100644
--- a/testautomation/framework/optional/includes/options_loadsave_vba.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_vba.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test VBA settings-page
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc
index 311f5bf8543d..78a6f48a770b 100644
--- a/testautomation/framework/optional/includes/options_ooo_general.inc
+++ b/testautomation/framework/optional/includes/options_ooo_general.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 1. test for general group userdata
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_memory.inc b/testautomation/framework/optional/includes/options_ooo_memory.inc
index 6c2038556af4..357e6e5a2f16 100644
--- a/testautomation/framework/optional/includes/options_ooo_memory.inc
+++ b/testautomation/framework/optional/includes/options_ooo_memory.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : 1. test for general group userdata ... view)
 '*
diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc
index c3da1313da9c..5f804a951ea2 100644
--- a/testautomation/framework/optional/includes/scripting_organizers.inc
+++ b/testautomation/framework/optional/includes/scripting_organizers.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test scripting-organizers / document-attached scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_broken_signature.inc b/testautomation/framework/optional/includes/security_broken_signature.inc
index 1cce0f33af3d..4e64d2073b7c 100644
--- a/testautomation/framework/optional/includes/security_broken_signature.inc
+++ b/testautomation/framework/optional/includes/security_broken_signature.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc
index c367285956ae..60cb3cfaf657 100644
--- a/testautomation/framework/optional/includes/security_certification_dialogs.inc
+++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Walk through a number of dialogs related to digital signatures
 '*
diff --git a/testautomation/framework/optional/includes/security_certified_docs.inc b/testautomation/framework/optional/includes/security_certified_docs.inc
index b00e5460e3fb..71e899609b4b 100755..100644
--- a/testautomation/framework/optional/includes/security_certified_docs.inc
+++ b/testautomation/framework/optional/includes/security_certified_docs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.co
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load certified documents and verify the certificate
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro1.inc b/testautomation/framework/optional/includes/security_evilmacro1.inc
index 9927f1652cb3..0de48f87824e 100644
--- a/testautomation/framework/optional/includes/security_evilmacro1.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro2.inc b/testautomation/framework/optional/includes/security_evilmacro2.inc
index 0c687976fba7..6b8b29903f72 100644
--- a/testautomation/framework/optional/includes/security_evilmacro2.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro2.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_evilmacro3.inc b/testautomation/framework/optional/includes/security_evilmacro3.inc
index c891163ef3e2..a4613be4b678 100644
--- a/testautomation/framework/optional/includes/security_evilmacro3.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro3.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Load documents containing hidden BASIC scripts
 '*
diff --git a/testautomation/framework/optional/includes/security_incorrect_password.inc b/testautomation/framework/optional/includes/security_incorrect_password.inc
index 9f8cfcb39d7d..74be4748b55e 100644
--- a/testautomation/framework/optional/includes/security_incorrect_password.inc
+++ b/testautomation/framework/optional/includes/security_incorrect_password.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Password protect files
 '*
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 3df134d83d33..11c5b0ec6123 100644
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Macros with all security-levels
 '*
diff --git a/testautomation/framework/optional/includes/security_recommend_password.inc b/testautomation/framework/optional/includes/security_recommend_password.inc
index ab914fe5125b..d7eef2f15146 100644
--- a/testautomation/framework/optional/includes/security_recommend_password.inc
+++ b/testautomation/framework/optional/includes/security_recommend_password.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Password settings in Tools/Options
 '*
diff --git a/testautomation/framework/optional/includes/security_trusted_path.inc b/testautomation/framework/optional/includes/security_trusted_path.inc
index 9115ba2e9f5a..163f0b9305f6 100644
--- a/testautomation/framework/optional/includes/security_trusted_path.inc
+++ b/testautomation/framework/optional/includes/security_trusted_path.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Execute macros from trusted path
 '*
@@ -63,6 +63,7 @@ testcase tSecTrustedPath( cWorkFile as string, iSecLevel as integer )
         endif
     endif
 
+    Sleep (1)
     printlog( "Verify that the macro is executed" )
     kontext "Active"
     if ( active.exists( 2 ) ) then
diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc
index 2b9f8a95d129..9cb9fb1c066f 100644
--- a/testautomation/framework/optional/includes/standardbar2.inc
+++ b/testautomation/framework/optional/includes/standardbar2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt
index 2f467b3f2852..d1d52c32245f 100755
--- a/testautomation/framework/optional/input/gridcontrol.odt
+++ b/testautomation/framework/optional/input/gridcontrol.odt
diff --git a/testautomation/framework/required/f_help_browser.bas b/testautomation/framework/required/f_help_browser.bas
index 753b1d8cae99..b3acd3054f34 100755
--- a/testautomation/framework/required/f_help_browser.bas
+++ b/testautomation/framework/required/f_help_browser.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Update/resource-test for the help-browser
 '*
diff --git a/testautomation/framework/required/f_printer_administration.bas b/testautomation/framework/required/f_printer_administration.bas
index 93ad542126ae..f501f51e3ec1 100755
--- a/testautomation/framework/required/f_printer_administration.bas
+++ b/testautomation/framework/required/f_printer_administration.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : A brief look at the spadmin-tool
 '*
diff --git a/testautomation/framework/required/f_programmability_dialogs.bas b/testautomation/framework/required/f_programmability_dialogs.bas
index 7965a842d5f4..e785d224b278 100644
--- a/testautomation/framework/required/f_programmability_dialogs.bas
+++ b/testautomation/framework/required/f_programmability_dialogs.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update-Test for some dialogs in Basic-IDE
 '*
diff --git a/testautomation/framework/required/f_security_dialogs.bas b/testautomation/framework/required/f_security_dialogs.bas
index 76bd6cc57373..a07d2d5387fc 100755
--- a/testautomation/framework/required/f_security_dialogs.bas
+++ b/testautomation/framework/required/f_security_dialogs.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Security dialogs in Tools/Options
 '*
diff --git a/testautomation/framework/required/f_standard_toolbar.bas b/testautomation/framework/required/f_standard_toolbar.bas
index 83a860f6674a..6308add90d95 100755
--- a/testautomation/framework/required/f_standard_toolbar.bas
+++ b/testautomation/framework/required/f_standard_toolbar.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Update/resource-test for toolbars
 '*
diff --git a/testautomation/framework/required/f_tools_customize.bas b/testautomation/framework/required/f_tools_customize.bas
index a46985a629fb..958c1c943e75 100755
--- a/testautomation/framework/required/f_tools_customize.bas
+++ b/testautomation/framework/required/f_tools_customize.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.COM
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : ToolsCustomize Dialog
 '*
diff --git a/testautomation/framework/required/f_tools_options.bas b/testautomation/framework/required/f_tools_options.bas
index b4cac6c8f4b3..20dc7f3b574c 100755
--- a/testautomation/framework/required/f_tools_options.bas
+++ b/testautomation/framework/required/f_tools_options.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that the applications appear in tools/options
 '*
diff --git a/testautomation/framework/required/f_topten.bas b/testautomation/framework/required/f_topten.bas
index 4d9b741aa071..3b8fcf80adda 100755
--- a/testautomation/framework/required/f_topten.bas
+++ b/testautomation/framework/required/f_topten.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : smoke test for each application
 '*
diff --git a/testautomation/framework/required/f_window_functions.bas b/testautomation/framework/required/f_window_functions.bas
index 5f848835e7a6..c1b4dd30d049 100755
--- a/testautomation/framework/required/f_window_functions.bas
+++ b/testautomation/framework/required/f_window_functions.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Basic Window/Titlebar functionality
 '*
diff --git a/testautomation/framework/required/f_wizards.bas b/testautomation/framework/required/f_wizards.bas
index 9ad1be7a05ed..f7bc38e1623b 100755
--- a/testautomation/framework/required/f_wizards.bas
+++ b/testautomation/framework/required/f_wizards.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Category 0 tests for all included wizards
 '*
diff --git a/testautomation/framework/required/includes/basic_dialog_export.inc b/testautomation/framework/required/includes/basic_dialog_export.inc
index ecdb26cc6ac0..5899cd6c1288 100644
--- a/testautomation/framework/required/includes/basic_dialog_export.inc
+++ b/testautomation/framework/required/includes/basic_dialog_export.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for the dialog export feature
 '*
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc
index 162f0cc040cd..871cb3bb976e 100644
--- a/testautomation/framework/required/includes/basic_dialog_i18n.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for Basic IDE / Dialog i18n-feature
 '*
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
index e6e62995716c..df193a2bddbf 100644
--- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : 
 '*
diff --git a/testautomation/framework/required/includes/basic_macroassignment.inc b/testautomation/framework/required/includes/basic_macroassignment.inc
index 6dda14b07698..9b29b50810cc 100644
--- a/testautomation/framework/required/includes/basic_macroassignment.inc
+++ b/testautomation/framework/required/includes/basic_macroassignment.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update-Test for some dialogs in Basic-IDE
 '*
diff --git a/testautomation/framework/required/includes/basic_organizer.inc b/testautomation/framework/required/includes/basic_organizer.inc
index 7df67c82cd62..8e59ff8e42ae 100644
--- a/testautomation/framework/required/includes/basic_organizer.inc
+++ b/testautomation/framework/required/includes/basic_organizer.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for the Basic Organizer dialog
 '*
diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc
index 478ba7cd6b90..35905c20c39c 100644
--- a/testautomation/framework/required/includes/first.inc
+++ b/testautomation/framework/required/includes/first.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : First test of basic functionality
 '*
diff --git a/testautomation/framework/required/includes/help_browser.inc b/testautomation/framework/required/includes/help_browser.inc
index 858dc46c2779..94aadb2ea8ea 100644
--- a/testautomation/framework/required/includes/help_browser.inc
+++ b/testautomation/framework/required/includes/help_browser.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : global update/resource test
 '*
diff --git a/testautomation/framework/required/includes/printer_administration.inc b/testautomation/framework/required/includes/printer_administration.inc
index 6349f381d194..781c1837a25c 100644
--- a/testautomation/framework/required/includes/printer_administration.inc
+++ b/testautomation/framework/required/includes/printer_administration.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : updatetest for the printer configuration
 '*
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc
index 3a70c8051808..dcb5c3829519 100644
--- a/testautomation/framework/required/includes/script_organizers.inc
+++ b/testautomation/framework/required/includes/script_organizers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : Joerg.Skottke@Sun.Com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify names of macros and scripts
 '*
diff --git a/testautomation/framework/required/includes/scripting_basics.inc b/testautomation/framework/required/includes/scripting_basics.inc
index d1939546b89d..28e4a3f013df 100644
--- a/testautomation/framework/required/includes/scripting_basics.inc
+++ b/testautomation/framework/required/includes/scripting_basics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Quick short test for the scripting framework
 '*
diff --git a/testautomation/framework/required/includes/security_dialogs.inc b/testautomation/framework/required/includes/security_dialogs.inc
index d8f5a096595a..0127a5ae5d8e 100644
--- a/testautomation/framework/required/includes/security_dialogs.inc
+++ b/testautomation/framework/required/includes/security_dialogs.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Security dialogs in Tools/Options
 '*
diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc
index d4e327a21ad7..79e7b2da9db1 100644
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : "10ner/Smoke Test" from release engineering
 '*
@@ -131,7 +131,7 @@ testcase tSmokeTest
                 ' If macro fails for whatever reason, a message comes up
                 Kontext
                 if active.exists() then
-                    warnlog "#i87290# " + active.getText
+                    warnlog "Macro failed " + active.getText
                     active.ok
                     call hCloseDocument()
                     goto endsub
diff --git a/testautomation/framework/required/includes/standard_toolbar_1.inc b/testautomation/framework/required/includes/standard_toolbar_1.inc
index b7d54bb89180..1965f3424a05 100644
--- a/testautomation/framework/required/includes/standard_toolbar_1.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc
index 46c71bd93409..3a3cdc7513df 100644
--- a/testautomation/framework/required/includes/standard_toolbar_3.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Items on the standardbar
 '*
diff --git a/testautomation/framework/required/includes/standard_toolbar_4.inc b/testautomation/framework/required/includes/standard_toolbar_4.inc
index fbd21e46d032..c86894e9f749 100644
--- a/testautomation/framework/required/includes/standard_toolbar_4.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_4.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Invisible items on the standardbar
 '*
diff --git a/testautomation/framework/required/includes/standard_toolbar_5.inc b/testautomation/framework/required/includes/standard_toolbar_5.inc
index 8e03d1253f84..61ca8ef905a1 100644
--- a/testautomation/framework/required/includes/standard_toolbar_5.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_5.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Customize toolbar
 '*
diff --git a/testautomation/framework/required/includes/standard_toolbar_6.inc b/testautomation/framework/required/includes/standard_toolbar_6.inc
index ab357cd81013..74f7709f79a0 100644
--- a/testautomation/framework/required/includes/standard_toolbar_6.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_6.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Open applications from New button on standardbar
 '*
diff --git a/testautomation/framework/required/includes/tools_customize.inc b/testautomation/framework/required/includes/tools_customize.inc
index 36089018a589..b3518ae615a2 100644
--- a/testautomation/framework/required/includes/tools_customize.inc
+++ b/testautomation/framework/required/includes/tools_customize.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update Test for the Tools Customize Dialog
 '*
diff --git a/testautomation/framework/required/includes/tools_options.inc b/testautomation/framework/required/includes/tools_options.inc
index 928d533cbe3a..e9a93159254b 100644
--- a/testautomation/framework/required/includes/tools_options.inc
+++ b/testautomation/framework/required/includes/tools_options.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Verify that the applications appear in tools/options
 '*
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index fdfdb49fec97..165c63bb20e6 100644
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Smoke test (load/save/clipboard)
 '*
@@ -65,7 +65,6 @@ testcase Top_ten_test
 
     dim sUserWorkDirectory as string
     dim sFilename_native as String
-    dim sFilename_export as String
     dim sFilter_native as string
     dim sFilter_export as String
     dim bExportFile as boolean
@@ -78,19 +77,15 @@ testcase Top_ten_test
     ' set the filenames and their filters. HTML is not exported
     if ( gApplication = "HTML" ) then
         sFilename_native = "ls_test.html"
-        sFilename_export = "ls_test.htm"  
         bExportFile      = FALSE      
     else
         sFilename_native = "ls_test" & hGetSuffix( "current" )
-        sFilename_export = "ls_test" & hGetSuffix( "569" )
     endif
     
     printlog( "File (current): " & sFilename_native )
-    printlog( "File (src569).: " & sFilename_export )
     
     ' Delete the workfiles, they might have been left over by prior incomplete testrun
     hDeleteFile( sUserWorkDirectory & sFilename_native )
-    hDeleteFile( sUserWorkDirectory & sFilename_export )
     
     ' Set the API filternames for the current application (native XML format)
     select case gApplication
@@ -113,45 +108,16 @@ testcase Top_ten_test
     printlog( "Save (default-fileformat): " & sFilename_native )
     call hFileSaveAsKill ( sUserWorkDirectory & sFilename_native )
     
-    if ( bExportFile ) then
-    
-        ' Set the API filternames for the current application (StarOffice 5.2 binary format)
-        select case gApplication
-        case "WRITER"          : sFilter_export = "StarWriter 5.0"
-        case "CALC"            : sFilter_export = "StarCalc 5.0"
-        case "DRAW"            : sFilter_export = "StarDraw 5.0"
-        case "IMPRESS"         : sFilter_export = "StarImpress 5.0"
-        case "MATH"            : sFilter_export = "StarMath 5.0"
-        case "MASTERDOCUMENT"  : sFilter_export = "StarWriter 5.0/GlobalDocument"
-        case else              : warnlog "Invalid gApplication: " & gApplication 
-        end select
-        
-        printlog( "Save (5.2-fileformat): " & sFilename_export )
-        hFileSaveAsWithFilterKill( sUserWorkDirectory & sFilename_export , sFilter_export )
-
-        printlog( "Close" )
-        FileClose
-
-        ' There should be no alien warning
-        kontext "active"
-        If ( active.exists( 1 ) ) then
-            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
-            Active.Yes
-        else
-            printlog( "No more alien warning on closing the document. Good." )
-        endif
-    else
-        FileClose
+    FileClose
 
-        kontext "active"
-        if ( Active.Exists( 1 ) ) then
-            warnlog( "Unexpected Active after saving: '" & active.getText & "'" )
-            try
-                Active.Yes()
-            catch
-                Active.No()
-            endcatch
-        endif
+    kontext "active"
+    if ( Active.Exists( 1 ) ) then
+        warnlog( "Unexpected Active after saving: '" & active.getText & "'" )
+        try
+            Active.Yes()
+        catch
+            Active.No()
+        endcatch
     endif
 
     printlog( "Load (default-fileformat): " & sFilename_native )
@@ -167,60 +133,7 @@ testcase Top_ten_test
     printlog( "Close" )
     FileClose
 
-    if ( bExportFile ) then
-    
-        printlog( "Load (5.2-fileformat): " & sFilename_export )
-        call hFileOpen (sUserWorkDirectory & sFilename_export)
-        
-        if ( gApplication = "MATH" AND iSprache = 84 AND gPlatform="lin" ) then
-            try
-                kontext "DocumentMath"
-                DocumentMath.MouseDown(50,50)
-                DocumentMath.MouseUp(50,50)
-                qaErrorLog( "Use workaround focus problem for math and language vi/84" )
-                ' Needed by AndreSchnabel, not manual reproduceable, only with TestTool
-            catch
-                qaErrorLog( "Workaround focus problem failed." )
-            endcatch
-        endif
-        
-        ' Modify the export document to trigger the alien warning on next save
-        printlog( "Change the document" )
-        hChangeDoc()
-        
-        printlog( "Save" )
-        FileSave
-
-        Kontext "AlienWarning"
-        if ( AlienWarning.exists( 3 ) ) then
-            printlog( "Closing expected alien warning. Good." )
-            AlienWarning.OK()
-        else
-            warnlog( "Alien warning is missing" )
-        endif
-
-        kontext "active"
-        if ( Active.Exists( 3 ) ) then
-            warnlog(  "Unexpected messagebox: '" & active.getText & "'" )
-            Active.yes
-        else
-            printlog( "No unexpected messages on save. Good." )
-        endif
-
-        printlog( "Close" )
-        FileClose
-
-        kontext "active"
-        if ( Active.Exists() ) then
-            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
-            Active.Yes()
-        else
-            printlog( "No more alien warning to close. Good." )
-        endif
-    endif
-    
     hDeleteFile( sUserWorkDirectory & sFilename_native )
-    hDeleteFile( sUserWorkDirectory & sFilename_export )
     
 endcase
 
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index dfb6b2600df8..8abdfce0b08a 100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Window/Titlebar functionality
 '*
diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc
index d423d2fd7c62..2cbfb602cfc8 100644
--- a/testautomation/framework/required/includes/wizard_agenda.inc
+++ b/testautomation/framework/required/includes/wizard_agenda.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for agenda wizard
 '*
diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc
index b99cef0a9c6c..0d37fc9f6af6 100644
--- a/testautomation/framework/required/includes/wizard_documentconverter.inc
+++ b/testautomation/framework/required/includes/wizard_documentconverter.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for documentconverter
 '*
diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc
index aeee35c59282..a27bb1c3bf5f 100644
--- a/testautomation/framework/required/includes/wizard_euroconverter.inc
+++ b/testautomation/framework/required/includes/wizard_euroconverter.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for the Euroconverter
 '*
diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc
index 07fcc562dddc..4965ad1f7255 100644
--- a/testautomation/framework/required/includes/wizard_fax.inc
+++ b/testautomation/framework/required/includes/wizard_fax.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update Test for Fax Wizard
 '*
diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc
index 657a68ada3d0..ea6fcd744227 100644
--- a/testautomation/framework/required/includes/wizard_firsttime.inc
+++ b/testautomation/framework/required/includes/wizard_firsttime.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Updatetest for the first time wizard
 '*
diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc
index 4f68a04cbd8b..ab24971f0275 100644
--- a/testautomation/framework/required/includes/wizard_letter.inc
+++ b/testautomation/framework/required/includes/wizard_letter.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update Test for Letter Wizard
 '*
diff --git a/testautomation/framework/required/includes/wizard_mailmerge.inc b/testautomation/framework/required/includes/wizard_mailmerge.inc
index 95f8d6d19a54..3e631335c7b6 100644
--- a/testautomation/framework/required/includes/wizard_mailmerge.inc
+++ b/testautomation/framework/required/includes/wizard_mailmerge.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for the mailmerge wizard
 '*
diff --git a/testautomation/framework/required/includes/wizard_presentation.inc b/testautomation/framework/required/includes/wizard_presentation.inc
index 53e2e0d3a50b..166028b3e18f 100644
--- a/testautomation/framework/required/includes/wizard_presentation.inc
+++ b/testautomation/framework/required/includes/wizard_presentation.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Update test for the presentation wizard
 '*
diff --git a/testautomation/framework/required/input/10erTest_680.sxw b/testautomation/framework/required/input/10erTest_680.sxw
index afae9513c6fe..b07bfc2e36bb 100755
--- a/testautomation/framework/required/input/10erTest_680.sxw
+++ b/testautomation/framework/required/input/10erTest_680.sxw
diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc
index 9fbdb6928b08..0237990a3166 100644
--- a/testautomation/framework/tools/includes/customize_tools.inc
+++ b/testautomation/framework/tools/includes/customize_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease the use of the ToolsCustomize-Dialog
 '*
diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc
index 061f9f606f48..1ba484df58af 100644
--- a/testautomation/framework/tools/includes/fileoperations.inc
+++ b/testautomation/framework/tools/includes/fileoperations.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : check the internal file dialog ( extended tests )
 '*
diff --git a/testautomation/framework/tools/includes/formcontrols.inc b/testautomation/framework/tools/includes/formcontrols.inc
index 6755ed2a2cdd..7271347e10eb 100644
--- a/testautomation/framework/tools/includes/formcontrols.inc
+++ b/testautomation/framework/tools/includes/formcontrols.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : Tools to draw and select form controls in basic-ide
 ' **
diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc
index 9c81084952df..7b17d4fe37ed 100644
--- a/testautomation/framework/tools/includes/help_tools.inc
+++ b/testautomation/framework/tools/includes/help_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Replacements for routines in t_lists.inc adds some
 '*
diff --git a/testautomation/framework/tools/includes/i18n_tools.inc b/testautomation/framework/tools/includes/i18n_tools.inc
index f918b1fe5076..aa0e141a45f3 100644
--- a/testautomation/framework/tools/includes/i18n_tools.inc
+++ b/testautomation/framework/tools/includes/i18n_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease working with language dependent strings/values
 '*
diff --git a/testautomation/framework/tools/includes/pbrowser_tools.inc b/testautomation/framework/tools/includes/pbrowser_tools.inc
index a6a089150a96..391c1a3c2456 100644
--- a/testautomation/framework/tools/includes/pbrowser_tools.inc
+++ b/testautomation/framework/tools/includes/pbrowser_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools for working with the property browser for formcontrols
 '*
diff --git a/testautomation/framework/tools/includes/private_environment.inc b/testautomation/framework/tools/includes/private_environment.inc
index af81110b3f18..40851aa8bc1a 100644
--- a/testautomation/framework/tools/includes/private_environment.inc
+++ b/testautomation/framework/tools/includes/private_environment.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease working with private environment
 '*
diff --git a/testautomation/framework/tools/includes/scriptorganizer_tools.inc b/testautomation/framework/tools/includes/scriptorganizer_tools.inc
index 8cf067913d64..52503af25bd6 100644
--- a/testautomation/framework/tools/includes/scriptorganizer_tools.inc
+++ b/testautomation/framework/tools/includes/scriptorganizer_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Test scripting-organizers / document-attached scripts
 '*
diff --git a/testautomation/framework/tools/includes/spadmin_tools.inc b/testautomation/framework/tools/includes/spadmin_tools.inc
index 77cbdf61a44b..ad41ccf017d3 100644
--- a/testautomation/framework/tools/includes/spadmin_tools.inc
+++ b/testautomation/framework/tools/includes/spadmin_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : helper functions for SPAdmin
 '*
diff --git a/testautomation/framework/tools/includes/template_tools.inc b/testautomation/framework/tools/includes/template_tools.inc
index 1491abe9c64f..20881f3fb85e 100644
--- a/testautomation/framework/tools/includes/template_tools.inc
+++ b/testautomation/framework/tools/includes/template_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Helper functions to ease usage of templates
 '*
diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc
index 66c6c27982d0..d3539abf8a37 100644
--- a/testautomation/framework/tools/includes/toolbar_tools.inc
+++ b/testautomation/framework/tools/includes/toolbar_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
diff --git a/testautomation/framework/tools/includes/webtools.inc b/testautomation/framework/tools/includes/webtools.inc
index 424ace8c959e..7904c4532de1 100644
--- a/testautomation/framework/tools/includes/webtools.inc
+++ b/testautomation/framework/tools/includes/webtools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease working with web functionality
 '*
diff --git a/testautomation/framework/tools/includes/window_tools.inc b/testautomation/framework/tools/includes/window_tools.inc
index 93a09ccf533d..649935dd574a 100644
--- a/testautomation/framework/tools/includes/window_tools.inc
+++ b/testautomation/framework/tools/includes/window_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to handle windows/frames
 '*
diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc
index 380f84141d34..a32a77f4518f 100644
--- a/testautomation/framework/tools/includes/wizards.inc
+++ b/testautomation/framework/tools/includes/wizards.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : helper functions for the wizards
 '*
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index dd8e9062b604..63731c97ab1d 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : Joerg.Skottke@Sun.Com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Update test for the findbar
 '*
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 0c40d3c3d08e..620164b98abd 100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram
             Active.ok()
         else
             if ( NOT bImportDialogHasBeenDisplayed ) then
-                warnlog( "#i97340# Show Data button enabled but no logged data found" )
+                warnlog( "#i116461# Show Data button enabled but no logged data found" )
             endif
         endif
 
diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
index cfffcc8395c5..6ee654a7dee2 100644
--- a/testautomation/global/required/includes/g_printing.inc
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Resource test for the printing dialog
 '*
diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc
index 04718449b13b..c700d887b8d5 100644
--- a/testautomation/global/tools/includes/optional/t_accels.inc
+++ b/testautomation/global/tools/includes/optional/t_accels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : handle accelerators
 '*
diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
index f7537d52700c..536ffb99dda6 100644
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : tools for the property-browser test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
index f63d610dbdb8..83c037b83f0e 100644
--- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : tools for tools/macro test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc
index 4ee8b908c93f..266243d93bb1 100644
--- a/testautomation/global/tools/includes/optional/t_control_objects.inc
+++ b/testautomation/global/tools/includes/optional/t_control_objects.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions to manipulate controls by accessing them as objects
 '*
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index 7f43b7211630..5e3e76028e6b 100644
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : misc functions to handle documents
 '*
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index 654b1b76c515..4b7c481ffe8f 100644
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease working with the extension manager
 '*
diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc
index 7189a8e01a43..dd8a9affc1be 100644
--- a/testautomation/global/tools/includes/optional/t_filetools.inc
+++ b/testautomation/global/tools/includes/optional/t_filetools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions that work with files like deleting, loading...
 '*
diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc
index 14906c127c68..f32984f963e3 100644
--- a/testautomation/global/tools/includes/optional/t_key_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_key_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : tools for evaluation of key=value datalists
 '*
diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc
index c90d077db651..cb020d343662 100644
--- a/testautomation/global/tools/includes/optional/t_listfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Replacements for routines in t_lists.inc adds some
 '*
diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc
index 733b28fa32f4..c4b432135739 100644
--- a/testautomation/global/tools/includes/optional/t_macro_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_macro_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : Helper functions for Macro tests
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 13138dfc52ab..23b3e02a7ae8 100644
--- a/testautomation/global/tools/includes/optional/t_ole.inc
+++ b/testautomation/global/tools/includes/optional/t_ole.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools for OLE objects
 '*
diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc
index 28625be35880..bb872a65c40f 100644
--- a/testautomation/global/tools/includes/optional/t_security_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_security_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease testing of security related funtionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc
index 7f946fd3b046..6ffb2f467a1b 100644
--- a/testautomation/global/tools/includes/optional/t_stringtools.inc
+++ b/testautomation/global/tools/includes/optional/t_stringtools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions for manipulation of strings
 '*
diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
index e9c254ac07b4..3ce78163d843 100644
--- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Helpers for accessing treelists
 '*
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
index 7b9dd66e1a40..d4c536b73718 100644
--- a/testautomation/global/tools/includes/optional/t_ui_filters.inc
+++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Get the UI names for default filters
 '*
diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc
index d4771be2e3c9..429aad5d2e8e 100644
--- a/testautomation/global/tools/includes/optional/t_user_info.inc
+++ b/testautomation/global/tools/includes/optional/t_user_info.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index 243483be9e7d..c0a23d56d092 100644
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Retrieve and set filternames and suffixes
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 051afec0ad24..837a989678be 100644
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Tools (1)
 '*
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index ba6673edb39d..926c153ae43b 100644..100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -448,6 +448,12 @@ ShowGridcontrol sym:showGridcontrol
 *GridControlDialog sym:gridcontroldialog
 gridcontrolcontrol sym:gridcontrolself
 
+*TabControlDialog sym:tabcontroldialog
+tabcontrol_1 sym:tabcontrol_1
+tabcontrol_2 sym:tabcontrol_2
+tabbutton sym:tabbutton
+tabcontainer sym:tabcontainer
+
 *GroupingDlg sym:SC_HID_SC_DPDATEGROUP
 AutoStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART
 ManualStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index b781c636da3a..0448fccc9f02 100644..100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -55,7 +55,7 @@ AdoURL              sym:DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL
 StartTableWizard    sym:DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD
 
 *CreateDatabaseLink sym:cui:ModalDialog:DLG_DOCUMENTLINK
-DatabaseFile .uno:OpenUrl
+DatabaseFile sym:cui:ComboBox:DLG_DOCUMENTLINK:CMB_URL
 Browse sym:cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE
 RegisteredName sym:cui:Edit:DLG_DOCUMENTLINK:ET_NAME
 
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 5acdef31038b..b235855ce9dc 100644..100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -5,6 +5,7 @@ TableWindow sym:DBACCESS_HID_CTL_TABLEEDIT
 Fieldname sym:DBACCESS_HID_TABDESIGN_NAMECELL
 FieldType sym:DBACCESS_HID_TABDESIGN_TYPECELL
 Description sym:DBACCESS_HID_TABDESIGN_HELPTEXT
+CellDescription sym:DBACCESS_HID_TABDESIGN_COMMENTCELL
 
 *TablesFilter sym:DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION
 Tables sym:DBACCESS_HID_DSADMIN_TABLE_SELECTOR
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 17cf61f910ca..e8fb0ac7b870 100644..100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -194,9 +194,16 @@ MajorIntervalAutomatic      sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN
 MinorIntervalCount          sym:chart2:MetricField:TP_SCALE:MT_STEPHELP    
 MinorIntervalCountAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP
 ReferenceValue              sym:chart2:SpinField:TP_SCALE:EDT_ORIGIN              
-RreferenceValueAutomatic    sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN
+ReferenceValueAutomatic     sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN
 LogarithmicScale            sym:chart2:CheckBox:TP_SCALE:CBX_LOGARITHM
-ReverseDirection            sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE
+ReverseDirectionDateAxis    sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE:MayBeDateAxis
+ReverseDirectionValueAxis   sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis
+AxisType                    sym:chart2:ListBox:TP_SCALE:LB_AXIS_TYPE
+Resolution                  sym:chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION
+AutoResolution              sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION
+MajorIntervalMetric         sym:chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP
+MajorIntervalUnit           sym:chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT
+MinorIntervalUnit           sym:chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT
 
 *TabChartAxisPositioning    sym:chart2:TabPage:TP_AXIS_POSITIONS
 CrossOtherAxisAt            sym:chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT
diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas
index f8a8eb6c0668..bf49f64329b5 100755
--- a/testautomation/graphics/optional/g_spellcheck.bas
+++ b/testautomation/graphics/optional/g_spellcheck.bas
@@ -42,13 +42,15 @@ sub main
     use "graphics\optional\includes\global\g_spellcheck.inc"
 
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
-    PrintLog "-------------------------" + gApplication + "-------------------"    
+    PrintLog "-------------------------" + gApplication + "-------------------"
+    call tiToolsSpellcheckError
     call tiToolsSpellcheckCheck_AlwaysIgnore
     call tiToolsSpellcheckCheck_Change
     call tiToolsSpellcheckCheck_ChangeAll
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
+    call tiToolsSpellcheckError
     call tiToolsSpellcheckCheck_AlwaysIgnore
     call tiToolsSpellcheckCheck_Change
     call tiToolsSpellcheckCheck_ChangeAll
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index d43c49610c26..8da14643d748 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -30,15 +30,6 @@
 '* short description :
 '*
 '**************************************************************************************
-' #1 tiEditUndo
-' #1 tiEditRedo
-' #1 tiEditClipboard
-' #1 tiEditPasteSpecial_HTML
-' #1 tdEditPasteSpecial_Text
-' #1 tdEditPasteSpecial_Graphic
-' #1 tdEditPasteSpecial_Circle
-' #1 tiEditPasteSpecial
-'\*************************************************************************************
 
 testcase tiEditUndo
 
@@ -128,6 +119,7 @@ testcase tiEditUndo
     end if
     TabPositionAndSize.Cancel
     printlog "Close document"
+    Call hCloseDocument
     sLocaltestfile = hFileGetLocalPath( gTesttoolPath + "leer."+ExtensionString )
     printlog sLocaltestfile
     if (FileExists (sLocaltestfile)) then
@@ -136,10 +128,7 @@ testcase tiEditUndo
     else
         warnlog "File is missing."
     endif
-
-    printlog "Close document"
-    Call hCloseDocument						
-
+    					
 endcase 'tiEditUndo
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index c10239e69775..1684738ded35 100644
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -212,19 +212,9 @@ testcase tiToolsSpellcheckError
         end if
     end if
 
-    printlog "Close dialog 'Edit Custom Dictionary'."
-    BenutzerwoerterbuchBearbeiten.Close
-    Kontext "ExtrasOptionenDlg"
-    printlog "Close the Option dialog."
-    ExtrasOptionenDlg.OK
-
     printlog "Close document"
     Call hCloseDocument
 
-    ' remove the word again from the dictionary
-    delete_word_from_dictionary(sWrongWord,"IgnoreAllList")
-
-    kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt))
 endcase 'tiToolsSpellcheckCorrect
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
index 61249353c9d1..4de5505fe0a1 100644
--- a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc
@@ -51,6 +51,7 @@ testcase tiSlideCopyNewPresentation
      sleep 1
      try
         Verbinder.TearOff
+        printlog "Tearing off Connector bar.."
     catch
         warnlog "bug for GH from FHA; .tearoff doesnt tell success"
     endcatch
@@ -93,19 +94,21 @@ testcase tiSlideCopyNewPresentation
     sleep 2
     try
         StarShapes.TearOff
+        printlog "Tearing off StarShapes Bar..."
     catch
         warnlog( "<StarShapes.TearOff> failed" )
         goto endsub
     endcatch
 
     kontext "StarShapes"
+    sleep 2
     if ( StarShapes.exists( 2 ) ) then
         StarShapesDoorplate.click
     else
         warnlog( "<StarShapesDoorplate> could not be clicked" )
     endif
 
-    sleep (3)
+    sleep (5)
     gMouseDown (40,40)
     gMouseMove (40,40,60,60)
     gMouseUp (60,60)
diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc
index fee150c8381a..b878278961b1 100644
--- a/testautomation/graphics/required/includes/global/id_001.inc
+++ b/testautomation/graphics/required/includes/global/id_001.inc
@@ -105,68 +105,122 @@ testcase tiFileSaveAs
     printlog "load a sample presentation file"
     Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
     WaitSlot (3000)
-    
-    printlog "running 5 times save as with different Filters"
-    for i = 1 to 6
-        printlog "calling Save as Dialog"
-        FileSaveAs
-        WaitSlot (2000)
-        Kontext "SpeichernDlg"
-        printlog "Selecting filter according to number of run"
-        Dateityp.Select i
-        sFilterName = Dateityp.GetSelText
-        sFileName = sPath + sFile + (i)
-        printlog "Filename is " & sFileName
-        printlog "Filtername for this file is " & sFilterName
-        Dateiname.SetText (sFileName)
-        Speichern.Click
-        kontext "AlienWarning"
-        if AlienWarning.exists(5) then
-            AlienWarning.OK
+
+    printlog "Select between Impress and Draw:"
+
+    if (gApplication = "DRAW") then
+        printlog "CASE DRAW: running 4 times save as with different Filters"
+        for i = 1 to 4
+            printlog "calling Save as Dialog, " & i
+            FileSaveAs
+            WaitSlot (2000)
+            Kontext "SpeichernDlg"
+            printlog "Selecting filter according to number of run"
+            Dateityp.Select i
+            sFilterName = Dateityp.GetSelText
+            sFileName = sPath + sFile + (i)
+            printlog "Filename is " & sFileName
+            printlog "Filtername for this file is " & sFilterName
+            Dateiname.SetText (sFileName)
+            Speichern.Click
+            kontext "AlienWarning"
+            if AlienWarning.exists(5) then
+                AlienWarning.OK
+            end if
+            WaitSlot (5000)
+        next i
+        printlog "closing the sample file"
+        fileclose
+        WaitSlot (3000)
+        kontext "Messagebox"
+        if Messagebox.exists then
+            printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
+            Messagebox.YES
         end if
-        WaitSlot (5000)
-    next i
-    printlog "closing the sample file"
-    fileclose
-    WaitSlot (3000)
-    kontext "Messagebox"
-    if Messagebox.exists then
-        printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
-        Messagebox.YES
-    end if
-     
-    printlog "Loading the former saved files:"
-    for i = 1 to 6 'run it 5 times
-    
-        FileOpen
-        Kontext "OeffnenDlg"
-        WaitSlot (2000)
-        DateiAuswahl.TypeKeys "<END>"
-        DateiAuswahl.TypeKeys "<HOME>"
-        if i <> 1 then
-            DateiAuswahl.TypeKeys "<DOWN>", (i-1)
-        endif
-        sFileNameLoaded = Dateiname.GetSelText
-        printlog "File will be loaded: " & sFileNameLoaded
-        Oeffnen.Click
-        printlog "Closing doc if it gets loaded: " & sFileNameLoaded
-        if gApplication = "IMPRESS" then 
-            Kontext "DocumentImpress"
-            if DocumentImpress.exists(5) then
-                Call hCloseDocument
-            else
-                warnlog "File did not get loaded."
+
+        printlog "Loading the former saved files:"
+        for i = 1 to 4 'run it 4 times
+
+            FileOpen
+            Kontext "OeffnenDlg"
+            WaitSlot (2000)
+            DateiAuswahl.TypeKeys "<END>"
+            DateiAuswahl.TypeKeys "<HOME>"
+            if i <> 1 then
+                DateiAuswahl.TypeKeys "<DOWN>", (i-1)
             endif
-        else
+            sFileNameLoaded = Dateiname.GetSelText
+            printlog i & ":File will be loaded: " & sFileNameLoaded
+            Oeffnen.Click
+            printlog "Closing doc if it gets loaded: " & sFileNameLoaded
             Kontext "DocumentDraw"
             if DocumentDraw.exists(5) then
                 Call hCloseDocument
             else
                 warnlog "File did not get loaded."
             endif
-        endif
-        WaitSlot (2000)
-    next i
+            WaitSlot (2000)
+        next i
+    else
+        printlog "CASE IMPRESS: running 9 times save as with different Filters"
+        for i = 1 to 9
+            printlog "calling Save as Dialog, " & i
+            FileSaveAs
+            WaitSlot (2000)
+            Kontext "SpeichernDlg"
+            printlog "Selecting filter according to number of run"
+            Dateityp.Select i
+            sFilterName = Dateityp.GetSelText
+            sFileName = sPath + sFile + (i)
+            printlog "Filename is " & sFileName
+            printlog "Filtername for this file is " & sFilterName
+            Dateiname.SetText (sFileName)
+            Speichern.Click
+            kontext "AlienWarning"
+            if AlienWarning.exists(5) then
+                AlienWarning.OK
+            end if
+            WaitSlot (5000)
+        next i
+        printlog "closing the sample file"
+        fileclose
+        WaitSlot (3000)
+        kontext "Messagebox"
+        if Messagebox.exists then
+            printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
+            Messagebox.YES
+        end if
+
+        printlog "Loading the former saved files:"
+        for i = 1 to 9 'run it 9 times
+            FileOpen
+            Kontext "OeffnenDlg"
+            WaitSlot (2000)
+            DateiAuswahl.TypeKeys "<END>"
+            DateiAuswahl.TypeKeys "<HOME>"
+            if i <> 1 then
+                DateiAuswahl.TypeKeys "<DOWN>", (i-1)
+            endif
+            sFileNameLoaded = Dateiname.GetSelText
+            printlog i & ":File will be loaded: " & sFileNameLoaded
+            Oeffnen.Click
+            printlog "Closing doc if it gets loaded: " & sFileNameLoaded
+            printlog "For checking if its open and closing the doc we need to differ Impress and Draw:"
+            Kontext "DocumentImpress"
+            if DocumentImpress.exists(5) then
+                Call hCloseDocument
+            else
+                Kontext "DocumentDraw"
+                if DocumentDraw.exists(5) then
+                    Call hCloseDocument
+                else
+                    warnlog "File did not get loaded."
+                endif
+            endif
+
+            WaitSlot (2000)
+        next i
+    endif
 
 endcase 'tiFileSaveAs
 
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index a14912c6f141..c06f88c682b8 100644
--- a/testautomation/graphics/required/includes/global/id_004.inc
+++ b/testautomation/graphics/required/includes/global/id_004.inc
@@ -249,7 +249,7 @@ testcase tiInsertGraphic
     catch
         Warnlog "Insert graphic doesn't work :-("
     endcatch
-
+    WaitSlot (2000)
     printlog "close application "
     Call hCloseDocument
     
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 58582452dc63..c36bb8822808 100644
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -243,7 +243,7 @@ endcase
 testcase tFilePassword
    dim i,x as integer
    dim sTemp as string
-   const cFilterCount = 4
+   const cFilterCount = 3
    dim sFilterName as string
    dim sFilter as string
    dim sFilterExt() as string
@@ -269,7 +269,6 @@ testcase tFilePassword
    if x <> cFilterCount then warnlog " The Filter count is wrong! Have to be ("+cFilterCount+"), but are: "+x
 '   Check: (1): Open Office Formula (.oof)
 '   Check: (2): MathML 1.01 (.mml)
-'   Check: (5): StarMath 5.0 (.smf)
 '   Check: (6): StarOffice 6.0/7 Formula (.sxm)
 
 '/// check if any other then gMathFilter is password able; and if gMathFilter is password able ///'
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
index f8dd252cd174..33768d6ffc38 100644
--- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
+++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
@@ -217,7 +217,7 @@ testcase tExportAllReadableFormatsIntoThemselves
     end if
     app.Mkdir sWorkDirectory
 
-    For iCurrentFileIndex = 7 to 7
+    For iCurrentFileIndex = 1 to 7
         select case iCurrentFileIndex
         case 1 :   sCurrentFile = "xml2.odt"
             sCurrentFilter = "writer8"
@@ -225,49 +225,18 @@ testcase tExportAllReadableFormatsIntoThemselves
             sCurrentFilter = "Text (encoded)"
         case 3 :   sCurrentFile = "dostext.txt"
             sCurrentFilter = "Text (encoded)"
-        case 4 :   sCurrentFile = "sw30.sdw"
-            sCurrentFilter = "StarWriter 3.0"
-        case 5 :   sCurrentFile = "sw50.vor"
-            sCurrentFilter = "StarWriter 5.0 Vorlage/Template"
-        case 6 :   sCurrentFile = "sw31.sdw"
-            sCurrentFilter = "StarWriter 3.0"
-        case 7 :   sCurrentFile = "sw31.vor"
-            sCurrentFilter = "StarWriter 3.0 Vorlage/Template"
-        case 8 :   sCurrentFile = "sw40.sdw"
-            sCurrentFilter = "StarWriter 4.0"
-        case 9 :   sCurrentFile = "sw40_sp2.vor"
-            sCurrentFilter = "StarWriter 4.0 Vorlage/Template"
-        case 10 :  sCurrentFile = "sw50.sdw"
-            sCurrentFilter = "StarWriter 5.0"
-        case 11 :  sCurrentFile = "html.html"
+        case 4 :  sCurrentFile = "html.html"
             sCurrentFilter = "HTML (StarWriter)"
-        case 12 :  sCurrentFile = "rtf.rtf"
+        case 5 :  sCurrentFile = "rtf.rtf"
             sCurrentFilter = "Rich Text Format"
-        case 13 :  sCurrentFile = "sw60.sxw"
+        case 6 :  sCurrentFile = "sw60.sxw"
             sCurrentFilter = "StarOffice XML (Writer)"
-        case 14 :  sCurrentFile = "winw97.doc"
+        case 7 :  sCurrentFile = "winw97.doc"
             sCurrentFilter = "MS Word 97"
-        case 15 :  sCurrentFile = "winword6.doc"
+        case 8 :  sCurrentFile = "winword6.doc"
             sCurrentFilter = "MS Word 95"
-        case 16 :  sCurrentFile = "wintext.txt"
+        case 9 :  sCurrentFile = "wintext.txt"
             sCurrentFilter = "Text (encoded)"
-            '               case 17 : sCurrentFile = "pocketword.psw"
-            '                         sCurrentFilter = "PocketWord File"
-            '				TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported.
-            '               case 18 : sCurrentFile = "unixtext.txt"
-            '                         sCurrentFilter = "Text"
-            '               case 19 : sCurrentFile = "sw2.sdw"
-            '                         sCurrentFilter = "StarWriter 2.0"
-            '               case 20 : sCurrentFile = "amipro3.sam"
-            '                         sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)"
-            '               case 21 : sCurrentFile = "mactext.txt"
-            '                         sCurrentFilter = "Mac Write 4.x 5.0 (W4W)"
-            '               case 22 : sCurrentFile = "sw1.sdw"
-            '                         sCurrentFilter = "StarWriter 1.0"
-            '               case 23 : sCurrentFile = "swdoc.txt"
-            '                         sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)"
-            '               case 24 : sCurrentFile = "hangul.hwp"
-            '                         sCurrentFilter = "writer_MIZI_Hwp_97"
         end select
 
         sLoadFile = sImportDir & sCurrentFile
diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc
index 4bc525553f56..972f2303d565 100644
--- a/testautomation/writer/optional/includes/number/w_207_.inc
+++ b/testautomation/writer/optional/includes/number/w_207_.inc
@@ -106,12 +106,15 @@ testcase tToolsNumbering12
 				                 "." & sCurrentFilterExt )
 				hDeleteFile( ExportFileName ) ' There should never be a reason to overwrite 
 
-				printlog "  - export as: " & ExportFileName
-				Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter )
-				Call hCloseDocument
-
-				printlog "  - load previous saved document"
-				hFileOpen(  ExportFileName )
+                ' Binary export filter was removed
+                if iDocumentType < 3 then
+                    printlog "  - export as: " & ExportFileName
+                    Call hFileSaveAsWithFilter( ExportFileName, sCurrentFilter )
+                    Call hCloseDocument
+
+                    printlog "  - load previous saved document"
+                    hFileOpen(  ExportFileName )
+                endif
 
 				printlog "  - close document"
 				hFileCloseAll()
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 20b468c9605c..64eae48786c5 100644
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -910,6 +910,7 @@ testcase tToolsUpdate
     Call wTypeKeys ("Dieser Text ist zur Aktualisierung")
     printlog " Insert / Indexes"
     InsertIndexes
+    sleep 1
 
     Kontext "Active"
     if ( Active.Exists( 2 ) ) then
@@ -918,7 +919,8 @@ testcase tToolsUpdate
             Active.Ok
         end if
     end if
-
+    Sleep 5
+    
     Kontext
     Active.Setpage TabVerzeichnisseVerzeichnis
author	Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>	2011-02-14 16:17:22 +0100
committer	Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>	2011-02-14 16:17:22 +0100
commit	0b4b8235de8c85f887d6eafbdce2415c00917806 (patch)
tree	44c9a0f4b1b5b7e7eff127a9bb3fd8038915727d /testautomation
parent	6e3b8dfd54a1c9de8a1dd273d2c7e12d6743a6d4 (diff)
parent	cbd577ba3a737b0863156cfcfe46d45189ea95fa (diff)