CWS changehid: resync to m89

98 files changed, 147 insertions, 122 deletions

diff --git a/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas b/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas
index 3cbce6ec5da3..be3fe9ad0896 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Control Clipboard
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_General.bas b/testautomation/dbaccess/optional/dba_ctrl_General.bas
index a942539a3abc..4e66c5633d3b 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_General.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_General.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Controls General
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_Grid.bas b/testautomation/dbaccess/optional/dba_ctrl_Grid.bas
index 8ca71f992fd6..a143f43bf380 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_Grid.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_Grid.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Grid Control Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas b/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas
index bd2f6202bccc..e8822bc6f7be 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Property Browser 
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_Several.bas b/testautomation/dbaccess/optional/dba_ctrl_Several.bas
index 77053a220d76..9b831063ff5c 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_Several.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_Several.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Controls Several
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas b/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas
index 3f32a23d75ca..fb1e601d26fb 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Spreadsheets Controls
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
index 36f8c76da19f..6fc6ea2cb40f 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Controls Several
 '*
diff --git a/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas b/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas
index b037258828a8..05b728090d81 100755
--- a/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas
+++ b/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Control Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_ADOAccess.bas b/testautomation/dbaccess/optional/dba_db_ADOAccess.bas
index fa2ef9742f4b..78d33762e8dc 100755
--- a/testautomation/dbaccess/optional/dba_db_ADOAccess.bas
+++ b/testautomation/dbaccess/optional/dba_db_ADOAccess.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create ADO Access DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_AdabasD.bas b/testautomation/dbaccess/optional/dba_db_AdabasD.bas
index 9d767dfc09d3..d4adc067d343 100755
--- a/testautomation/dbaccess/optional/dba_db_AdabasD.bas
+++ b/testautomation/dbaccess/optional/dba_db_AdabasD.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create Adabas DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_Addressbook.bas b/testautomation/dbaccess/optional/dba_db_Addressbook.bas
index 868d2babfa6b..3a5a8fe218f9 100755
--- a/testautomation/dbaccess/optional/dba_db_Addressbook.bas
+++ b/testautomation/dbaccess/optional/dba_db_Addressbook.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Address Book
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_Dbase.bas b/testautomation/dbaccess/optional/dba_db_Dbase.bas
index ababbc0bf74d..a5f6712c6b6e 100755
--- a/testautomation/dbaccess/optional/dba_db_Dbase.bas
+++ b/testautomation/dbaccess/optional/dba_db_Dbase.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create dBase DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas b/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas
index 5d80f4ec56b7..7f0843575e2e 100755
--- a/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas
+++ b/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create JDBC MySQL DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas b/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas
index 91e93015ec8f..e61dff1a44f1 100755
--- a/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas
+++ b/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create Spreadsheet DS & standard ds tests
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_Text.bas b/testautomation/dbaccess/optional/dba_db_Text.bas
index 5e01a89693d6..1193a3342569 100755
--- a/testautomation/dbaccess/optional/dba_db_Text.bas
+++ b/testautomation/dbaccess/optional/dba_db_Text.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create Text DS & further standard db tests
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_dBase_functions.bas b/testautomation/dbaccess/optional/dba_db_dBase_functions.bas
index 1646c48df088..58f5ff23914f 100755
--- a/testautomation/dbaccess/optional/dba_db_dBase_functions.bas
+++ b/testautomation/dbaccess/optional/dba_db_dBase_functions.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Optional test for dBase functions
 '*
diff --git a/testautomation/dbaccess/optional/dba_db_hsqldb.bas b/testautomation/dbaccess/optional/dba_db_hsqldb.bas
index 925d73f9385f..3aa06329a03a 100755
--- a/testautomation/dbaccess/optional/dba_db_hsqldb.bas
+++ b/testautomation/dbaccess/optional/dba_db_hsqldb.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : hsqldb test
 '*
diff --git a/testautomation/dbaccess/optional/dba_frm_FormFilter.bas b/testautomation/dbaccess/optional/dba_frm_FormFilter.bas
index e91882002242..a820e1d36e58 100755
--- a/testautomation/dbaccess/optional/dba_frm_FormFilter.bas
+++ b/testautomation/dbaccess/optional/dba_frm_FormFilter.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Form Filter Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_frm_Forms.bas b/testautomation/dbaccess/optional/dba_frm_Forms.bas
index 18efcfbe164f..65d0a7280466 100755
--- a/testautomation/dbaccess/optional/dba_frm_Forms.bas
+++ b/testautomation/dbaccess/optional/dba_frm_Forms.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Forms Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_misc_Macros.bas b/testautomation/dbaccess/optional/dba_misc_Macros.bas
index e0d2e44a1dbe..659396bb98aa 100755
--- a/testautomation/dbaccess/optional/dba_misc_Macros.bas
+++ b/testautomation/dbaccess/optional/dba_misc_Macros.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Macros in Databases
 '*
diff --git a/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas b/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas
index 411a50bc4543..125010d42120 100755
--- a/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas
+++ b/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Register Databases
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_DateTime.bas b/testautomation/dbaccess/optional/dba_rpt_DateTime.bas
index 5b9267c3e1b1..e53a92b97f1d 100755
--- a/testautomation/dbaccess/optional/dba_rpt_DateTime.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_DateTime.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Date Time
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas b/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas
index c64207b76b0d..e2e290daed42 100755
--- a/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Execute Report
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_Formating.bas b/testautomation/dbaccess/optional/dba_rpt_Formating.bas
index dcb9d99f4038..bcbb67a1e10e 100755
--- a/testautomation/dbaccess/optional/dba_rpt_Formating.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_Formating.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Base Optional Test for Conditional Formating
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas
index 4fa2fa64dca9..b0c868d7651a 100755
--- a/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Function Wizard
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_Grouping.bas b/testautomation/dbaccess/optional/dba_rpt_Grouping.bas
index 3cc7a4c7c260..3702ba49a370 100755
--- a/testautomation/dbaccess/optional/dba_rpt_Grouping.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_Grouping.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Grouping Report
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas b/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas
index 0c390a01dbc3..483b0522199e 100755
--- a/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Page Number
 '*
diff --git a/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas b/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas
index 21938422eb21..e605369bed24 100755
--- a/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas
+++ b/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Test for the property browser
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas b/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas
index 5a223a7f600a..4a65067152e8 100755
--- a/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Copy Table Wizard
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas b/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas
index dfad77310e46..5e97e0dd1f76 100755
--- a/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Database Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas b/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas
index cf3b26c59293..75377cd71fcd 100755
--- a/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Form Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas b/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas
index 306c684d03e8..79b05f86de9a 100755
--- a/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Query Autopilot Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas b/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas
index e20fd7c6fc1f..984e1c2fd644 100755
--- a/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Wizard
 '*
diff --git a/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas b/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas
index 4a5e28051b9e..458976b3a419 100755
--- a/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas
+++ b/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Table Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/dba_xf_Submission.bas b/testautomation/dbaccess/optional/dba_xf_Submission.bas
index 590869a40a1e..460cd8a13554 100755
--- a/testautomation/dbaccess/optional/dba_xf_Submission.bas
+++ b/testautomation/dbaccess/optional/dba_xf_Submission.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : XForm Submission Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 005d5d3f0ec7..020f0bb8435b 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Clipboard test with controls between all application
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 00c1b17e4c4b..9e137f4c7a70 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Data Source Administrator
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
index cda004644496..4b41014a2257 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Grid Control Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
index feee460b9e5d..f51b14ea191b 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Property Browser
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
index 0d7b24cbc0f2..4e0cd9334800 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Control Serveral Part 1 - check each control and each property
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
index 4d49e459b231..82fa9229b1f8 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Control Serveral Part 2 (more controls) - check each control and each property
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
index 600a0173a772..57a7973a8f89 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Controls linked to spreadsheet cells
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
index 00563d2a2bf8..4abf5a19b73d 100644
--- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Text Control
 '*
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index 7c48e78e149d..49bcaceb6ac7 100755..100644
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Control Wizards Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
index bd149f79d312..aeb14d7616ac 100644
--- a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
+++ b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create ADO Access DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_AdabasD.inc b/testautomation/dbaccess/optional/includes/db_AdabasD.inc
index 0d72c0ab40b5..d5498582fa0a 100644
--- a/testautomation/dbaccess/optional/includes/db_AdabasD.inc
+++ b/testautomation/dbaccess/optional/includes/db_AdabasD.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create Adabas DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Dbase.inc b/testautomation/dbaccess/optional/includes/db_Dbase.inc
index 0caf8935ee74..7b5a67e7496d 100644
--- a/testautomation/dbaccess/optional/includes/db_Dbase.inc
+++ b/testautomation/dbaccess/optional/includes/db_Dbase.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create dBase DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
index 74e26f16e33a..6d690a29225a 100644
--- a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
+++ b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Dbase function test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
index eb5a400c19c1..a41f2b396042 100644
--- a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
+++ b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc
@@ -26,7 +26,7 @@
 '/************************************************************************
 
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : tests for indexes
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
index bf2b9892d118..93f864d7e0d4 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create JDBC MySQL DS & Table & fill in Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
index aefc2a51679f..236b6a5e79ed 100644
--- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc
+++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
@@ -25,29 +25,42 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Address book mozilla
 '*
 '\***********************************************************************
 sub db_Mozilla
 
-    ' Information for this test under
-    ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
-
-    if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
-        
-        tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
-        tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
-	else
+    if(gPlatform = "osx") then
+        ' on Mac platform the Mozilla address book is not available
+        ' so I call only the testcases to satisfied the database
         tQueryAddressbook("")
         tSortAddressbook("")
+    else
+    
+        ' Information for this test under
+        ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
+
+        if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
+
+            tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+            tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+            else
+            tQueryAddressbook("")
+            tSortAddressbook("")
+        endif
     endif
     
 end sub
 '-------------------------------------------------------------------------
 testcase tQueryAddressbook( sFileName )
     
+    if(gPlatform = "osx") then
+        printlog "mozilla address book not available on Mac"
+        goto endsub
+    endif
+
     if ( not fOpenDatabase(sFileName) ) then        
         warnlog "Database can't be open"
         printlog "May be you find a solution under http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book"
@@ -86,6 +99,11 @@ endcase
 '-------------------------------------------------------------------------
 testcase tSortAddressbook( sFileName )
     
+    if(gPlatform = "osx") then
+        printlog "mozilla address book not available on Mac"
+        goto endsub
+    endif
+
     Dim sRecordCount as String
     
     '/// open the database file created in the bas file
diff --git a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
index 0dab9fe9551e..0fd0a8bcfb5f 100644
--- a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
+++ b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : ODBC MySQL Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc
index bb93fd4d94cf..46dce6e903c6 100644
--- a/testautomation/dbaccess/optional/includes/db_Query.inc
+++ b/testautomation/dbaccess/optional/includes/db_Query.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Query Test Library
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc
index e04a1be4c6d6..98a94562c743 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_Relations.inc
+++ b/testautomation/dbaccess/optional/includes/db_Relations.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Base Level 1 Create Relations between Test Tables
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
index 37f1ddc8e1af..87eb5e1ce240 100644
--- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
+++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Create Spreadsheet DS & standard ds tests
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc
index b6dcd729d351..6130aee378b8 100644
--- a/testautomation/dbaccess/optional/includes/db_Text.inc
+++ b/testautomation/dbaccess/optional/includes/db_Text.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test for a text database
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_Windows.inc b/testautomation/dbaccess/optional/includes/db_Windows.inc
index 60382a91ed3c..6d675f2dd07f 100644
--- a/testautomation/dbaccess/optional/includes/db_Windows.inc
+++ b/testautomation/dbaccess/optional/includes/db_Windows.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Addressbook Windows
 '*
diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
index 3ad3016a9eb3..061f786017ba 100755..100644
--- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc
+++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : hsqldb test
 '*
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index 52579da2e15b..74edeb1df3aa 100755..100644
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Form Filter Test Library
 '*
@@ -47,7 +47,9 @@ testcase tLoadForm
 	Kontext "DocumentWriter"
     '/// press CTRL + F5 to get into the first textbox
     printlog "press CTRL + F5 to get into the first textbox"
-	DocumentWriter.TypeKeys "<MOD1 F5>" , true
+	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	'sleep(1)
 	'DocumentWriter.TypeKeys "<MOD1 C>" , true
 	'sleep(1)
@@ -59,6 +61,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert 2 in the first textbox
     printlog "insert 2 in the first textbox"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
 	DocumentWriter.TypeKeys "2" , true
@@ -69,7 +73,7 @@ testcase tLoadForm
 	FM_FF_Execute
 	wait(1000)
     printlog "workaround issue 102010"
-	DocumentWriter.TypeKeys "<MOD1 F6>" , true
+    DocumentWriter.TypeKeys "<MOD1 F6>" , true
     sleep(1)
     DocumentWriter.TypeKeys "<MOD1 F5>" , true   
     sleep(1)
@@ -94,6 +98,8 @@ testcase tLoadForm
 	wait(1000)
     '/// insert into the second textbox like '%2'
     printlog "insert into the second textbox like '%2'"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
 	sleep(1)
         DocumentWriter.TypeKeys "<TAB>" , true
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index 6b63754314e4..630e1920cbce 100644
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Form Test
 '*
@@ -173,7 +173,7 @@ testcase tCreateForm
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -543,7 +543,7 @@ testcase tCreateSubForms
    	'/// insert a textfield
     printlog "insert a textfield"        
     Edit.Click
-   	call hDrawingWithSelection ( 50, 20, 60, 30 )
+   	call hDrawingWithSelection ( 50, 30, 60, 40 )
    	sleep(1)
     
     Kontext "FormControls"
@@ -638,7 +638,7 @@ testcase tCreateSubForms
        '/// insert a textfield
        printlog "insert a textfield"
        'Edit.Click
-   	 call hDrawingWithSelection ( 50, 40, 60, 50 )
+   	 call hDrawingWithSelection ( 50, 50, 60, 60 )
    	 sleep(1)
     
     Kontext "FormControls"
@@ -672,6 +672,8 @@ testcase tCheckSubForm
     '/// set cursor into the first control
     printlog "set cursor into the first control"   
     Kontext "DocumentWriter"
+        DocumentWriter.TypeKeys "<MOD1 F6>" , true
+        wait(1000)
         DocumentWriter.TypeKeys "<MOD1 F5>" , true
         sleep(1)
            
@@ -749,7 +751,7 @@ testcase tCreateSubFormsNewMethod
         '/// insert a textfield
         printlog "insert a textfield"        
         Edit.Click
-        call hDrawingWithSelection ( 50, 20, 60, 30 )
+        call hDrawingWithSelection ( 50, 30, 60, 40 )
         sleep(1)
     
     Kontext "FormControls"
diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc
index dc14c715c305..e707682e3218 100755..100644
--- a/testautomation/dbaccess/optional/includes/misc_Macros.inc
+++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : macros in databases
 '*
diff --git a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
index d072fbab0139..7e9eabf664d9 100644
--- a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
+++ b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Register database
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
index 648fc64c72bc..53c9570a5d75 100644
--- a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Date Time Dialog
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
index 084cdea51787..91270481ca7b 100644
--- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Execute Report
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_Formating.inc b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
index b4d022afd126..4bde542bd176 100644
--- a/testautomation/dbaccess/optional/includes/rpt_Formating.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_Formating.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Formating
 '*
@@ -62,9 +62,9 @@ testcase tConditionalFormating
         sleep(1)
     
     Kontext "ReportDesign"    
-        ReportDesign.MouseDown ( 30, 50 )            
-        ReportDesign.MouseMove ( 40, 60 )            
-        ReportDesign.MouseUp ( 40, 60 )            
+        ReportDesign.MouseDown ( 30, 40 )
+        ReportDesign.MouseMove ( 40, 50 )
+        ReportDesign.MouseUp ( 40, 50 )
     sleep(1)  
     
     '/// open the conditional formating dialog via the menu
@@ -129,9 +129,9 @@ testcase tGrowAndShrink
         sleep(1)
     
     Kontext "ReportDesign"    
-        ReportDesign.MouseDown ( 30, 50 )            
-        ReportDesign.MouseMove ( 40, 60 )            
-        ReportDesign.MouseUp ( 40, 60 )            
+        ReportDesign.MouseDown ( 30, 40 )
+        ReportDesign.MouseMove ( 40, 50 )
+        ReportDesign.MouseUp ( 40, 50 )
     sleep(1)                        
     
     '/// open the conditional formating dialog via the menu
diff --git a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
index 4435136e1a85..810b2168c3ce 100644
--- a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Function Wizard
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
index 3497dc446aef..229aebb7f599 100644
--- a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Grouping Report
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
index 7a3881a56dc7..a7fae4c7ffd4 100644
--- a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Page Number
 '*
diff --git a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
index 9f14245b7b48..b3ee038a2f81 100644
--- a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Property Browser
 '*
diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
index 0cc614af0d87..34f6cb3e3ecf 100644
--- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Copy Table Autopilot
 '*
diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index bd25224ba429..df9026ba2dd9 100755..100644
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Database Wizard
 '*
diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
index 55350854f0af..b3949b40ed49 100644
--- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Form Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
index fad77d94f9de..19411fd4f105 100644
--- a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Query Autopilot Test
 '* preconditions : Adabas has to be installed on the test machine
diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
index f089ecb191ff..67010e64fbfb 100644
--- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Wizard Test
 '*
diff --git a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
index 791a31344ae7..cce02149942f 100644
--- a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Table Wizard
 '*
diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc
index adfd53e5fe23..05f0da768cdf 100644
--- a/testautomation/dbaccess/optional/includes/xf_Submission.inc
+++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : XForms submission Test
 '*
@@ -41,6 +41,8 @@ end sub
 '-------------------------------------------------------------------------
 testcase tDataNavigatorSubmission    
     
+    Dim sSubmitPath as string
+
     '/// open new XML Form
     printlog "open new XML Form"
     
@@ -101,11 +103,8 @@ testcase tDataNavigatorSubmission
     '/// add a submission
     Kontext "XFormAddSubmission"
         SubmitName.setText("submission1")
-        if ( gPlatgroup = "w95" ) then
-            SubmitAction.setText("file:///" + ConvertPath(gOfficePath,"lin") + "user/work/test.xml")
-        else
-            SubmitAction.setText("file://" + gOfficePath + "user/work/test.xml")
-        endif
+        sSubmitPath = "file:///" + gOfficePath + "user/work/test.xml"
+        SubmitAction.setText( hStringReplaceChar( sSubmitPath, "\", "/" ) )
         SubmitMethod.select 2            
             
     '/// close the add submission dialog
diff --git a/testautomation/dbaccess/required/dba_Main.bas b/testautomation/dbaccess/required/dba_Main.bas
index 93a026489767..0d07dde2f3fb 100755
--- a/testautomation/dbaccess/required/dba_Main.bas
+++ b/testautomation/dbaccess/required/dba_Main.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : DBAccess Main Test
 '*
diff --git a/testautomation/dbaccess/required/dba_ReportBuilder.bas b/testautomation/dbaccess/required/dba_ReportBuilder.bas
index 38be95f378fe..c57e31d2e45b 100755
--- a/testautomation/dbaccess/required/dba_ReportBuilder.bas
+++ b/testautomation/dbaccess/required/dba_ReportBuilder.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Builder Main Test
 '*
diff --git a/testautomation/dbaccess/required/dba_xforms_Main.bas b/testautomation/dbaccess/required/dba_xforms_Main.bas
index 9e0dc16593b9..52efa7af582f 100755
--- a/testautomation/dbaccess/required/dba_xforms_Main.bas
+++ b/testautomation/dbaccess/required/dba_xforms_Main.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : XForms Update Test
 '*
diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
index 02c8d29b63c7..ae5688374c75 100755..100644
--- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc
+++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the database types
 '*
diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc
index 288d4d250b0f..45c308f2b1f7 100644
--- a/testautomation/dbaccess/required/includes/Forms.inc
+++ b/testautomation/dbaccess/required/includes/Forms.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test forms
 '*
diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc
index eab441cbb228..fddb8d34667f 100755..100644
--- a/testautomation/dbaccess/required/includes/MainApp.inc
+++ b/testautomation/dbaccess/required/includes/MainApp.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the Main Application Window
 '*
diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc
index f6fa45acbdd7..0fa9d6addb24 100755..100644
--- a/testautomation/dbaccess/required/includes/Query.inc
+++ b/testautomation/dbaccess/required/includes/Query.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the Main Query Application Window
 '*
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index c6ecfb9520e5..d1cce59d4d3f 100644
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : report builder include file
 '*
diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc
index f7a00c22fcd5..6d478bd35540 100755..100644
--- a/testautomation/dbaccess/required/includes/Table.inc
+++ b/testautomation/dbaccess/required/includes/Table.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the Main Table Application Window
 '*
diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc
index 9204d34de1b9..9da4d602a6d9 100755..100644
--- a/testautomation/dbaccess/required/includes/TableDesign.inc
+++ b/testautomation/dbaccess/required/includes/TableDesign.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the Main Table Design Application Window
 '*
diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc
index 84e6c45a0e18..4cde075d0e35 100644
--- a/testautomation/dbaccess/required/includes/Wizards.inc
+++ b/testautomation/dbaccess/required/includes/Wizards.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : test the Main Wizard Application Window
 '*
diff --git a/testautomation/dbaccess/required/includes/Xforms01.inc b/testautomation/dbaccess/required/includes/Xforms01.inc
index 458a3df26cfe..fcf3e03a98ea 100644
--- a/testautomation/dbaccess/required/includes/Xforms01.inc
+++ b/testautomation/dbaccess/required/includes/Xforms01.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : XForms Main Test include file
 '*
diff --git a/testautomation/dbaccess/required/input/oracle-report-builder.oxt b/testautomation/dbaccess/required/input/oracle-report-builder.oxt
new file mode 100644
index 000000000000..e806ba70897f
--- /dev/null
+++ b/testautomation/dbaccess/required/input/oracle-report-builder.oxt
diff --git a/testautomation/dbaccess/required/input/sun-report-builder.oxt b/testautomation/dbaccess/required/input/sun-report-builder.oxt
deleted file mode 100755
index 658fedac671b..000000000000
--- a/testautomation/dbaccess/required/input/sun-report-builder.oxt
+++ /dev/null
diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc
index 5d3e3bfbc03a..28b0583c0b42 100644
--- a/testautomation/dbaccess/tools/controltools.inc
+++ b/testautomation/dbaccess/tools/controltools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Helper Routines for Form and Control Tests
 '*
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index 964c2be5e64d..2658281f65be 100755..100644
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Library with function for creating all possible databases
 '*
diff --git a/testautomation/dbaccess/tools/dbinit.inc b/testautomation/dbaccess/tools/dbinit.inc
index e6d3692499d1..53f192747926 100644
--- a/testautomation/dbaccess/tools/dbinit.inc
+++ b/testautomation/dbaccess/tools/dbinit.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Helper Routines for Base tests.
 '*
diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc
index dd884d2cab1c..2e40a3f25726 100755..100644
--- a/testautomation/dbaccess/tools/dbtools.inc
+++ b/testautomation/dbaccess/tools/dbtools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Helper Routines for Base tests.
 '*
diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc
index 90d29b647384..ef7105ccef22 100755..100644
--- a/testautomation/dbaccess/tools/formtools.inc
+++ b/testautomation/dbaccess/tools/formtools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Helper Routines for Base tests.
 '*
diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc
index f4fc4aeb4847..29416dac7bf3 100644
--- a/testautomation/dbaccess/tools/querytools.inc
+++ b/testautomation/dbaccess/tools/querytools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Helper Routines for Base tests.
 '*
diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc
index 89dd00b504c6..70b9ff129bd5 100755..100644
--- a/testautomation/dbaccess/tools/reporttools.inc
+++ b/testautomation/dbaccess/tools/reporttools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Report Helper Routines for Base tests.
 '*
@@ -365,7 +365,7 @@ function tools_reporttools_InstallExtension
     dim i as integer
     use "global/tools/includes/optional/t_extension_manager_tools.inc"
     if (not hIsExtensionAlreadyInstalled("Report Builder")) then
-        i = hExtensionAddGUI( gTesttoolPath + "dbaccess/required/input/sun-report-builder.oxt", "AcceptLicense,InstallForUser" )
+        i = hExtensionAddGUI( gTesttoolPath + "dbaccess/required/input/oracle-report-builder.oxt", "AcceptLicense,InstallForUser" )
         if (i > 0) then    
             tools_reporttools_InstallExtension = 0
         else
diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc
index fb354dcd4a75..99c4abf723b3 100755..100644
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : marc.neumann@sun.com
+'* owner : marc.neumann@oracle.com
 '*
 '* short description : Tools for Tables
 '*