930 files changed, 14322 insertions, 6909 deletions

diff --git a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas
index 267c3c1e4303..83ac7f78c3c9 100755
--- a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas
+++ b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Resource Test for the Chart Data Dialogue in Impress.
 '*
diff --git a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas
index 9fa1b3e5f051..6feedeb8004e 100755
--- a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas
+++ b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Updatetest for Flexible Source Range Selection 
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas
index b6bf42f77b8d..ed1dce13adb5 100755
--- a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas
+++ b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: ODS, Output:ODS
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas
index 0e58413390c5..8cc8ffe9835c 100755
--- a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas
+++ b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: ODS, Output: OTS
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
index 83884e36da66..d61c6183086a 100755
--- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
+++ b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: ODS, Output: SDC
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas
index f711beb925b7..00940a2ca37f 100755
--- a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas
+++ b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: ODS, Output: SXC
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas
index 4248e5e395f0..3a8ca2916eec 100755
--- a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas
+++ b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: ODS, Output: XLS
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas
index 405bb6a421a1..c662dfc52b3a 100755
--- a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas
+++ b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: SXC, Output:ODS
 '*
diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
index f2498ddf99bd..7c8e8726f580 100755
--- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
+++ b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load/Save test for chart files - Input: SXC, Output: SDC
 '*
diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas
index 7d13d601ec18..9ae9f40ce301 100755
--- a/testautomation/chart2/optional/ch2_lvl1.bas
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart2 functional tests
 '*
diff --git a/testautomation/chart2/optional/ch2_lvl1_wizard.bas b/testautomation/chart2/optional/ch2_lvl1_wizard.bas
index abe38f970a89..41811109e473 100755
--- a/testautomation/chart2/optional/ch2_lvl1_wizard.bas
+++ b/testautomation/chart2/optional/ch2_lvl1_wizard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Level 1 functional test for Chart2 Wizard
 '*
diff --git a/testautomation/chart2/optional/ch2_xml_format.bas b/testautomation/chart2/optional/ch2_xml_format.bas
index 75f3c10c9cb9..25f5d751b58f 100755
--- a/testautomation/chart2/optional/ch2_xml_format.bas
+++ b/testautomation/chart2/optional/ch2_xml_format.bas
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : General XML file format check
 '*
diff --git a/testautomation/chart2/optional/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
index f7e4078ad911..1b723c1479b7 100644
--- a/testautomation/chart2/optional/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : oliver.craemer@sun.com
+'* Owner : oliver.craemer@oracle.com
 '*
 '* short description : Resource-test for the Chart Data Dialogue.
 '*
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 8cb7e0851809..0151f5021b3e 100644
--- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
+++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Updatetest for Flexible Source Range Selection in spreadsheets
 '*
diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc
index 819b7da04c9a..ec2496ecb1f3 100644
--- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc
+++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Updatetest for Flexible Source Range Selection in Writer
 '*
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index 99ca5a985bc4..6da6e29ac72d 100644..100755
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart2 functional tests
 '*
diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc
index 34b84e85250e..b530b0c2a364 100755..100644
--- a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc
+++ b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Load file of one Spreadsheet format and save to another
 '*
diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
index 0cf868bacaaf..ef61dc36e704 100755..100644
--- a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
+++ b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Verify the Chart2 XML file format
 '*
@@ -221,10 +221,10 @@ testcase tCompareXMLFormatLoad
     SAXSeekElement("chart:plot-area")
     '/// If the attribute value of 'table:cell-range-address' is 'Sheet1.A1:Sheet1.B2'
     '///+ the second characteristics validation has been passed.
-    if SAXGetAttributeValue("table:cell-range-address") = "Sheet1.A1:B2" then
+    if SAXGetAttributeValue("table:cell-range-address") = "Sheet1.A1:Sheet1.B2" then
         printlog "The cell range for chart:plot-area is correct"
     else
-        warnlog "#i100780#: The cell range is not Sheet1.A1:B2, it is " & SaxGetAttributeValue("table:cell-range-address")
+        warnlog "The cell range is not Sheet1.A1:Sheet1.B2, it is " & SaxGetAttributeValue("table:cell-range-address")
     endif
     printlog "Seek for chart:series"
     printlog "               |-chart:series"
@@ -232,10 +232,10 @@ testcase tCompareXMLFormatLoad
     SAXSeekElement("chart:series")
     '/// If the attribute valie of 'chart:values-cell-range-address' is Sheet1.A1:Sheet1.A2''
     '///+ the hird characteristics validation has been passed.
-    if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1:A2" then
+    if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1:Sheet1.A2" then
         printlog "The cell range for chart:series is correct"
     else
-        warnlog "#i100780#: The cell range is not Sheet1.A1:A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address")
+        warnlog "The cell range is not Sheet1.A1:Sheet1.A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address")
     endif
     ' DEBUG: printlog "I'm here: " & SAXGetElementName
     '/// Close the XML editor.
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
index 6bcf3399796d..357fa89c4393 100755..100644
--- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
+++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart wizard general functionality
 '*
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc
index e260d274e7ea..a89e8fad80d8 100644
--- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc
+++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : New chart types
 '*
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 7dba15ead84f..02cc2c883269 100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Resource Test for all chart specific menues
 '*
diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc
index 049ed6b7c9fb..f7166df9c82e 100644
--- a/testautomation/chart2/required/includes/ch2_file.inc
+++ b/testautomation/chart2/required/includes/ch2_file.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - Menu FILE
 '*
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index 1eb92e42a480..42048cbbb7de 100644
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - Menu FORMAT
 '*
diff --git a/testautomation/chart2/required/includes/ch2_format1.inc b/testautomation/chart2/required/includes/ch2_format1.inc
index afae7e99e272..dbe1de149c9c 100644
--- a/testautomation/chart2/required/includes/ch2_format1.inc
+++ b/testautomation/chart2/required/includes/ch2_format1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Continue Chart resource test - Menu FORMAT
 '*
diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc
index 7d65aa3460e2..79923a8198c6 100644
--- a/testautomation/chart2/required/includes/ch2_insert.inc
+++ b/testautomation/chart2/required/includes/ch2_insert.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - Menu INSERT
 '*
diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
index 03a91db6acb1..d01f9f8eee5f 100644
--- a/testautomation/chart2/required/includes/ch2_insert_ctl.inc
+++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - CTL features
 '*
diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc
index 7461fbc1461c..d7f5efbee3a5 100644
--- a/testautomation/chart2/required/includes/ch2_menu.inc
+++ b/testautomation/chart2/required/includes/ch2_menu.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Resource Test for chart2 main menus
 '*
diff --git a/testautomation/chart2/required/includes/ch2_ole.inc b/testautomation/chart2/required/includes/ch2_ole.inc
index 51b5db4a1d5f..6daf6545de41 100644
--- a/testautomation/chart2/required/includes/ch2_ole.inc
+++ b/testautomation/chart2/required/includes/ch2_ole.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - section FILE
 '*
diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc
index c447078131fc..32eed54ee370 100644
--- a/testautomation/chart2/required/includes/ch2_toolbars.inc
+++ b/testautomation/chart2/required/includes/ch2_toolbars.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - section toolbars
 '*
diff --git a/testautomation/chart2/required/includes/ch2_view.inc b/testautomation/chart2/required/includes/ch2_view.inc
index 32664c0f0b16..39beac14839c 100644
--- a/testautomation/chart2/required/includes/ch2_view.inc
+++ b/testautomation/chart2/required/includes/ch2_view.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - Menu VIEW
 '*
diff --git a/testautomation/chart2/required/includes/ch2_window.inc b/testautomation/chart2/required/includes/ch2_window.inc
index a9769c10a278..407898e228d1 100644
--- a/testautomation/chart2/required/includes/ch2_window.inc
+++ b/testautomation/chart2/required/includes/ch2_window.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart resource test - Menu WINDOW
 '*
diff --git a/testautomation/chart2/required/includes/ch2_wizard.inc b/testautomation/chart2/required/includes/ch2_wizard.inc
index 5939c9b7e682..df97ba6bda43 100644
--- a/testautomation/chart2/required/includes/ch2_wizard.inc
+++ b/testautomation/chart2/required/includes/ch2_wizard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Create new Chart using the Wizard
 '*
diff --git a/testautomation/chart2/tools/ch_tools_axes.inc b/testautomation/chart2/tools/ch_tools_axes.inc
index 9ac6788e409d..ef897fbc345f 100644
--- a/testautomation/chart2/tools/ch_tools_axes.inc
+++ b/testautomation/chart2/tools/ch_tools_axes.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Library for automation of the 'Insert::Axes...' dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_chart_type.inc b/testautomation/chart2/tools/ch_tools_chart_type.inc
index 4cadbb748a11..7cf0a1e7d61b 100644
--- a/testautomation/chart2/tools/ch_tools_chart_type.inc
+++ b/testautomation/chart2/tools/ch_tools_chart_type.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for chart type dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc
index 2a8664109e19..f6d722fa2a25 100755..100644
--- a/testautomation/chart2/tools/ch_tools_common.inc
+++ b/testautomation/chart2/tools/ch_tools_common.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Chart2 Tool library
 '*
diff --git a/testautomation/chart2/tools/ch_tools_data_labels.inc b/testautomation/chart2/tools/ch_tools_data_labels.inc
index d1cf05360e2c..879ddae59361 100644
--- a/testautomation/chart2/tools/ch_tools_data_labels.inc
+++ b/testautomation/chart2/tools/ch_tools_data_labels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Data Labels dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_grids.inc b/testautomation/chart2/tools/ch_tools_grids.inc
index 0a0bc8226387..d909ef7426e1 100644
--- a/testautomation/chart2/tools/ch_tools_grids.inc
+++ b/testautomation/chart2/tools/ch_tools_grids.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Grids dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_legend.inc b/testautomation/chart2/tools/ch_tools_legend.inc
index 9c96ff79eb83..9c16c71d1af7 100644
--- a/testautomation/chart2/tools/ch_tools_legend.inc
+++ b/testautomation/chart2/tools/ch_tools_legend.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Legend dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_select.inc b/testautomation/chart2/tools/ch_tools_select.inc
index beeda0d3dcdd..8df51c8d9279 100755..100644
--- a/testautomation/chart2/tools/ch_tools_select.inc
+++ b/testautomation/chart2/tools/ch_tools_select.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : selecting charts
 '*
diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc
index d1c3cf6d0bc9..59bd74496113 100644
--- a/testautomation/chart2/tools/ch_tools_statistics.inc
+++ b/testautomation/chart2/tools/ch_tools_statistics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Statistics dialog
 '*
diff --git a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc
index 1d5f3e227f6b..4d9847615782 100644
--- a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc
+++ b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Borders and Lines tab-page
 '*
diff --git a/testautomation/chart2/tools/ch_tools_tab_pages.inc b/testautomation/chart2/tools/ch_tools_tab_pages.inc
index 8d1954d4578c..63d88d35c3ff 100644
--- a/testautomation/chart2/tools/ch_tools_tab_pages.inc
+++ b/testautomation/chart2/tools/ch_tools_tab_pages.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Borders and Lines tab-page
 '*
diff --git a/testautomation/chart2/tools/ch_tools_titles.inc b/testautomation/chart2/tools/ch_tools_titles.inc
index 0f250a50be70..c3b64a6fa8f7 100644
--- a/testautomation/chart2/tools/ch_tools_titles.inc
+++ b/testautomation/chart2/tools/ch_tools_titles.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Tool library for Titles dialog
 '*
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
 '*
diff --git a/testautomation/extensions/optional/e_display_name.bas b/testautomation/extensions/optional/e_display_name.bas
index 61c57458b374..c05ce235cb25 100755
--- a/testautomation/extensions/optional/e_display_name.bas
+++ b/testautomation/extensions/optional/e_display_name.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension display names
 '*
diff --git a/testautomation/extensions/optional/e_extensions.bas b/testautomation/extensions/optional/e_extensions.bas
index 2ea2a68a0ef5..fb7decd9eed6 100755
--- a/testautomation/extensions/optional/e_extensions.bas
+++ b/testautomation/extensions/optional/e_extensions.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function test of extension manager
 '*
diff --git a/testautomation/extensions/optional/e_fileopen.bas b/testautomation/extensions/optional/e_fileopen.bas
index 3cc2ea374869..63afebe693ba 100755
--- a/testautomation/extensions/optional/e_fileopen.bas
+++ b/testautomation/extensions/optional/e_fileopen.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 3f18db86689d..79420ad9d4de 100755
--- a/testautomation/extensions/optional/e_help.bas
+++ b/testautomation/extensions/optional/e_help.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extensible help
 '*
diff --git a/testautomation/extensions/optional/e_identifiers.bas b/testautomation/extensions/optional/e_identifiers.bas
index 526447987d2e..3eea26b9d46f 100755
--- a/testautomation/extensions/optional/e_identifiers.bas
+++ b/testautomation/extensions/optional/e_identifiers.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 549ad69b1a2e..cd3a4fe2f2ad 100644..100755
--- a/testautomation/extensions/optional/e_issues.bas
+++ b/testautomation/extensions/optional/e_issues.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension publisher string
 '*
diff --git a/testautomation/extensions/optional/e_location.bas b/testautomation/extensions/optional/e_location.bas
index bec66a615c99..cfe2f0c0fb19 100755
--- a/testautomation/extensions/optional/e_location.bas
+++ b/testautomation/extensions/optional/e_location.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 7eb96001aed0..1e4e80dc1f0b 100755
--- a/testautomation/extensions/optional/e_meta-inf.bas
+++ b/testautomation/extensions/optional/e_meta-inf.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 f0f63c3514ed..0a23d2ad4aa7 100755
--- a/testautomation/extensions/optional/e_online_update.bas
+++ b/testautomation/extensions/optional/e_online_update.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 97126a333bb8..bfa0a14e16a5 100755
--- a/testautomation/extensions/optional/e_options.bas
+++ b/testautomation/extensions/optional/e_options.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Options for extensions
 '*
diff --git a/testautomation/extensions/optional/e_platforms.bas b/testautomation/extensions/optional/e_platforms.bas
index fa8a348733b7..3884e374317f 100755
--- a/testautomation/extensions/optional/e_platforms.bas
+++ b/testautomation/extensions/optional/e_platforms.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Supported extension platforms
 '*
diff --git a/testautomation/extensions/optional/e_publisher.bas b/testautomation/extensions/optional/e_publisher.bas
index c1dde48729dc..e87d84d05f49 100755
--- a/testautomation/extensions/optional/e_publisher.bas
+++ b/testautomation/extensions/optional/e_publisher.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 c77fb413e016..080c22fa3a98 100644
--- a/testautomation/extensions/optional/includes/display_name.inc
+++ b/testautomation/extensions/optional/includes/display_name.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension display names
 '*
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index 8d1c63ea7bab..db115274e19d 100644
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function test of extension manager
 '*
@@ -620,16 +620,24 @@ testcase tExtensionsFunction
     ' uninstall all components, that were installed
     a = listCount(aRemovePackages())
     ToolsPackageManager
+
     kontext "PackageManager"
     If PackageManager.exists(10) then
+
         BrowsePackages.typeKeys("<home>")
+        waitslot()
+
         ii = 1
         while (ii < BrowsePackages.getItemCount +1)
+        
+            wait( 2000 ) ' Required, Extension Manager needs time to populate
             kontext "PackageManager"
             'BrowsePackages.typeKeys("+")
             'BrowsePackages.typeKeys("<down>")
             sTemp2 = sTemp
             BrowsePackages.select ii
+            waitslot()
+            
             sTemp = BrowsePackages.getItemText (ii,1)
             if right(sTemp,3) = "oxt" then
                 for x = 1 to a
@@ -665,7 +673,7 @@ testcase tExtensionsFunction
             ii = ii+1
         wend
         kontext "PackageManager"
-        PackageManager.close
+        hCloseDialog( PackageManager, "close" )
     else
         qaErrorLog "disabling installed extensions failed;"
     endif
diff --git a/testautomation/extensions/optional/includes/fileopen.inc b/testautomation/extensions/optional/includes/fileopen.inc
index 481cce7d4e14..922e5ece9adc 100644
--- a/testautomation/extensions/optional/includes/fileopen.inc
+++ b/testautomation/extensions/optional/includes/fileopen.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 ee313b8d0cc7..004fd70ac429 100644
--- a/testautomation/extensions/optional/includes/help.inc
+++ b/testautomation/extensions/optional/includes/help.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extensible help
 '*
diff --git a/testautomation/extensions/optional/includes/identifiers.inc b/testautomation/extensions/optional/includes/identifiers.inc
index 377db6e2d89e..1a183f6c8025 100644
--- a/testautomation/extensions/optional/includes/identifiers.inc
+++ b/testautomation/extensions/optional/includes/identifiers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 8940f7f8274c..73f7ad108322 100644..100755
--- a/testautomation/extensions/optional/includes/issue110083.inc
+++ b/testautomation/extensions/optional/includes/issue110083.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 4730f8a7bfec..262495666cbb 100644
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Test the extension locator service
 '*
@@ -61,14 +61,15 @@ testcase tExtensionLocation
         warnlog( "Macro execution warning is missing" )
     endif
 
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found, aborting" )
-        kontext "Makro"
-        if ( Makro.exists() ) then
-            Makro.close()
-        endif
+    hMacroOrganizerRunMacro( MACRO_NAME )
+
+    kontext "Makro"
+    if ( Makro.exists( 1 ) ) then
+        warnlog( "Macro was not executed")
+        Makro.close()
         goto endsub
+    else
+        printlog( "Macro was executed")
     endif
 
     kontext "active"
@@ -84,11 +85,8 @@ testcase tExtensionLocation
         warnlog( "No messagebox displayed, please check that the macro is executed" )
     endif
 
-    irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found" )
-    endif
+    hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
+    hMacroOrganizerRunMacro( MACRO_NAME )
 
     kontext "active"
     if ( active.exists( 2 ) ) then
diff --git a/testautomation/extensions/optional/includes/meta-inf.inc b/testautomation/extensions/optional/includes/meta-inf.inc
index 0187e6302c2b..4d36586dd908 100644
--- a/testautomation/extensions/optional/includes/meta-inf.inc
+++ b/testautomation/extensions/optional/includes/meta-inf.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 c107c1df0f3d..24739132beaa 100644
--- a/testautomation/extensions/optional/includes/online_update.inc
+++ b/testautomation/extensions/optional/includes/online_update.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 43588b748ea0..ff30ba00847b 100644
--- a/testautomation/extensions/optional/includes/options.inc
+++ b/testautomation/extensions/optional/includes/options.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Options for extensions
 '*
diff --git a/testautomation/extensions/optional/includes/platforms.inc b/testautomation/extensions/optional/includes/platforms.inc
index 4f96701afd20..eaac40b777cb 100755..100644
--- a/testautomation/extensions/optional/includes/platforms.inc
+++ b/testautomation/extensions/optional/includes/platforms.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Supported extension platforms
 '*
@@ -75,7 +75,7 @@ testcase tExtensionPlatforms
         end select
 
         printlog( "" )
-        printlog( "Current extension: " & cCurrentExtensionFile )
+        printlog( "("+iCurrentExtension+"/"+iExtensionCount+") Current extension: " & cCurrentExtensionFile )
         iStatus = hExtensionAddGUI( cCurrentExtensionPath, "InstallForUser, NoLicense, NoUpdate, Verbose" )
         
         if ( iStatus = -7 or iStatus >= 0 ) then
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index ca8e31bb07b6..739b28edaef8 100755..100644
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension publisher and release notes
 '*
diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java
index a28e07d5847b..fcebd804ec1f 100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java
@@ -33,7 +33,7 @@ import com.sun.star.uno.UnoRuntime;
 
 /**
  *
- * @author frank.schoenheit@sun.com
+ * @author frank.schoenheit@oracle.com
  */
 public class ToolPanel implements XToolPanel
 {
diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java
index 6fb17d17f3d6..599850e00ef1 100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java
@@ -44,7 +44,7 @@ import java.util.logging.Logger;
 
 /**
  *
- * @author frank.schoenheit@sun.com
+ * @author frank.schoenheit@oracle.com
  */
 public class ToolPanelUIElement extends ComponentBase implements XUIElement
 {
diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas
index b5bc2775a646..89c85cb139fc 100755
--- a/testautomation/extensions/required/e_update.bas
+++ b/testautomation/extensions/required/e_update.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 769259aeaa7c..e563b5ae3a45 100755..100644
--- a/testautomation/extensions/required/includes/e_update.inc
+++ b/testautomation/extensions/required/includes/e_update.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/framework/optional/f_CJK_CollationDialogue.bas b/testautomation/framework/optional/f_CJK_CollationDialogue.bas
index beb81e4db256..84ae67f474c7 100755
--- a/testautomation/framework/optional/f_CJK_CollationDialogue.bas
+++ b/testautomation/framework/optional/f_CJK_CollationDialogue.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner: thorsten.bosbach@sun.com
+'* owner: thorsten.bosbach@oracle.com
 '*
 '* short description: CJK Collation Dialogue test
 '*
diff --git a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas
index cb4a8703136d..0543a64ad4c7 100755
--- a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas
+++ b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner: thorsten.bosbach@sun.com
+'* owner: thorsten.bosbach@oracle.com
 '*
 '* short description: CJK feature switch test
 '*
diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas
index 1569816cd3a5..12954fae1170 100755
--- a/testautomation/framework/optional/f_CJK_GridLayout.bas
+++ b/testautomation/framework/optional/f_CJK_GridLayout.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner: thorsten.bosbach@sun.com
+'* owner: thorsten.bosbach@oracle.com
 '*
 '* short description: Grid Layout for CJK feature test
 '*
diff --git a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas
index 2bf56608181b..cd1c7322b884 100755
--- a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas
+++ b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner: thorsten.bosbach@sun.com
+'* owner: thorsten.bosbach@oracle.com
 '*
 '* short description: CJK Ruby DialogueProposal test
 '*
diff --git a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas
index 36f2016aafc5..44b157fe8d86 100755
--- a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas
+++ b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner: thorsten.bosbach@sun.com
+'* owner: thorsten.bosbach@oracle.com
 '*
 '* short description: New Sorting Algorithm For Japanese
 '*
diff --git a/testautomation/framework/optional/f_basic_dialog_i18n.bas b/testautomation/framework/optional/f_basic_dialog_i18n.bas
index 291894eb6296..0c65064803c1 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@sun.com
+'*  owner : joerg.skottke@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 a9887adda4fc..48e78dc2c0c6 100755
--- a/testautomation/framework/optional/f_basic_documents.bas
+++ b/testautomation/framework/optional/f_basic_documents.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : BASIC organizers and documents
 '*
diff --git a/testautomation/framework/optional/f_basic_eventbinding.bas b/testautomation/framework/optional/f_basic_eventbinding.bas
index d645648b64bc..658fbe2963a4 100755
--- a/testautomation/framework/optional/f_basic_eventbinding.bas
+++ b/testautomation/framework/optional/f_basic_eventbinding.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function test of Basic IDE Assign Component
 '*
diff --git a/testautomation/framework/optional/f_basic_first.bas b/testautomation/framework/optional/f_basic_first.bas
index d948fb54c1db..d8f749380625 100755
--- a/testautomation/framework/optional/f_basic_first.bas
+++ b/testautomation/framework/optional/f_basic_first.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 33d01eef9e12..c0f6931d0a19 100755
--- a/testautomation/framework/optional/f_basic_formcontrols.bas
+++ b/testautomation/framework/optional/f_basic_formcontrols.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 74ee57c52c5d..963482253438 100755..100644
--- a/testautomation/framework/optional/f_basic_gridcontrol.bas
+++ b/testautomation/framework/optional/f_basic_gridcontrol.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : test availablity of gridcontrol
 '*
diff --git a/testautomation/framework/optional/f_basic_library_export_import.bas b/testautomation/framework/optional/f_basic_library_export_import.bas
index a03e4bfe4804..f3fc06196a03 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@sun.com
+'*  owner : joerg.skottke@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 fa7aa18f9ef5..ec92e75da4e9 100755
--- a/testautomation/framework/optional/f_basic_modules.bas
+++ b/testautomation/framework/optional/f_basic_modules.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 db1b43c9f76d..dd299bda71bb 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@sun.com
+'*  owner : joerg.skottke@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 47167e237202..db372cc4a232 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@sun.com
+'*  owner : joerg.skottke@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 aef11a739c8a..d62d56f4e24c 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@sun.com
+'*  owner : joerg.skottke@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 064502e96e33..f701417c8648 100755
--- a/testautomation/framework/optional/f_basic_templatedocuments.bas
+++ b/testautomation/framework/optional/f_basic_templatedocuments.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 7b96728c1580..1d867b61edee 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Test VBA import options and compatibility switches
 '*
diff --git a/testautomation/framework/optional/f_configuration.bas b/testautomation/framework/optional/f_configuration.bas
index af945169e01e..889cd634cee5 100755
--- a/testautomation/framework/optional/f_configuration.bas
+++ b/testautomation/framework/optional/f_configuration.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function Test for known global Issues
 '*
diff --git a/testautomation/framework/optional/f_extras_labels.bas b/testautomation/framework/optional/f_extras_labels.bas
index c83307bd472d..51722ac38a32 100755
--- a/testautomation/framework/optional/f_extras_labels.bas
+++ b/testautomation/framework/optional/f_extras_labels.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 a07609135c62..f8484c3f5310 100755
--- a/testautomation/framework/optional/f_extras_samplefileopen.bas
+++ b/testautomation/framework/optional/f_extras_samplefileopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 ac11a9f330d1..aa96bb6ab4fa 100755
--- a/testautomation/framework/optional/f_extras_sampleopen.bas
+++ b/testautomation/framework/optional/f_extras_sampleopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 7c5ecc8c1bea..070d7eaf0c39 100755
--- a/testautomation/framework/optional/f_extras_samplepreview.bas
+++ b/testautomation/framework/optional/f_extras_samplepreview.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 a7b21f88666a..2081369b40c0 100755
--- a/testautomation/framework/optional/f_extras_tableautoformat.bas
+++ b/testautomation/framework/optional/f_extras_tableautoformat.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 037dcaa6c166..5907f2cb00e5 100755
--- a/testautomation/framework/optional/f_extras_templatefileopen.bas
+++ b/testautomation/framework/optional/f_extras_templatefileopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 e4fc9a1abe96..0b184af060eb 100755
--- a/testautomation/framework/optional/f_extras_templateopen.bas
+++ b/testautomation/framework/optional/f_extras_templateopen.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 f0c4179282ef..1d50569b42b3 100755
--- a/testautomation/framework/optional/f_extras_templatepreview.bas
+++ b/testautomation/framework/optional/f_extras_templatepreview.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 4f0c0533bc15..c3d44ee82754 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@sun.com
+' ** owner : joerg.skottke@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 4208ed16b0c4..21f3addd2af4 100755
--- a/testautomation/framework/optional/f_filedlg_autocompletion.bas
+++ b/testautomation/framework/optional/f_filedlg_autocompletion.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@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 48d0af59851b..a3e807edad9a 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@sun.com
+' ** owner : joerg.skottke@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 6ef9dd84dd84..8a14571ffe14 100755
--- a/testautomation/framework/optional/f_filedlg_dialogtest.bas
+++ b/testautomation/framework/optional/f_filedlg_dialogtest.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@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 8951e4ac942a..feacdd291253 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@sun.com
+' ** owner : joerg.skottke@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 25f65df99180..f2a05d765b05 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@sun.com
+' ** owner : joerg.skottke@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 f94769185430..f25fe68fce74 100755
--- a/testautomation/framework/optional/f_filedlg_multiselection.bas
+++ b/testautomation/framework/optional/f_filedlg_multiselection.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 d3106c24f774..dac9a5258ac4 100755
--- a/testautomation/framework/optional/f_filedlg_passwords.bas
+++ b/testautomation/framework/optional/f_filedlg_passwords.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 76e4b70e3944..81359724a57c 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@sun.com
+' ** owner : joerg.skottke@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 45c79d188837..1ca74f352f67 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@sun.com
+' ** owner : joerg.skottke@oracle.com
 ' **
 ' ** short description : check special filenames and destinations
 ' **
diff --git a/testautomation/framework/optional/f_fontworkgallery.bas b/testautomation/framework/optional/f_fontworkgallery.bas
index f1f47357f135..075d08536ef2 100755
--- a/testautomation/framework/optional/f_fontworkgallery.bas
+++ b/testautomation/framework/optional/f_fontworkgallery.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Resource test of font work gallery
 '*
diff --git a/testautomation/framework/optional/f_help_bookmarks.bas b/testautomation/framework/optional/f_help_bookmarks.bas
index b394bf2cca74..c61241437303 100755
--- a/testautomation/framework/optional/f_help_bookmarks.bas
+++ b/testautomation/framework/optional/f_help_bookmarks.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 3c96f1baed22..2f1d9418477c 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@sun.com
+'* owner : joerg.skottke@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 5401d17fe5db..2df5ddc8eb00 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@sun.com
+'* owner : joerg.skottke@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 bb36f47fcf03..6ac22c441bbe 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@sun.com
+'* owner : joerg.skottke@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 b9694931da0a..7479644d0daf 100755
--- a/testautomation/framework/optional/f_help_search.bas
+++ b/testautomation/framework/optional/f_help_search.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 1b84670bd0f5..1cfa9fd5ab30 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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : load all index pages in help
 '*
diff --git a/testautomation/framework/optional/f_loadsave_general.bas b/testautomation/framework/optional/f_loadsave_general.bas
index 29fb17ec124c..c62c282ce10a 100755
--- a/testautomation/framework/optional/f_loadsave_general.bas
+++ b/testautomation/framework/optional/f_loadsave_general.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : tborsten.bosbach@sun.com
+'* owner : tborsten.bosbach@oracle.com
 '*
 '* short description : global functionality - load/save documents
 '*
diff --git a/testautomation/framework/optional/f_menuentries.bas b/testautomation/framework/optional/f_menuentries.bas
index 4334b7b8e1e1..99ff3ba18c97 100755
--- a/testautomation/framework/optional/f_menuentries.bas
+++ b/testautomation/framework/optional/f_menuentries.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Read menubar and first level drop down lists and compare to reference
 '*
diff --git a/testautomation/framework/optional/f_ole.bas b/testautomation/framework/optional/f_ole.bas
index fffc3fe08e72..c1724e80d92e 100755
--- a/testautomation/framework/optional/f_ole.bas
+++ b/testautomation/framework/optional/f_ole.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : OLE
 '*
diff --git a/testautomation/framework/optional/f_options_loadsave.bas b/testautomation/framework/optional/f_options_loadsave.bas
index abfc7d15f3a4..ff04293b3353 100755
--- a/testautomation/framework/optional/f_options_loadsave.bas
+++ b/testautomation/framework/optional/f_options_loadsave.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : thorsten.bosbach@sun.com
+'*  owner : thorsten.bosbach@oracle.com
 '*
 '*  short description : Function: Tools->Options: Load/Save
 '*
diff --git a/testautomation/framework/optional/f_options_ooo.bas b/testautomation/framework/optional/f_options_ooo.bas
index 6f18669466f1..d2432a19c261 100755
--- a/testautomation/framework/optional/f_options_ooo.bas
+++ b/testautomation/framework/optional/f_options_ooo.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : General Tools/Options test
 '*
diff --git a/testautomation/framework/optional/f_scripting_organizers.bas b/testautomation/framework/optional/f_scripting_organizers.bas
index eb558a29686a..999b40e15a8c 100755
--- a/testautomation/framework/optional/f_scripting_organizers.bas
+++ b/testautomation/framework/optional/f_scripting_organizers.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 0d142a10a70d..465465d5f39a 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@sun.com
+'*  owner : joerg.skottke@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 8bf07f3d961f..da7c4a576249 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@sun.com
+'*  owner : joerg.skottke@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 26d76b74ee7d..cbedea197802 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@sun.com
+'*  owner : joerg.skottke@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 89b7a4302eb3..b34174b70412 100755
--- a/testautomation/framework/optional/f_security_evilmacro.bas
+++ b/testautomation/framework/optional/f_security_evilmacro.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 1ce5abe7e3f4..f10835af3e72 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@sun.com
+'*  owner : joerg.skottke@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 857bbba208b9..27bf1de7da4e 100755
--- a/testautomation/framework/optional/f_security_macrosecurity.bas
+++ b/testautomation/framework/optional/f_security_macrosecurity.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 49d6189d91b7..2807b6f7cd0d 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@sun.com
+'*  owner : joerg.skottke@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 4c5cfa90fbdd..1d1b21a0eefb 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Execute macros from trusted path
 '*
diff --git a/testautomation/framework/optional/f_toolbar_behavior.bas b/testautomation/framework/optional/f_toolbar_behavior.bas
index 2dc186742318..559385d61030 100755
--- a/testautomation/framework/optional/f_toolbar_behavior.bas
+++ b/testautomation/framework/optional/f_toolbar_behavior.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Resource test of toolbar behavior
 '*
diff --git a/testautomation/framework/optional/f_toolbar_items.bas b/testautomation/framework/optional/f_toolbar_items.bas
index 4277ce17d7aa..3bacf71ac7af 100755
--- a/testautomation/framework/optional/f_toolbar_items.bas
+++ b/testautomation/framework/optional/f_toolbar_items.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 be7af57509af..c056aa239624 100755
--- a/testautomation/framework/optional/f_usage_tracking.bas
+++ b/testautomation/framework/optional/f_usage_tracking.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Usage tracking
 '*
diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
index 0cab687d2f50..aaefdcd5bafb 100755..100644
--- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
+++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : CJK Collation Dialogue Design Draft
 '*
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
index b8ddc55e012a..081b35f322ec 100644..100755
--- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
+++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : hercule.li@sun.com
+'* owner : hercule.li@oracle.com
 '*
 '* short description : CJK Feature Switch test
 '*
diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
index 5b03be6151cb..ab6e04c33e3a 100755..100644
--- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
+++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : CJK Ruby Dialogue Proposal Test
 '*
diff --git a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
index e20124b78b93..13411aeb849f 100644
--- a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
+++ b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : hercule.li@sun.com
+'* owner : hercule.li@oracle.com
 '*
 '* short description : New Sorting Algorithm For Japanese Test
 '*
diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc
index 5418c322ce96..c35900b012e4 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Delete modules while BASIC is running
 '*
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc
index 79b4e039fa14..89d5614c5b11 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@sun.com
+'*  owner : joerg.skottke@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 13dd3567716a..7e6613cdfcbc 100755..100644
--- a/testautomation/framework/optional/includes/basic_documents.inc
+++ b/testautomation/framework/optional/includes/basic_documents.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : BASIC organizers and documents
 '*
diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc
index 85601c312667..4d5ee502df66 100644
--- a/testautomation/framework/optional/includes/basic_eventbinding.inc
+++ b/testautomation/framework/optional/includes/basic_eventbinding.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function test of Basic IDE Assign Componenet
 '*
diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc
index f755d645b888..cc8f999ff9ad 100755..100644
--- a/testautomation/framework/optional/includes/basic_formcontrols.inc
+++ b/testautomation/framework/optional/includes/basic_formcontrols.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 7f914ba9dafc..181bd2aa9b1f 100755..100644
--- a/testautomation/framework/optional/includes/basic_gridcontrol.inc
+++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : gridcontrol
 '*
diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc
index c8db670e8cc3..eabaadf3176a 100755..100644
--- a/testautomation/framework/optional/includes/basic_ide.inc
+++ b/testautomation/framework/optional/includes/basic_ide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Macro Dialogs opened from Basic-IDE
 '*
diff --git a/testautomation/framework/optional/includes/basic_library_export.inc b/testautomation/framework/optional/includes/basic_library_export.inc
index 6f5acacbdb24..9d539e2a82a0 100755..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@sun.com
+'*  owner : joerg.skottke@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 9d5dae88ff40..f6b62e99c7ea 100755..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@sun.com
+'*  owner : joerg.skottke@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 17e1b83d5e18..dc58e21f1dea 100755..100644
--- a/testautomation/framework/optional/includes/basic_macros.inc
+++ b/testautomation/framework/optional/includes/basic_macros.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@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 8423c67e6b67..fe492590c41b 100755..100644
--- a/testautomation/framework/optional/includes/basic_modulehide.inc
+++ b/testautomation/framework/optional/includes/basic_modulehide.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 f874fd93976a..6b166c54680a 100755..100644
--- a/testautomation/framework/optional/includes/basic_modulenames.inc
+++ b/testautomation/framework/optional/includes/basic_modulenames.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 203ebf7bc219..14e3aedca6db 100644
--- a/testautomation/framework/optional/includes/basic_modules.inc
+++ b/testautomation/framework/optional/includes/basic_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 28e214102dbb..b389c750e51d 100755..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@sun.com
+'*  owner : joerg.skottke@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 a16b9e4e50e2..31596ed21001 100755..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@sun.com
+'*  owner : joerg.skottke@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 03a9aea72834..6162352d710f 100755..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@sun.com
+'*  owner : joerg.skottke@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 7e9beec7af98..63241fec9d7d 100755..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@sun.com
+'*  owner : joerg.skottke@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 35e541a642a2..7fc265837f78 100755..100644
--- a/testautomation/framework/optional/includes/basic_spectemplate.inc
+++ b/testautomation/framework/optional/includes/basic_spectemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Load the spec template via http and enable macros
 '*
@@ -94,10 +94,12 @@ testcase tBasicSpecTemplate
     printlog( "Load the file again" )
     hFileOpen( cWorkFile )
     hAllowMacroExecution()
+
+    ' This sleep here is needed after loading the document otherwise the document is closed too early during execution of the macros, which results in basic runtime error messagebox, that can not be handled.
+    SLEEP(1)
     
     printlog( "Cleanup: Close the document and delete the file" )
     hDestroyDocument()
     hDeleteFile( cWorkFile )
-
 endcase
 
diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc
index 03f1602a94b5..97ec55c91505 100755..100644
--- a/testautomation/framework/optional/includes/basic_usertemplate.inc
+++ b/testautomation/framework/optional/includes/basic_usertemplate.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 d9f421278514..9acd9d1b032e 100755..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@sun.com
+'*  owner : joerg.skottke@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 1e361b6de0b2..81b2764a28f1 100755..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@sun.com
+'*  owner : joerg.skottke@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 660561322db6..970b8249a412 100755..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@sun.com
+'*  owner : joerg.skottke@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 66cc7a77eae5..dfade69eaafb 100755..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@sun.com
+'*  owner : joerg.skottke@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 ae26d996db6e..2dd9f6228455 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@sun.com
+'*  owner : joerg.skottke@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 03c52146a8fb..201dd8eb9862 100755..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@sun.com
+'*  owner : joerg.skottke@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 cfc8f06072e3..4c6f7c20a076 100755..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@sun.com
+'*  owner : joerg.skottke@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 77437770891a..8fc37badb55f 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Small helpers for Excel BASIC import modes
 '*
diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc
index fba0a6fe6bae..0fce11bddd1b 100755..100644
--- a/testautomation/framework/optional/includes/configuration.inc
+++ b/testautomation/framework/optional/includes/configuration.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Function Test for known global Issues
 '*
diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc
index 874012f6bad1..b4de32acd917 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index 1eb34f786e5f..964d28a95b77 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Perform standard operations on all samples/templates etc.
 '*
@@ -41,8 +41,8 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
 
     const CFN = "tModifyObjects::"
     const RESTART = 15
-    const TEMPLATE_COUNT = 236 ' For en-US/StarOffice, numbers may differ for Languages/Brands
-    const SAMPLE_COUNT = 60    ' For en-US/StarOffice, numbers may differ for Languages/Brands
+    const TEMPLATE_COUNT = 236 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+    const SAMPLE_COUNT = 56    ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
 
 
     dim iObjectFolder as integer
diff --git a/testautomation/framework/optional/includes/extras_preview.inc b/testautomation/framework/optional/includes/extras_preview.inc
index 8e1129bd5bf4..ca3a24ec9995 100644
--- a/testautomation/framework/optional/includes/extras_preview.inc
+++ b/testautomation/framework/optional/includes/extras_preview.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 892b33ca27fb..7ecb2ce9bf30 100755..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@sun.com
+'*  owner : joerg.skottke@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 7ea54855eb5d..ef20c2a2f1e5 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Usage tracking
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_allowed_names.inc b/testautomation/framework/optional/includes/filedlg_allowed_names.inc
index ce386758c255..a6d54077f4b5 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@sun.com
+'* owner : joerg.skottke@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 a289e0c6116e..bfa424378ef4 100644
--- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc
+++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 a2bcc2230ec0..f9a049c6dbc9 100755..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@sun.com
+'* owner : joerg.skottke@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 cc6555b715a1..cdeb2f922c98 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@sun.com
+'* owner : joerg.skottke@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 0fd8a0a79f55..53917531e275 100755..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@sun.com
+'*  owner : joerg.skottke@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 083fdac2793e..1d0b91e2710d 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_filternames.inc
+++ b/testautomation/framework/optional/includes/filedlg_filternames.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 52d905876df3..99cf0831f12c 100644
--- a/testautomation/framework/optional/includes/filedlg_folders1.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 4e1a8684ba03..e7b6f6e0dcbf 100644
--- a/testautomation/framework/optional/includes/filedlg_folders2.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 9219c3a76be6..354c95fbc23c 100644
--- a/testautomation/framework/optional/includes/filedlg_folders3.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 0e90c3b70d9d..6c0bbb881730 100644
--- a/testautomation/framework/optional/includes/filedlg_folders4.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders4.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 03ea63a34a35..ed3959a6e7e4 100644
--- a/testautomation/framework/optional/includes/filedlg_folders5.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders5.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 dae5106793f9..e82589bbe1d0 100644
--- a/testautomation/framework/optional/includes/filedlg_folders6.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders6.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 1a971d1bdada..df9c399c7253 100644
--- a/testautomation/framework/optional/includes/filedlg_folders7.inc
+++ b/testautomation/framework/optional/includes/filedlg_folders7.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 96cff87d3d04..b4b538b85cf6 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@sun.com
+'* owner : joerg.skottke@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 ed6fc3670db8..32754ec00553 100644
--- a/testautomation/framework/optional/includes/filedlg_multiselection.inc
+++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 b921b1a831e0..b9442cd2bfbd 100755..100644
--- a/testautomation/framework/optional/includes/filedlg_passwords.inc
+++ b/testautomation/framework/optional/includes/filedlg_passwords.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : save and load passworded files
 '*
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
index 885dc6a92f2d..7758fbe55783 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@sun.com
+'* owner : joerg.skottke@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 4fba22fb9c8f..48ed1a59e4a3 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@sun.com
+'* owner : joerg.skottke@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 b4781813c89e..b04fdc3f92ec 100644
--- a/testautomation/framework/optional/includes/filedlg_tools.inc
+++ b/testautomation/framework/optional/includes/filedlg_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 47913a327091..1e39d2900895 100644
--- a/testautomation/framework/optional/includes/filedlg_triggers.inc
+++ b/testautomation/framework/optional/includes/filedlg_triggers.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Alternative ways to open file-dialogs / slot availablilty
 '*
diff --git a/testautomation/framework/optional/includes/fontworkgallery.inc b/testautomation/framework/optional/includes/fontworkgallery.inc
index 08fea775ba4e..c83ce1fb5740 100644
--- a/testautomation/framework/optional/includes/fontworkgallery.inc
+++ b/testautomation/framework/optional/includes/fontworkgallery.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Resource test of font work gallery
 '*
diff --git a/testautomation/framework/optional/includes/help_bookmarks.inc b/testautomation/framework/optional/includes/help_bookmarks.inc
index c4aebad1af9d..04a16951c0a9 100644
--- a/testautomation/framework/optional/includes/help_bookmarks.inc
+++ b/testautomation/framework/optional/includes/help_bookmarks.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 b7edb50dbc8b..3028c41ecedf 100755..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@sun.com
+'* owner : joerg.skottke@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 fc9f9a7de4d9..73c11940e0dc 100755..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@sun.com
+'* owner : joerg.skottke@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 feef650c64e9..ef060eb18275 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : 
 '*
diff --git a/testautomation/framework/optional/includes/help_search.inc b/testautomation/framework/optional/includes/help_search.inc
index dddf9cbda60d..92243b538c4f 100755..100644
--- a/testautomation/framework/optional/includes/help_search.inc
+++ b/testautomation/framework/optional/includes/help_search.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 6a729fe27679..b14c5d5a8511 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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Display each help topic
 '*
diff --git a/testautomation/framework/optional/includes/loadsave_files.inc b/testautomation/framework/optional/includes/loadsave_files.inc
index c7fd948b5df3..a9eac8164c22 100644
--- a/testautomation/framework/optional/includes/loadsave_files.inc
+++ b/testautomation/framework/optional/includes/loadsave_files.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : File / New-Saving-Loading-Saving-Loading
 '*
diff --git a/testautomation/framework/optional/includes/loadsave_new.inc b/testautomation/framework/optional/includes/loadsave_new.inc
index 924646423031..02e734382fa2 100644
--- a/testautomation/framework/optional/includes/loadsave_new.inc
+++ b/testautomation/framework/optional/includes/loadsave_new.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : tborsten.bosbach@sun.com
+'* owner : tborsten.bosbach@oracle.com
 '*
 '* short description : global functionality - load/save documents
 '*
diff --git a/testautomation/framework/optional/includes/menuentries.inc b/testautomation/framework/optional/includes/menuentries.inc
index 5c00a7cf34f1..f2006915c8b1 100644
--- a/testautomation/framework/optional/includes/menuentries.inc
+++ b/testautomation/framework/optional/includes/menuentries.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Read menubar and first level drop down lists and compare to reference
 '*
diff --git a/testautomation/framework/optional/includes/ole_1.inc b/testautomation/framework/optional/includes/ole_1.inc
index a90d517620a1..de7efa3bae8d 100644
--- a/testautomation/framework/optional/includes/ole_1.inc
+++ b/testautomation/framework/optional/includes/ole_1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types
 '*
diff --git a/testautomation/framework/optional/includes/ole_2.inc b/testautomation/framework/optional/includes/ole_2.inc
index f2c679e84b6d..a45c885428fb 100644
--- a/testautomation/framework/optional/includes/ole_2.inc
+++ b/testautomation/framework/optional/includes/ole_2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types
 '*
diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc
index 9f1d0ac28d6b..0636bfacb576 100755..100644
--- a/testautomation/framework/optional/includes/ole_3.inc
+++ b/testautomation/framework/optional/includes/ole_3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc
index 03b921fc95d3..fdcfb6c62166 100755..100644
--- a/testautomation/framework/optional/includes/ole_tools.inc
+++ b/testautomation/framework/optional/includes/ole_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types
 '*
diff --git a/testautomation/framework/optional/includes/options_asia.inc b/testautomation/framework/optional/includes/options_asia.inc
index 730d5a0e666f..76e990ca69fa 100644
--- a/testautomation/framework/optional/includes/options_asia.inc
+++ b/testautomation/framework/optional/includes/options_asia.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : functionality test for language/settings
 '*
diff --git a/testautomation/framework/optional/includes/options_data.inc b/testautomation/framework/optional/includes/options_data.inc
index ac4c3240c3f4..4b60f9c99942 100644
--- a/testautomation/framework/optional/includes/options_data.inc
+++ b/testautomation/framework/optional/includes/options_data.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : general option test ( datasource - group )
 '*
diff --git a/testautomation/framework/optional/includes/options_int1.inc b/testautomation/framework/optional/includes/options_int1.inc
index 76b989679c15..9c79a79a7d97 100644
--- a/testautomation/framework/optional/includes/options_int1.inc
+++ b/testautomation/framework/optional/includes/options_int1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : general options test (test for internet-group)
 '*
diff --git a/testautomation/framework/optional/includes/options_lan1.inc b/testautomation/framework/optional/includes/options_lan1.inc
index c3659cb68f14..ac7f70d18de2 100644
--- a/testautomation/framework/optional/includes/options_lan1.inc
+++ b/testautomation/framework/optional/includes/options_lan1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : general option test (test for language-group)
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc
index 39885ffc2e3c..84c41e906df6 100644
--- a/testautomation/framework/optional/includes/options_loadsave_general.inc
+++ b/testautomation/framework/optional/includes/options_loadsave_general.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : thorsten.bosbach@sun.com
+'*  owner : thorsten.bosbach@oracle.com
 '*
 '*  short description : Tools->Options Load/Save: General
 '*
diff --git a/testautomation/framework/optional/includes/options_loadsave_html.inc b/testautomation/framework/optional/includes/options_loadsave_html.inc
index 072f4f4dea24..d1b7790f539b 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@sun.com
+'*  owner : joerg.skottke@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 b02f4778fd02..c04a110e7ce5 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@sun.com
+'*  owner : joerg.skottke@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 3238f4de37d6..be367449553b 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Test VBA settings-page
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_accessibility.inc b/testautomation/framework/optional/includes/options_ooo_accessibility.inc
index 93e389a67d69..6e553bd336a3 100644
--- a/testautomation/framework/optional/includes/options_ooo_accessibility.inc
+++ b/testautomation/framework/optional/includes/options_ooo_accessibility.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Accessibility
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_appearance.inc b/testautomation/framework/optional/includes/options_ooo_appearance.inc
index afe8efa26be7..72b016b72582 100644
--- a/testautomation/framework/optional/includes/options_ooo_appearance.inc
+++ b/testautomation/framework/optional/includes/options_ooo_appearance.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Appearance
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index ccf4b4642173..6d1db18179c2 100644
--- a/testautomation/framework/optional/includes/options_ooo_colors.inc
+++ b/testautomation/framework/optional/includes/options_ooo_colors.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Colors
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
index d83be235b765..ccf22af0680e 100644
--- a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
+++ b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Fonts
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc
index 0b218bff8493..c973feade8ae 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : 1. test for general group userdata
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_java.inc b/testautomation/framework/optional/includes/options_ooo_java.inc
index 4e8d39e124d9..4b3c1b9dd51d 100644
--- a/testautomation/framework/optional/includes/options_ooo_java.inc
+++ b/testautomation/framework/optional/includes/options_ooo_java.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Java
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_memory.inc b/testautomation/framework/optional/includes/options_ooo_memory.inc
index 3f50fb90076d..6c2038556af4 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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : 1. test for general group userdata ... view)
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_paths.inc b/testautomation/framework/optional/includes/options_ooo_paths.inc
index 692f538d6507..85c797665a1e 100644
--- a/testautomation/framework/optional/includes/options_ooo_paths.inc
+++ b/testautomation/framework/optional/includes/options_ooo_paths.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Options - StarOffice - path settings
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_print.inc b/testautomation/framework/optional/includes/options_ooo_print.inc
index 23cced8c737d..35e83eb0d5f2 100644
--- a/testautomation/framework/optional/includes/options_ooo_print.inc
+++ b/testautomation/framework/optional/includes/options_ooo_print.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Print
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_security.inc b/testautomation/framework/optional/includes/options_ooo_security.inc
index be542fc71689..5c839a249af5 100755..100644
--- a/testautomation/framework/optional/includes/options_ooo_security.inc
+++ b/testautomation/framework/optional/includes/options_ooo_security.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org Security
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_userdata.inc b/testautomation/framework/optional/includes/options_ooo_userdata.inc
index 9d5da5da6194..c1adc7709e70 100644
--- a/testautomation/framework/optional/includes/options_ooo_userdata.inc
+++ b/testautomation/framework/optional/includes/options_ooo_userdata.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org User Data
 '*
diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index ff3ee7936751..52130dcd09d4 100644
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools->Options: OpenOffice.org View
 '*
diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc
index d5159cd383ee..c3da1313da9c 100755..100644
--- a/testautomation/framework/optional/includes/scripting_organizers.inc
+++ b/testautomation/framework/optional/includes/scripting_organizers.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 3d7d822a9693..1cce0f33af3d 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@sun.com
+'*  owner : joerg.skottke@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 18c47c36d5fa..c367285956ae 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Walk through a number of dialogs related to digital signatures
 '*
@@ -86,7 +86,7 @@ testcase tCertificationDialogs
     kontext "DigitalSignature"
     if ( DigitalSignature.exists( 2 ) ) then
         printlog( CFN & "Digital signatures is open" )
-        DigitalSignature.cancel()
+        DigitalSignature.close()
     else
         if ( gApplication <> "MASTERDOCUMENT" ) then
             warnlog( CFN & "Digital Signatures Dialog is not open" )
diff --git a/testautomation/framework/optional/includes/security_evilmacro1.inc b/testautomation/framework/optional/includes/security_evilmacro1.inc
index 7fb6ad1de02a..9927f1652cb3 100644
--- a/testautomation/framework/optional/includes/security_evilmacro1.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 00ae5ee0a938..0c687976fba7 100644
--- a/testautomation/framework/optional/includes/security_evilmacro2.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro2.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 1fb86e329088..c891163ef3e2 100644
--- a/testautomation/framework/optional/includes/security_evilmacro3.inc
+++ b/testautomation/framework/optional/includes/security_evilmacro3.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 2478a59d6294..8e6eb2deffee 100755..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@sun.com
+'*  owner : joerg.skottke@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 1c9d360da9e6..3df134d83d33 100755..100644
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Macros with all security-levels
 '*
@@ -55,12 +55,10 @@ testcase tMacroSecurityLevels( cFileFormat )
     dim cWorkFile as string
         cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\"
         cWorkFile = cWorkFile & "basic" & hGetSuffix( cFileFormat )
-        cWorkFile = convertpath( cWorkFile )
-        cWorkFile = convertToURL( cWorkFile )
 
     dim iSecLevel as integer
 
-    const EXPECTED_MESSAGECOUNT = 1
+    const EXPECTED_MESSAGECOUNT = 0
     const ALLOW_ONE_EXTRA_MESSAGEBOX = 1
     const ALLOW_NO_EXTRA_MESSAGEBOXES = 0
     
@@ -92,7 +90,11 @@ testcase tMacroSecurityLevels( cFileFormat )
         case GC_MACRO_SECURITY_LEVEL_LOW :
 
             if ( not hIdentifyExecutedMacro() ) then
-                warnlog( "#i110184# - Macro was not executed" )
+                if ( gApplication = "MATH" ) then
+                    qaerrorlog( "#i110184# - Macro was not executed" )
+                else
+                    warnlog( "Macro was not excuted" )
+                endif
             endif
 
         case GC_MACRO_SECURITY_LEVEL_MEDIUM :
@@ -102,12 +104,19 @@ testcase tMacroSecurityLevels( cFileFormat )
             endif
 
             if ( not hIdentifyExecutedMacro() ) then
-                warnlog( "#i110184# - Macro was not executed" )
+                if ( gApplication = "MATH" ) then
+                    qaerrorlog( "#i110184# - Macro was not executed" )
+                else
+                    warnlog( "Macro was not excuted" )
+                endif
             endif
 
         case GC_MACRO_SECURITY_LEVEL_HIGH :
 
-            if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_ONE_EXTRA_MESSAGEBOX ) ) then
+            kontext "Active"
+            hCloseDialog( Active, "ok" )
+
+            if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then
                 warnlog( "#i53710# unexpected second messagebox" )
             endif
 
@@ -117,6 +126,9 @@ testcase tMacroSecurityLevels( cFileFormat )
 
         case GC_MACRO_SECURITY_LEVEL_VERYHIGH :
 
+            kontext "Active"
+            hCloseDialog( Active, "ok" )
+
             if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then
                 warnlog( "#i53710# unexpected second messagebox" )
             endif
diff --git a/testautomation/framework/optional/includes/security_recommend_password.inc b/testautomation/framework/optional/includes/security_recommend_password.inc
index 628fdecd7ae5..ab914fe5125b 100755..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@sun.com
+'*  owner : joerg.skottke@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 679abdcc9be4..9115ba2e9f5a 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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Execute macros from trusted path
 '*
diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc
index 3d2b87f33b7b..2b9f8a95d129 100755..100644
--- a/testautomation/framework/optional/includes/standardbar2.inc
+++ b/testautomation/framework/optional/includes/standardbar2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
diff --git a/testautomation/framework/optional/includes/toolbar_behavior.inc b/testautomation/framework/optional/includes/toolbar_behavior.inc
index 5f7357df7e31..e9e96f6bb72e 100644
--- a/testautomation/framework/optional/includes/toolbar_behavior.inc
+++ b/testautomation/framework/optional/includes/toolbar_behavior.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Resource test of toolbar behavior
 '*
diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc
index 772ebc6d9d00..16ca31b09fa4 100644..100755
--- a/testautomation/framework/optional/includes/w_grid_layout1.inc
+++ b/testautomation/framework/optional/includes/w_grid_layout1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Grid Layout for CJK test in Writer
 '*
diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt
index 46be0c44a065..2f467b3f2852 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 edc70c63f9ca..753b1d8cae99 100755
--- a/testautomation/framework/required/f_help_browser.bas
+++ b/testautomation/framework/required/f_help_browser.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 60e32941c261..93ad542126ae 100755
--- a/testautomation/framework/required/f_printer_administration.bas
+++ b/testautomation/framework/required/f_printer_administration.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 537a4693770f..7965a842d5f4 100755..100644
--- a/testautomation/framework/required/f_programmability_dialogs.bas
+++ b/testautomation/framework/required/f_programmability_dialogs.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update-Test for some dialogs in Basic-IDE
 '*
@@ -38,7 +38,6 @@ sub main
     use "framework\required\includes\basic_organizer.inc"
     use "framework\required\includes\basic_dialog_export.inc"
     use "framework\required\includes\basic_dialog_i18n_import.inc"
-    use "framework\required\includes\scripting_basics.inc"
     use "framework\required\includes\script_organizers.inc"
 
     call hStatusIn( "framework" , "f_programmability_dialogs.bas" )
@@ -47,8 +46,7 @@ sub main
     call tUpdtBasicOrganizer()
     call tUpdtDialogExport()
     call tBasicDialogI18nImport()
-    call tScripting()       ' script organizer nodes if no documents are open
-    call tUpdtScriptCount() ' script organizer nodes with one open document
+    call tUpdtScripts() ' script organizer nodes with one open document
     call hStatusOut()
 
 end sub
@@ -64,7 +62,8 @@ sub LoadIncludeFiles
     use "global\tools\includes\optional\t_basic_organizer_tools.inc"
     use "global\tools\includes\optional\t_treelist_tools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
-    use "global\tools\includes\optional\t_filetools.inc"    
+    use "global\tools\includes\optional\t_filetools.inc"
+    use "global\tools\includes\optional\t_listfuncs.inc"
 
     use "framework\tools\includes\formcontrols.inc"
     use "framework\tools\includes\pbrowser_tools.inc"
diff --git a/testautomation/framework/required/f_security_dialogs.bas b/testautomation/framework/required/f_security_dialogs.bas
index 1362dc6d43d6..76bd6cc57373 100755
--- a/testautomation/framework/required/f_security_dialogs.bas
+++ b/testautomation/framework/required/f_security_dialogs.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 3fdcc8fde55f..83a860f6674a 100755
--- a/testautomation/framework/required/f_standard_toolbar.bas
+++ b/testautomation/framework/required/f_standard_toolbar.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Update/resource-test for toolbars
 '*
diff --git a/testautomation/framework/required/f_tools_options.bas b/testautomation/framework/required/f_tools_options.bas
index 9b64e7e1cd26..b4cac6c8f4b3 100755
--- a/testautomation/framework/required/f_tools_options.bas
+++ b/testautomation/framework/required/f_tools_options.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 3b7068ece70b..4d9b741aa071 100755
--- a/testautomation/framework/required/f_topten.bas
+++ b/testautomation/framework/required/f_topten.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 dabbd7647649..5f848835e7a6 100755
--- a/testautomation/framework/required/f_window_functions.bas
+++ b/testautomation/framework/required/f_window_functions.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 d1f7c3e4797b..9ad1be7a05ed 100755
--- a/testautomation/framework/required/f_wizards.bas
+++ b/testautomation/framework/required/f_wizards.bas
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 489a727545fe..ecdb26cc6ac0 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@sun.com
+'*  owner : joerg.skottke@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 590c45a5f58a..162f0cc040cd 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update test for Basic IDE / Dialog i18n-feature
 '*
@@ -49,6 +49,7 @@ testcase tUpdtBasicDialogI18n
     printlog( "Click Manage Languages on ToolsCollectionBar")
     kontext "ToolsCollectionBar" 
     if ( ToolsCollectionBar.exists( DIALOG_DEFAULT_TIMEOUT ) ) then
+        wait( 500 )
         hClickButton( ManageLanguage )
     else
         warnlog( "<ToolsCollectionBar> is not open, is the test environment dirty?" )
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
index db72863173b8..e6e62995716c 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : 
 '*
diff --git a/testautomation/framework/required/includes/basic_macroassignment.inc b/testautomation/framework/required/includes/basic_macroassignment.inc
index 05967fcfd008..6dda14b07698 100755..100644
--- a/testautomation/framework/required/includes/basic_macroassignment.inc
+++ b/testautomation/framework/required/includes/basic_macroassignment.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 789d870cb9a6..7df67c82cd62 100755..100644
--- a/testautomation/framework/required/includes/basic_organizer.inc
+++ b/testautomation/framework/required/includes/basic_organizer.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 700cee374104..478ba7cd6b90 100755..100644
--- a/testautomation/framework/required/includes/first.inc
+++ b/testautomation/framework/required/includes/first.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 62438373dc37..858dc46c2779 100755..100644
--- a/testautomation/framework/required/includes/help_browser.inc
+++ b/testautomation/framework/required/includes/help_browser.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 a05ecc6b02a1..6349f381d194 100755..100644
--- a/testautomation/framework/required/includes/printer_administration.inc
+++ b/testautomation/framework/required/includes/printer_administration.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 6082a3313ce0..b9ed8420134e 100755..100644
--- a/testautomation/framework/required/includes/script_organizers.inc
+++ b/testautomation/framework/required/includes/script_organizers.inc
@@ -31,80 +31,118 @@
 '*
 '\******************************************************************************
 
-testcase tUpdtScriptCount
-    dim sDialog as string
+testcase tUpdtScripts
 
     printlog( "Resource test for macros and scripts / related dialogs" )
 
-    const SCRIPTING_DIALOGS = 5
+    if ( gIsoLang <> "en-US" ) then
+        printlog( "No testing for languages other than en_US" )
+        goto endsub
+    endif
 
-    dim aScriptCount( SCRIPTING_DIALOGS )
+    const SCRIPTING_DIALOGS = 5
     
-    aScriptCount( 1 ) = 10 ' JavaScript
-    aScriptCount( 2 ) = 14 ' BeanShell
-
-    if ( lcase( gPlatform ) = "osx" ) then
-        aScriptCount( 3 ) = 8 ' Python
-        aScriptCount( 5 ) = 600 ' Run Macro
-    else
-        aScriptCount( 3 ) = 10 ' Python
-        aScriptCount( 5 ) = 602 ' Run Macro
-    endif
+    const DLG_JAVASCRIPT = "JavaScript"
+    const DLG_BEANSHELL  = "BeanShell"
+    const DLG_PYTHON     = "Python"
+    const DLG_BASIC_ORG  = "BasicOrganizer"
+    const DLG_RUN_MACRO  = "RunMacro"
 
-    if ( gOOo ) then
-        aScriptCount( 4 ) = 585 ' Makro Organizer
-        aScriptCount( 5 ) = aScriptCount( 5 ) - 1 ' Run Macro
-    else
-        ' Makro Organizer
-        aScriptCount( 4 ) = 586
-    endif
+    ' This is the build specific part of the filename including substrings for
+    ' the productname and language. 
+    dim sProductString as string : sProductString = gProductName & "_" & gISOLang & "_"
+
+    ' define platforms that have different scriptcount
+    if ( lcase( gPlatGroup ) = "w95" ) then sProductString = sProductString & "win_"
+    if ( lcase( gPlatform  ) = "osx" ) then sProductString = sProductString & "osx_"
+
+    ' replace all blanks
+    sProductString = hStringReplaceChar( sProductString, " ", "-" )
+ 
+    ' This is where reference file is located, the filename is yet incomplete
+    dim sInputPath as string
+        sInputPath = gTesttoolPath & "framework/required/input/scripts/" & sProductString
+        
+    ' This is where we store the reference file if differences are found.
+    dim sOutputPath as string
+        sOutputPath = gOfficePath & "user/work/" & sProductString
+      
+    ' These contain the input and output paths (fully qualified)
+    dim sFileIn as string
+    dim sFileOut as string
+
+    ' Array that contains the scriptnames for all organizers
+    dim cScriptNamesList( 1000 ) as string
 
+    dim sDialog as string
     dim iCurrentDialog as integer
-    dim iCurrentScriptCount as integer
-    
+
+    dim iDiffCount as integer
+
     hInitSingleDoc()
 
     for iCurrentDialog = 1 to SCRIPTING_DIALOGS
 
-        printlog( "" )
-        select case iCurrentDialog
-        case 1: sDialog = "JavaScript" 
-                ToolsMacrosOrganizeMacrosJavaScript
-                kontext "ScriptOrganizer"
-                iCurrentScriptCount = hExpandAllNodes( ScriptTreeList )
-                ScriptOrganizer.cancel()                 
-        case 2: sDialog = "BeanShell"
-                ToolsMacrosOrganizeMacrosBeanShell
-                kontext "ScriptOrganizer"
-                iCurrentScriptCount = hExpandAllNodes( ScriptTreeList )
-                ScriptOrganizer.cancel()                
-        case 3: sDialog = "Python"
-                ToolsMacrosOrganizeMacrosPython
-                kontext "ScriptOrganizer"
-                iCurrentScriptCount = hExpandAllNodes( ScriptTreeList )
-                ScriptOrganizer.cancel()                
-        case 4: sDialog = "Makro Organizer"
-                ToolsMacro_uno
-                Kontext "Makro"
-                hExpandAllNodes( MakroAus )
-                iCurrentScriptCount = hGetScriptCount( MakroAus, MakroListe )
-                Makro.close()                
-        case 5: sDialog = "Run Macro"
-                ToolsMacrosRunMacro
-                kontext "ScriptSelector"
-                hExpandAllNodes( LibraryTreeList )
-                iCurrentScriptCount = hGetScriptCount( LibraryTreeList, ScriptList )
-                ScriptSelector.cancel()                
+        ListAllDelete( cScriptNamesList() )
+
+        ' Build complete filename and identify dialog for logging and case selection
+        select case ( iCurrentDialog )
+        case 1 : sDialog = DLG_JAVASCRIPT
+        case 2 : sDialog = DLG_BEANSHELL
+        case 3 : sDialog = DLG_PYTHON
+        case 4 : sDialog = DLG_BASIC_ORG
+        case 5 : sDialog = DLG_RUN_MACRO
         end select
 
-        printlog( sDialog )
-        
-        if ( aScriptCount( iCurrentDialog ) <> iCurrentScriptCount ) then
-            warnlog( "Incorrect number of scripts for this dialog: '" + sDialog + "' expected:" + aScriptCount( iCurrentDialog ) + ", but is:" & iCurrentScriptCount )
-        else
-            printlog( "Number of scripts is ok" )
-        endif
+        printlog( "" )
+        sFileIn  = convertpath( sInputPath  & sDialog & ".txt" )
+        sFileOut = convertpath( sOutputPath & sDialog & ".txt" )
+
+        printlog( "Open <" & sDialog & "> and access the treelist object" )
+
+        ' Note: hGetAllNodeNames() is a *global* function defined in t_treelist_tools.inc
+        ' DLG_BASIC_ORG and DLG_RUN_MACRO have - in addition to the treelist -
+        ' a separate script list. To get those scripts a little more effort is
+        ' required which is done in the *local* function hGetScriptNames()
+
+        select case ( sDialog )
+        case DLG_JAVASCRIPT: ToolsMacrosOrganizeMacrosJavaScript
+            kontext "ScriptOrganizer"
+            hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+        case DLG_BEANSHELL: ToolsMacrosOrganizeMacrosBeanShell
+            kontext "ScriptOrganizer"
+            hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+        case DLG_PYTHON: ToolsMacrosOrganizeMacrosPython
+            kontext "ScriptOrganizer"
+            hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+        case DLG_BASIC_ORG: ToolsMacro_uno
+            Kontext "Makro"
+            hGetScriptNames( MakroAus, MakroListe, cScriptNamesList() )
+        case DLG_RUN_MACRO: ToolsMacrosRunMacro
+            kontext "ScriptSelector"
+            hGetScriptNames( LibraryTreeList, ScriptList, cScriptNamesList() )
+        end select
         
+        printlog( "Compare to reference list, create new one if differences were found" )
+        iDiffCount = hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() )
+
+        if ( iDiffCount <> 0 ) then warnlog( "The number of scripts has changed, please review." )
+
+
+        printlog( "Close <" & sDialog & ">" )
+        select case ( sDialog ) 
+        case DLG_JAVASCRIPT :
+            ScriptOrganizer.cancel()
+        case DLG_BEANSHELL  :
+            ScriptOrganizer.cancel()
+        case DLG_PYTHON     :
+            ScriptOrganizer.cancel()
+        case DLG_BASIC_ORG  :
+            Makro.close()
+        case DLG_RUN_MACRO  :
+            ScriptSelector.cancel()
+        end select
+
     next iCurrentDialog
     
     hCloseDocument()
@@ -113,15 +151,44 @@ endcase
 
 '*******************************************************************************
 
-function hGetScriptCount( oTree as object, oList as object ) as integer
+sub hGetScriptNames( oTreeList as object, oScriptList as object, cItemList() as string )
 
-    dim iCurrentTreeItem as integer
-    dim iScriptCount as integer : iScriptCount = 0
-    
-    for iCurrentTreeItem = 1 to oTree.getItemCount()
-        oTree.select( iCurrentTreeItem )
-        iScriptCount = iScriptCount + oList.getItemCount()
-    next iCurrentTreeItem
-    hGetScriptCount() = iScriptCount
-    
-end function
+    ' oTreeList is the treelist object (left pane)
+    ' oScriptList is the script list (right pane)
+    ' cScriptList() is filled with the scriptnames of the form
+    ' <module>:<script name> like "CommonLang:LoadLanguages"
+
+    dim iCurrentTreeListItem as integer
+    dim iObjectsInTreelist as integer
+
+    dim cModuleName as string
+    dim cReferenceString as string
+
+    dim iScriptCount as integer
+    dim iCurrentScript as integer
+    dim cScriptList( 1000 ) as string
+
+    ' Get the number of nodes from the modules treelist
+    iObjectsInTreeList = hExpandAllNodes( oTreeList )
+
+    ' For each item in the modules treelist get the number of scripts (right pane)
+    for iCurrentTreeListItem = 1 to iObjectsInTreeList
+
+        ' Get the name of the current treelist node, append it to the list
+        ' (otherwise it does not appear if it has no scripts)
+        cModuleName = hGetNodeName( oTreeList, iCurrentTreeListItem )
+        hListAppend( cModuleName, cItemList() )
+
+        ' Get the number of scripts from the right pane, reset the array in advance
+        ListAllDelete( cScriptList() )
+        iScriptCount = hGetListItems( oScriptList, cScriptList() )
+
+        ' Build the string for the reference list and append it to cScriptList()
+        for iCurrentScript = 1 to iScriptCount
+            cReferenceString = cModuleName & ":" & cScriptList( iCurrentScript )
+            hListAppend( cReferenceString, cItemList() )
+        next iCurrentScript
+
+    next iCurrentTreeListItem
+
+end sub
\ No newline at end of file
diff --git a/testautomation/framework/required/includes/scripting_basics.inc b/testautomation/framework/required/includes/scripting_basics.inc
index d5377c4873bd..d1939546b89d 100755..100644
--- a/testautomation/framework/required/includes/scripting_basics.inc
+++ b/testautomation/framework/required/includes/scripting_basics.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 fec9900a28b8..d8f5a096595a 100644
--- a/testautomation/framework/required/includes/security_dialogs.inc
+++ b/testautomation/framework/required/includes/security_dialogs.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 dcff255d6c6c..d4e327a21ad7 100644
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : "10ner/Smoke Test" from release engineering
 '*
@@ -33,6 +33,10 @@
 
 testcase tSmokeTest
 
+    if ( not hCheckForBinfilters() ) then
+        goto endsub
+    endif
+
     printlog( "Smoketest (10er-Test) from Release Engineering" )
     dim sLocation as string
     dim i,x,a as integer
diff --git a/testautomation/framework/required/includes/standard_toolbar_1.inc b/testautomation/framework/required/includes/standard_toolbar_1.inc
index 4494d6a26cad..b7d54bb89180 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@sun.com
+'* owner : joerg.skottke@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 cbc08096b8a6..46c71bd93409 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@sun.com
+'* owner : joerg.skottke@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 3f393ff3291a..fbd21e46d032 100755..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@sun.com
+'*  owner : joerg.skottke@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 76fa20d5dffa..8e03d1253f84 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@sun.com
+'* owner : joerg.skottke@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 c3ff6be6e849..ab357cd81013 100755..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@sun.com
+'* owner : joerg.skottke@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 2f7064055883..36089018a589 100755..100644
--- a/testautomation/framework/required/includes/tools_customize.inc
+++ b/testautomation/framework/required/includes/tools_customize.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 82d5ef6ae861..928d533cbe3a 100755..100644
--- a/testautomation/framework/required/includes/tools_options.inc
+++ b/testautomation/framework/required/includes/tools_options.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 9aea2b0ab8b6..fdfdb49fec97 100644
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Smoke test (load/save/clipboard)
 '*
@@ -33,33 +33,37 @@
 
 sub topten
 
-    gApplication = "WRITER"
-    call Top_ten_test
-    
-    gApplication = "CALC"
-    call Top_ten_test
-    
-    gApplication = "IMPRESS"
-    call Top_ten_test
-    
-    gApplication = "DRAW"
-    call Top_ten_test
-    
-    gApplication = "MATH"
-    call Top_ten_test
-    
-    gApplication = "HTML"
-    call Top_ten_test
-    
-    gApplication = "MASTERDOCUMENT"
-    call Top_ten_test
+    ' we need the binary filters (.sxw etc.) for this test but beginning with
+    ' OOo 3.3 these are optional
+    if ( hCheckForBinfilters() ) then
+        gApplication = "WRITER"
+        call Top_ten_test
+
+        gApplication = "CALC"
+        call Top_ten_test
 
+        gApplication = "IMPRESS"
+        call Top_ten_test
+
+        gApplication = "DRAW"
+        call Top_ten_test
+
+        gApplication = "MATH"
+        call Top_ten_test
+
+        gApplication = "HTML"
+        call Top_ten_test
+
+        gApplication = "MASTERDOCUMENT"
+        call Top_ten_test
+    endif
 end sub
 
 '*******************************************************************************
 
 testcase Top_ten_test
-
    dim sUserWorkDirectory as string
+
+    dim sUserWorkDirectory as string
     dim sFilename_native as String
     dim sFilename_export as String
     dim sFilter_native as string
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index 2adb42638d02..008248a1c57d 100644..100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Window/Titlebar functionality
 '*
@@ -198,6 +198,13 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
     printlog( "Update test for the office window titles" )
 
+    ' This is a Testtool-only problem that the product name is not displayed
+    ' after calling hCloseDocument() on the last document.
+    if ( sApplication = "soffice" ) then
+        qaerrorlog( "#i113760# - Product name missing for backing window" )
+        goto endsub
+    endif
+
     const BASIC_MODULE = "tCheckWindowTitle"
     const STRING_NOT_FOUND = 0
     const STRING_LEFTMOST  = 1
@@ -217,21 +224,12 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
     printlog( "Application: " & sApplication & "; Title should be: " & sReference )
     printlog( "Open the work windows (documents)" )
     hInitSingleDoc()
-    hCreateDocument()
 
     printlog( "Verify that the correct window is open" )
     select case sApplication
-        case "swriter" :
-        case "sglobal" :
-        case "sweb"    :
-        case "scalc"   :
-        case "simpress":
-        case "sdraw"   :
-        case "smath"   :
         case "basic"   : hInitBasicIDE( BASIC_MODULE )
-        case "chart"   :
-        case "database":
         case "soffice" : hFileCloseAll()
+        case else      : hCreateDocument()
     end select
 
     ' Note: The Testtool connection string does not belong to the window caption
@@ -290,16 +288,7 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
     printlog( "Cleanup after test" )
     select case sApplication
-        case "swriter" :
-        case "sglobal" :
-        case "sweb"    :
-        case "scalc"   :
-        case "simpress":
-        case "sdraw"   :
-        case "smath"   :
         case "basic"   : hDestroyDocument()
-        case "chart"   :
-        case "database":
         case "soffice" : hCreateDocument()
     end select
 
diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc
index d320234fd40b..d423d2fd7c62 100755..100644
--- a/testautomation/framework/required/includes/wizard_agenda.inc
+++ b/testautomation/framework/required/includes/wizard_agenda.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update test for agenda wizard
 '*
@@ -81,17 +81,16 @@ testcase tUpdtWizardAgenda
         hWaitForObject( TemplateName, 3000 )
         TemplateName.setText( cTemplateName )
         hSetTemplateSavePath( cTemplatePath )    
-            
-        hFinishWizard( 1 )
+
+        kontext "AutopilotAgenda"
+        hClickButton( CreateButton )
         
-        iErr = hHandleSaveError()
-        if ( iErr = 1 ) then
+        if ( hHandleSaveError() = 1 ) then
             kontext "AutopilotAgenda"
-            hFinishWizard( 1 )
+            hClickButton( CreateButton )
         endif    
         
-        brc = hDestroyDocument()
-        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
+        if ( not hDestroyDocument() ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
 
         hFileCloseAll()
         hDeleteFile( cTemplatePath )
diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc
index 7ba81116728b..b99cef0a9c6c 100644
--- a/testautomation/framework/required/includes/wizard_documentconverter.inc
+++ b/testautomation/framework/required/includes/wizard_documentconverter.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update test for documentconverter
 '*
@@ -49,18 +49,11 @@ testcase tUpdtWizardDocumentConverter
     dim iCurrentFile as integer
     
     hInitSingleDoc()
-    
-    irc = hOpenWizardWithMenu( "DOCCONV" )
-    if ( irc <> 0 ) then
-        warnlog( "Unable to open requested wizard, aborting test" )
-        goto endsub
-    endif
-    
     sTargetFile = hGetWorkPath() 
     sLogFile = sTargetFile & "Logfile.odt"
-    
-    stargetFile = sTargetFile & "docconv1" & hGetSuffix( "current" )
-    
+    sTargetFile = sTargetFile & "docconv1" & hGetSuffix( "current" )
+
+    FileWizardDocumentConverter
     
     Kontext "DocumentConverter"
     hWaitForObject( CreateLogfile, 3000 )
@@ -85,7 +78,7 @@ testcase tUpdtWizardDocumentConverter
             printlog( "Page " & 1 + iDocumentType & " is visible" )
         else
             warnlog( "Cannot access page 2, aborting test" )
-            hFinishWizard()
+            hCloseDialog( DocumentConverter, "Cancel" )
             goto endsub
         endif
         
diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc
index dd439ea4a3bd..aeee35c59282 100644
--- a/testautomation/framework/required/includes/wizard_euroconverter.inc
+++ b/testautomation/framework/required/includes/wizard_euroconverter.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update test for the Euroconverter
 '*
@@ -53,12 +53,7 @@ testcase tUpdtWizardEuroconverter
 
     hInitSingleDoc()
     
-    irc = hOpenWizardWithMenu( "EUROCONV" )
-    if ( irc <> 0 ) then
-        warnlog( "Failed to open the Euroconverter, aborting test" )
-        hDestroyDocument()
-        goto endsub
-    endif
+    FileWizardEuroConverter
     
     kontext "AutopilotEuroKonverter"
     call DialogTest( AutopilotEuroKonverter , 1 )
@@ -124,7 +119,7 @@ testcase tUpdtWizardEuroconverter
     kontext "AutopilotEuroKonverter"
     call DialogTest( AutopilotEuroKonverter , 2 )
 
-    hFinishWizard( 1 )
+    hClickButton( Konvertieren )
     hDestroyDocument() 
     hDeleteFile( cTargetDir & TARGET_FILE )
     
diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc
index b970d8754c5d..07fcc562dddc 100755..100644
--- a/testautomation/framework/required/includes/wizard_fax.inc
+++ b/testautomation/framework/required/includes/wizard_fax.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update Test for Fax Wizard
 '*
@@ -35,9 +35,6 @@ testcase tUpdtWizardFax
 
     printlog( "Resource test for the fax wizard" )
 
-    dim iErr as integer
-    dim brc as boolean
-    
     dim cTemplateName as string
     dim cTemplatePath as string    
     
@@ -74,14 +71,14 @@ testcase tUpdtWizardFax
         TemplateName.setText( cTemplateName )
         
         hSetTemplateSavePath( cTemplatePath )
-        
-        hFinishWizard( 1 )
+
+        kontext "AutopilotFax"
+        hClickButton( FinishButton )
         
         kontext "StandardBar"
         hWaitForObject( Speichern, 5000 )
        
-        brc = hDestroyDocument()
-        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
+        if ( not hDestroyDocument() ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
         
         printlog( "Delete the user-template: " & cTemplatePath )
         hDeleteFile( cTemplatePath )
diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc
index e057ba09d2e8..657a68ada3d0 100755..100644
--- a/testautomation/framework/required/includes/wizard_firsttime.inc
+++ b/testautomation/framework/required/includes/wizard_firsttime.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Updatetest for the first time wizard
 '*
@@ -64,10 +64,6 @@ testcase tUpdtWizardFirsttime
         NextBtn.click()
     endif
     
-    
-
-    
-    
     printlog( "Check the license page" )
     kontext "TabFirstStartLicense"
     if ( TabFirstStartLicense.exists( 2 ) ) then
@@ -198,7 +194,7 @@ testcase tUpdtWizardFirsttime
                 LoadQuickstarter.unCheck()
                 printlog( "Closing Tools/Options" )
                 Kontext "OptionenDlg"
-                OptionenDlg.cancel()
+                hCloseDialog( OptionenDlg, "cancel" )
                 printlog( "Restarting program" )
                 call ExitRestartTheOffice()
             else
@@ -218,16 +214,12 @@ testcase tUpdtWizardFirsttime
     endif
         
     Kontext "OptionenDlg"
-    if ( OptionenDlg.exists() ) then
-        OptionenDlg.cancel()
-    endif
+    hCloseDialog( OptionenDlg, "cancel, optional" )
     
     ' due to issue i105248 the Quickstart disabler needs to get called again, because the First Start Wizard resets the veto
     call hDisableQuickstarterAPI()
 
-    do while( getDocumentCount() > 0 )
-        call hCloseDocument()
-    loop
+    hFileCloseAll()
    
 endcase
 
diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc
index 267efcefd18a..4f68a04cbd8b 100755..100644
--- a/testautomation/framework/required/includes/wizard_letter.inc
+++ b/testautomation/framework/required/includes/wizard_letter.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update Test for Letter Wizard
 '*
@@ -35,10 +35,6 @@ testcase tUpdtWizardLetter
 
     printlog( "Resource test for the letter-wizard" )
 
-    dim iErr as integer
-    dim brc as boolean
-    dim irc as integer
-    
     ' Build the filename we want to save the template as.
     dim cTemplateName as string
         cTemplateName = "FWK-Testtool-Template-letterWizard.ott"
@@ -158,8 +154,9 @@ testcase tUpdtWizardLetter
         printlog( "   * name the template for further usage" )
         TemplateName.setText( cTemplateName )
         hSetTemplateSavePath( cTemplatePath )
-        
-        hFinishWizard( 1 )
+
+        kontext "AutopilotLetter"
+        hClickButton( FinishButton )
 
         if ( gOOo ) then
             kontext "UseOfThisTemplate"
@@ -171,22 +168,19 @@ testcase tUpdtWizardLetter
             endif
         endif
         
-        iErr = hHandleSaveError()
-        if ( iErr = 1 ) then
+        if ( hHandleSaveError() = 1 ) then
             kontext "AutopilotLetter"
-            hFinishWizard( 1 )
+            hClickButton( FinishButton )
         endif
         
-        brc = hDestroyDocument()
-        if ( not brc ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
+        if ( not hDestroyDocument() ) then qaerrorlog( "#i59233# The wizard does not display the new template" )
     else
         warnlog( "Autopilot Letter not open/exceeded timeout" )
     endif
     
     hDeleteFile( cTemplatePath )
     
-    irc = hDeleteUserTemplates()
-    if ( irc <> 0 ) then
+    if ( hDeleteUserTemplates() <> 0 ) then
         printlog( "Unexpectedly deleted user template(s), please check")
     endif
     
diff --git a/testautomation/framework/required/includes/wizard_mailmerge.inc b/testautomation/framework/required/includes/wizard_mailmerge.inc
index 45b8947eec38..95f8d6d19a54 100755..100644
--- a/testautomation/framework/required/includes/wizard_mailmerge.inc
+++ b/testautomation/framework/required/includes/wizard_mailmerge.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 59544e0fb48e..53e2e0d3a50b 100755..100644
--- a/testautomation/framework/required/includes/wizard_presentation.inc
+++ b/testautomation/framework/required/includes/wizard_presentation.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Update test for the presentation wizard
 '*
@@ -57,8 +57,9 @@ testcase tUpdtWizardPresentation
         printlog( "Page 3" )
         kontext "AutopilotPraesentation3" 
         call DialogTest( AutopilotPraesentation3 )
-        
-        hFinishWizard( 1 )
+
+        kontext "AutopilotPraesentation3" 
+        hCloseDialog( AutopilotPraesentation3, "ok" )
     else
         warnlog( "Presentation wizard not open/exceeded timeout" )
     endif
diff --git a/testautomation/framework/required/includes/wizard_webpage.inc b/testautomation/framework/required/includes/wizard_webpage.inc
index 6200079c8025..465fae368db1 100644
--- a/testautomation/framework/required/includes/wizard_webpage.inc
+++ b/testautomation/framework/required/includes/wizard_webpage.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Resource test of Web Page Wizard
 '*
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BasicOrganizer.txt
new file mode 100755
index 000000000000..49400346a1a0
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BasicOrganizer.txt
@@ -0,0 +1,657 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BeanShell.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BeanShell.txt
new file mode 100755
index 000000000000..5fd31835476e
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_JavaScript.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_JavaScript.txt
new file mode 100755
index 000000000000..06f63f48530c
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+OpenOffice.org Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_Python.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_Python.txt
new file mode 100755
index 000000000000..93f69e69e7b0
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_Python.txt
@@ -0,0 +1,10 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+capitalisePython
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+createTable
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_RunMacro.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_RunMacro.txt
new file mode 100755
index 000000000000..74378128ac9b
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_RunMacro.txt
@@ -0,0 +1,681 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Capitalise
+Capitalise:capitalise.bsh
+Capitalise:capitalisePython
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+TableSample:createTable
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BasicOrganizer.txt
new file mode 100755
index 000000000000..49400346a1a0
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BasicOrganizer.txt
@@ -0,0 +1,657 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BeanShell.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BeanShell.txt
new file mode 100755
index 000000000000..5fd31835476e
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_JavaScript.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_JavaScript.txt
new file mode 100755
index 000000000000..06f63f48530c
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+OpenOffice.org Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_Python.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_Python.txt
new file mode 100755
index 000000000000..01e660758894
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_Python.txt
@@ -0,0 +1,8 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_RunMacro.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_RunMacro.txt
new file mode 100755
index 000000000000..5468a699f850
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_RunMacro.txt
@@ -0,0 +1,679 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Capitalise
+Capitalise:capitalise.bsh
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt
new file mode 100755
index 000000000000..49400346a1a0
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt
@@ -0,0 +1,657 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BeanShell.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BeanShell.txt
new file mode 100755
index 000000000000..5fd31835476e
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_JavaScript.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_JavaScript.txt
new file mode 100755
index 000000000000..06f63f48530c
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+OpenOffice.org Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_Python.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_Python.txt
new file mode 100755
index 000000000000..93f69e69e7b0
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_Python.txt
@@ -0,0 +1,10 @@
+My Macros
+OpenOffice.org Macros
+Capitalise
+capitalisePython
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+createTable
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_RunMacro.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_RunMacro.txt
new file mode 100755
index 000000000000..74378128ac9b
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_RunMacro.txt
@@ -0,0 +1,681 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Capitalise
+Capitalise:capitalise.bsh
+Capitalise:capitalisePython
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+TableSample:createTable
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BasicOrganizer.txt
new file mode 100755
index 000000000000..07564201b883
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BasicOrganizer.txt
@@ -0,0 +1,663 @@
+My Macros
+Standard
+Module1
+Module1:Main
+Oracle Open Office Macros
+basic
+Module1
+Module1:Main
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+WikiEditor
+Module1
+Module1:Main
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BeanShell.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BeanShell.txt
new file mode 100755
index 000000000000..141bebef85d5
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_JavaScript.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_JavaScript.txt
new file mode 100755
index 000000000000..09ea2fbc3203
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+Oracle Open Office Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_Python.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_Python.txt
new file mode 100755
index 000000000000..dfe18f127bef
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_Python.txt
@@ -0,0 +1,10 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+capitalisePython
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+createTable
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_RunMacro.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_RunMacro.txt
new file mode 100755
index 000000000000..e8154b562c23
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_RunMacro.txt
@@ -0,0 +1,687 @@
+My Macros
+Standard
+Module1
+Module1:Main
+WikiEditor
+Module1
+Module1:Main
+basic
+Module1
+Module1:Main
+Oracle Open Office Macros
+Capitalise
+Capitalise:capitalise.bsh
+Capitalise:capitalisePython
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+TableSample:createTable
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BasicOrganizer.txt
new file mode 100755
index 000000000000..072608199d8b
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BasicOrganizer.txt
@@ -0,0 +1,660 @@
+My Macros
+Standard
+Module1
+Module1:Main
+Oracle Open Office Macros
+basic
+Module1
+Module1:Main
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BeanShell.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BeanShell.txt
new file mode 100755
index 000000000000..141bebef85d5
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_JavaScript.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_JavaScript.txt
new file mode 100755
index 000000000000..09ea2fbc3203
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+Oracle Open Office Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_Python.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_Python.txt
new file mode 100755
index 000000000000..b15ae4c69f69
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_Python.txt
@@ -0,0 +1,8 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_RunMacro.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_RunMacro.txt
new file mode 100755
index 000000000000..d0a84dcd41f5
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_RunMacro.txt
@@ -0,0 +1,682 @@
+My Macros
+Standard
+Module1
+Module1:Main
+basic
+Module1
+Module1:Main
+Oracle Open Office Macros
+Capitalise
+Capitalise:capitalise.bsh
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BasicOrganizer.txt
new file mode 100755
index 000000000000..87d91eff5ab5
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BasicOrganizer.txt
@@ -0,0 +1,657 @@
+My Macros
+Standard
+Module1
+Module1:Main
+Oracle Open Office Macros
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:ToggleProgressStep
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:AssignFileName
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:CallFilePicker
+AutoPilotRun:PreviousStep
+Common
+Common:RetrieveDocumentObjects
+Common:CancelTask
+Common:ConvertDocument
+Common:SwitchNumberFormat
+Common:Numberformat
+Common:CheckFormatType
+Common:StartConversion
+Common:IncreaseStatusValue
+Common:SelectCurrency
+Common:FillUpCurrencyListbox
+Common:InitializeProgressbar
+Common:EndStatusLine
+ConvertRun
+ConvertRun:Main
+ConvertRun:SelectListItem
+ConvertRun:RetrieveEnableValue
+ConvertRun:EnableStep1DialogControls
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:GetPreSelectedRange
+ConvertRun:AddRangeToListbox
+ConvertRun:CheckRangeSelection
+ConvertRun:FieldinList
+ConvertRun:CheckLocale
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+Hard
+Hard:CreateRangeList
+Hard:CreateRangeEnumeration
+Hard:AddSheetRanges
+Hard:SelectRange
+Hard:ConvertThehardWay
+Hard:ConvertCellCurrencies
+Hard:ModifyObjectValuewithCurrFactor
+Hard:CheckIfRangeisCurrency
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Init
+Init:InitializeResources
+Init:InitializeLanguages
+Init:InitializeCurrencies
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencyValues
+Init:InitializeLocales
+Protect
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheet
+Protect:UnprotectSheetWithDialog
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Soft
+Soft:CreateStyleEnumeration
+Soft:MakeStyleEnumeration
+Soft:AssignRangestoStyle
+Soft:AssignCellFormatRanges
+Soft:DeselectStyle
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveSheetoutofRangeName
+Soft:RetrieveRangeoutofRangeName
+Soft:ConvertTheSoftWay
+Soft:GetAssignedRanges
+Writer
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Writer:ConvertTextFields
+FormWizard
+DBMeta
+DBMeta:GetDatabaseNames
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetConnection
+DBMeta:GetDBMetaData
+DBMeta:GetTableMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:CreateDBForm
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:CreateCommandTypeList
+DBMeta:GetCurrentMetaValues
+DBMeta:AssignFieldLength
+develop
+develop:PositionControls
+develop:ResetPosSizes
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:InitializePosSizes
+develop:InsertTextControl
+develop:InsertDBControl
+develop:InsertTimeStampShape
+develop:GetLabelDiffHeight
+develop:CheckJustifiedPosition
+develop:GetCorrWidth
+develop:AdjustLineWidth
+develop:CheckOuterPoints
+develop:PositionGridControl
+develop:SetupGridColumn
+develop:ControlCaptionstoStandardLayout
+develop:GroupShapesTogether
+FormWizard
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:FormGetFields
+FormWizard:FillUpFieldsListbox
+FormWizard:PreviousStep
+FormWizard:NextStep
+FormWizard:InitializeLayoutSettings
+FormWizard:ToggleDatabasePage
+FormWizard:CommitLastDocumentChanges
+FormWizard:StoreFormInDatabase
+FormWizard:StoreForm
+FormWizard:EmptyFieldsListboxes
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:DeleteFirstListboxEntry
+Language
+Language:LoadLanguage
+Language:SetDialogLanguage
+Language:InitializeWidthList
+Layouter
+Layouter:InsertControl
+Layouter:ArrangeControls
+Layouter:OpenFormDocument
+Layouter:InitializeLabelValues
+Layouter:ConfigurePageStyle
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ChangeArrangemode
+Layouter:ToggleBorderGroup
+Layouter:ToggleAlignGroup
+Layouter:ToggleLayoutPage
+Layouter:DestroyControlShapes
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:SwitchAlignMode
+tools
+tools:SetProgressValue
+tools:GetPreferredWidth
+tools:GetPreferredHeight
+tools:GetPeerSize
+tools:TwipToCM
+tools:TwipTo100telMM
+tools:TwipToPixel
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:GetPoint
+tools:GetSize
+tools:ImportStyles
+tools:SetNumerics
+tools:RemoveShapes
+tools:RemoveNirwanaShapes
+tools:ShapesToNirwana
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFormWizardPaths
+tools:GetFilterName
+Gimmicks
+AutoText
+AutoText:Main
+AutoText:InsertStringToCell
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+GetTexts
+GetTexts:Main
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetAnnotations
+GetTexts:GetNamedRanges
+GetTexts:GetCalcGraphicNames
+GetTexts:GetParagraphTexts
+GetTexts:GetChartStrings
+GetTexts:GetFrameTexts
+GetTexts:GetTextFieldStrings
+GetTexts:GetLinkedFileNames
+GetTexts:GetSectionNames
+GetTexts:GetWriterStrings
+GetTexts:GetDrawPageTitles
+GetTexts:GetPageStrings
+GetTexts:GetDrawStrings
+GetTexts:GetDocumentProps
+GetTexts:GetHyperlinks
+GetTexts:GetGraphicNames
+GetTexts:GetStyles
+GetTexts:GetControlStrings
+GetTexts:GetControlContent
+GetTexts:WriteStringtoLogFile
+GetTexts:MakeLogHeadLine
+ReadDir
+ReadDir:Main
+ReadDir:TreeInfo
+ReadDir:CreateTextShape
+ReadDir:CalculateXPoint
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:ReadSourceDirectory
+ReadDir:CloseDialog
+ReadDir:AdjustPageHeight
+ReadDir:SetNewLevels
+ReadDir:CheckPageWidth
+ReadDir:ToggleDialogControls
+Userfields
+Userfields:StartChangesUserfields
+Userfields:FillDialog
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:StopMacro
+Userfields:SaveSettings
+Userfields:ToggleButtons
+Userfields:InitializeUserFamily
+Userfields:AddRecord
+Userfields:FillupTextFields
+Userfields:StepToRecord
+Userfields:SelectCurrentFields
+Userfields:DeleteCurrentSettings
+ImportWizard
+API
+API:OpenRegKey
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:QueryValueEx
+API:QueryValue
+DialogModul
+DialogModul:FillStep_Welcome
+DialogModul:FillStep_InputPaths
+DialogModul:FillUpApplicationList
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:AssignPathToCurrentApplication
+DialogModul:SaveStep_InputPath
+DialogModul:ToggleInputPaths
+DialogModul:MakeSummaryString
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Progress
+DialogModul:GetFilterTracingLogPath
+DialogModul:CheckMSImportAvailability
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckTextBoxPath
+DialogModul:InitializeProgressPage
+DialogModul:SetProgressDisplay
+DialogModul:TakoverFolderName
+DialogModul:FinalizeDialogButtons
+FilesModul
+FilesModul:ReadCollectionPaths
+FilesModul:GetApplicationIndex
+FilesModul:InterruptProcess
+FilesModul:AddCollectionPath
+FilesModul:SetExtension
+FilesModul:AddFilterNameToPathItem
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CollectPaths
+FilesModul:ConvertAllDocuments
+FilesModul:AddListtoFilesList
+FilesModul:GetTargetTemplatePath
+FilesModul:GetFilterName
+FilesModul:SearchArrayforPartString
+FilesModul:CreateLogTable
+FilesModul:GetSize
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:CreateLogDocument
+FilesModul:GetFilterTracingLogPath
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertCommentToLogCell
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckPassWordProtection
+FilesModul:OpenLogDocument
+FilesModul:MergeRange
+FilesModul:ConcatComment
+Language
+Language:LoadLanguage
+Language:GetApplResourceArray
+Main
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:CancelTask
+Main:TemplateDirSearchDialog
+Main:RepaintHeaderPreview
+Main:CheckModuleInstallation
+Main:CheckInstalledModule
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+Main:TakeOverPathSettings
+Main:GetImportWizardPaths
+Schedule
+BankHoliday
+BankHoliday:Main
+BankHoliday:CalEasterTable
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:AddFollowUpHolidays
+CalendarMain
+CalendarMain:CalAutopilotTable
+CalendarMain:SetupNumberFormatter
+CalendarMain:AddNumberFormat
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CreateTable
+CreateTable:CalCreateYearTable
+CreateTable:CalCreateMonthTable
+CreateTable:FormatCalCells
+DlgControl
+DlgControl:Main
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalMouseMoved
+DlgControl:SelectState
+DlgControl:MouseLeavesImage
+DlgControl:CalClearInputMask
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:ToggleInsertButton
+DlgControl:CalUpdateNewEventFrame
+GermanHolidays
+GermanHolidays:Main
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+Language
+Language:LoadLanguage
+LocalHolidays
+LocalHolidays:Main
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateJapaneseAutumnDay
+OwnEvents
+OwnEvents:Main
+OwnEvents:CalSaveOwnData
+OwnEvents:CalLoadOwnData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalcmdInsertData
+OwnEvents:GetSelectedDateUnits
+OwnEvents:GetDateUnits
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CheckInsertedDates
+OwnEvents:GetOwnMonth
+ScriptBindingLibrary
+Template
+Autotext
+Autotext:Main
+Autotext:CreateUserDatafield
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Correspondence
+Correspondence:Main
+Correspondence:Placeholder
+Correspondence:Database
+Correspondence:LoadLanguageCorrespondence
+Correspondence:GetFieldName
+Correspondence:OK
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+ModuleAgenda
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+ModuleAgenda:FinishAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:GetOptionValues
+Samples
+Samples:PrepareForEditing
+Samples:ShowStyles
+Samples:SelectStyle
+Samples:SaveCurrentStyles
+Samples:RestoreCurrentStyles
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Tools
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:SetBasicReadOnlyFlag
+Debug:WritedbgInfo
+Debug:WriteDbgString
+Debug:printdbgInfo
+Debug:ShowArray
+Debug:ShowPropertyValues
+Debug:ShowNameValuePair
+Debug:ShowElementNames
+Debug:ShowSupportedServiceNames
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ProtectCurrentSheets
+Debug:FillDocument
+Listbox
+Listbox:MergeList
+Listbox:RemoveListItems
+Listbox:InitializeListboxProcedures
+Listbox:CopyListboxItems
+Listbox:FormMoveSelected
+Listbox:FormMoveAll
+Listbox:FormRemoveSelected
+Listbox:FormRemoveAll
+Listbox:MoveSelectedListBox
+Listbox:MoveOrderedSelectedListbox
+Listbox:RemoveSelected
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Listbox:FormSetMoveRights
+Listbox:AddSingleItemToListbox
+Listbox:EmptyListbox
+Listbox:SelectListboxItem
+Listbox:GetSelectedListboxItems
+Listbox:RemoveListboxItemByName
+Listbox:GetItemPos
+Misc
+Misc:Main
+Misc:RegisterNewDataSource
+Misc:ConnecttoDatabase
+Misc:GetStarOfficeLocale
+Misc:GetRegistryKeyContent
+Misc:GetProductname
+Misc:OpenDocument
+Misc:TaskonDesktop
+Misc:RetrieveFileName
+Misc:GetPathSettings
+Misc:GetOfficeSubPath
+Misc:ShowNoOfficePathError
+Misc:InitResources
+Misc:GetResText
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:ChangeValueofRange
+Misc:ReplaceRangeValues
+Misc:GetValueofCellbyName
+Misc:DuplicateRow
+Misc:GetStringofCellbyName
+Misc:GetCellByName
+Misc:ChangeCellValue
+Misc:GetDocumentType
+Misc:GetNumberFormatType
+Misc:ProtectSheets
+Misc:UnprotectSheets
+Misc:GetRowIndex
+Misc:GetColumnIndex
+Misc:CopySheetbyName
+Misc:ToggleWindow
+Misc:CheckNewSheetname
+Misc:AddNewSheetName
+Misc:GetSheetIndex
+Misc:GetLastUsedRow
+Misc:ModifyBorderLineWidth
+Misc:AttachBasicMacroToEvent
+Misc:ModifyPropertyValue
+Misc:GetPropertyValueIndex
+Misc:DispatchSlot
+Misc:IsFatOffice
+Misc:GetLocale
+Misc:ToggleDesignMode
+Misc:isHighContrast
+Misc:CreateNewDocument
+Misc:DisposeDocument
+Misc:CalIsLeapYear
+ModuleControls
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:GetOptionGroupValue
+ModuleControls:WriteOptValueToCell
+ModuleControls:LoadDialog
+ModuleControls:GetFolderName
+ModuleControls:GetFileName
+ModuleControls:StoreDocument
+ModuleControls:AddFiltersToDialog
+ModuleControls:SwitchMousePointer
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+Strings
+Strings:ElimChar
+Strings:DeleteStr
+Strings:FindPartString
+Strings:PartStringInArray
+Strings:RTrimStr
+Strings:LTRimChar
+Strings:ArrayOutOfString
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:FieldinArray
+Strings:FieldinList
+Strings:IndexinArray
+Strings:MultiArrayInListbox
+Strings:StringInMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetIndexForPartStringinMultiArray
+Strings:ArrayfromMultiArray
+Strings:ReplaceString
+Strings:FindSecondValue
+Strings:Power
+Strings:Round
+Strings:FileNameoutofPath
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:DirectoryNameoutofPath
+Strings:CountCharsinString
+Strings:BubbleSortList
+Strings:GetValueoutofList
+Strings:AddListtoList
+Strings:CheckDouble
+UCB
+UCB:Main
+UCB:ReadDirectories
+UCB:AddFoldertoList
+UCB:AddFileNameToList
+UCB:RetrieveDocTitle
+UCB:GetRealFileContent
+UCB:CopyRecursively
+UCB:ShowHelperDialog
+UCB:SaveDataToFile
+UCB:LoadDataFromFile
+UCB:CreateFolder
+Untitled 1
+Standard
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BeanShell.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BeanShell.txt
new file mode 100755
index 000000000000..141bebef85d5
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BeanShell.txt
@@ -0,0 +1,14 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+capitalise.bsh
+HelloWorld
+helloworld.bsh
+Highlight
+ButtonPressHandler.bsh
+ShowDialog.bsh
+MemoryUsage
+memusage.bsh
+WordCount
+wordcount.bsh
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_JavaScript.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_JavaScript.txt
new file mode 100755
index 000000000000..09ea2fbc3203
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_JavaScript.txt
@@ -0,0 +1,10 @@
+My Macros
+Oracle Open Office Macros
+ExportSheetsToHTML
+exportsheetstohtml.js
+HelloWorld
+helloworld.js
+Highlight
+ButtonPressHandler.js
+ShowDialog.js
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_Python.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_Python.txt
new file mode 100755
index 000000000000..dfe18f127bef
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_Python.txt
@@ -0,0 +1,10 @@
+My Macros
+Oracle Open Office Macros
+Capitalise
+capitalisePython
+HelloWorld
+HelloWorldPython
+pythonSamples
+TableSample
+createTable
+Untitled 1
diff --git a/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_RunMacro.txt b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_RunMacro.txt
new file mode 100755
index 000000000000..6b6a9b2520a3
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_RunMacro.txt
@@ -0,0 +1,681 @@
+My Macros
+Standard
+Module1
+Module1:Main
+Oracle Open Office Macros
+Capitalise
+Capitalise:capitalise.bsh
+Capitalise:capitalisePython
+Depot
+Depot
+Depot:AddShortCuttoControl
+Depot:Buy
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:HandleStocks
+Depot:Initialize
+Depot:InitializeStockRatesControls
+Depot:OpenStockRatePage
+Depot:Reset
+Depot:SelectStockname
+Depot:SelectStockNameForRates
+Depot:Sell
+Depot:SetupTransactionControls
+Depot:ToggleStockRateControls
+Depot:TransactionOk
+CommonLang
+CommonLang:CompleteMarketList
+CommonLang:InitializeStartUpModel
+CommonLang:LoadDepotDialogs
+CommonLang:LoadLanguage
+CommonLang:LocalizedCurrencies
+Currency
+Currency:CheckFormatType
+Currency:ChooseMarket
+Currency:CloseStartUpDialog
+Currency:ConvertStylesCurrencies
+Currency:DisposeDocument
+Currency:EnableGoOnButton
+Currency:Numberformat
+Currency:Startup
+Currency:SwitchNumberFormat
+Internet
+Internet:CalculateChartafterSplit
+Internet:CheckHistoryControls
+Internet:GetCurrentRate
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:StringToDate
+Internet:UpdateChart
+Internet:UpdateValue
+Lang_de
+Lang_de:LoadGermanLanguage
+tools
+tools:AddValueToCellContent
+tools:CellValuetoControl
+tools:CheckDocLocale
+tools:CheckInputDate
+tools:FillListbox
+tools:GetRowIndex
+tools:GetStockID
+tools:GetStockRowIndex
+tools:GetStocksCount
+tools:GetTransactionCount
+tools:InitializeStatusLine
+tools:InsertCurrentValue
+tools:MakeRangeVisible
+tools:RemoveSheet
+tools:RemoveStockRows
+tools:SplitCellValue
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Euro
+ConvertRun
+ConvertRun:AddRangeToListbox
+ConvertRun:AddSelectedRangeToSelRangesEnum
+ConvertRun:CheckLocale
+ConvertRun:CheckRangeSelection
+ConvertRun:ConvertRangesOrStylesOfDocument
+ConvertRun:ConvertWholeDocument
+ConvertRun:EmptySelection
+ConvertRun:EnableStep1DialogControls
+ConvertRun:FieldinList
+ConvertRun:GetPreSelectedRange
+ConvertRun:Main
+ConvertRun:RetrieveEnableValue
+ConvertRun:SelectListItem
+ConvertRun:SetOptionValuestoNull
+ConvertRun:SetStatusLineText
+AutoPilotRun
+AutoPilotRun:AssignFileName
+AutoPilotRun:CallFilePicker
+AutoPilotRun:CallFolderPicker
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:EnableStep2DialogControls
+AutoPilotRun:InitializeDocument
+AutoPilotRun:InitializeProgressPage
+AutoPilotRun:InitializeThirdStep
+AutoPilotRun:PreviousStep
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
+AutoPilotRun:ToggleGoOnButton
+AutoPilotRun:ToggleProgressStep
+Hard
+Hard:AddSheetRanges
+Hard:CheckIfRangeisCurrency
+Hard:ConvertCellCurrencies
+Hard:ConvertThehardWay
+Hard:CountColumnsForRow
+Hard:CountRangeCells
+Hard:CreateRangeEnumeration
+Hard:CreateRangeList
+Hard:ModifyObjectValuewithCurrFactor
+Hard:SelectRange
+Soft
+Soft:AssignCellFormatRanges
+Soft:AssignRangestoStyle
+Soft:ConvertTheSoftWay
+Soft:CreateStyleEnumeration
+Soft:DeselectStyle
+Soft:GetAssignedRanges
+Soft:MakeStyleEnumeration
+Soft:RetrieveRangeNamefromAddress
+Soft:RetrieveRangeoutofRangeName
+Soft:RetrieveSheetoutofRangeName
+Init
+Init:InitializeControls
+Init:InitializeConverter
+Init:InitializeCurrencies
+Init:InitializeCurrencyValues
+Init:InitializeLanguages
+Init:InitializeLocales
+Init:InitializeResources
+Common
+Common:CancelTask
+Common:CheckFormatType
+Common:ConvertDocument
+Common:EndStatusLine
+Common:FillUpCurrencyListbox
+Common:IncreaseStatusValue
+Common:InitializeProgressbar
+Common:Numberformat
+Common:RetrieveDocumentObjects
+Common:SelectCurrency
+Common:StartConversion
+Common:SwitchNumberFormat
+Writer
+Writer:ConvertTextFields
+Writer:ConvertWriterTables
+Writer:ModifyObjectValuewithCurrFactor
+Protect
+Protect:AddSheettoUnprotectionlist
+Protect:CheckSheetProtection
+Protect:ExecutePasswordDialog
+Protect:ReadPassword
+Protect:RejectPassword
+Protect:ReprotectSheets
+Protect:UnprotectSheet
+Protect:UnprotectSheetsWithPassWord
+Protect:UnprotectSheetWithDialog
+ExportSheetsToHTML
+ExportSheetsToHTML:exportsheetstohtml.js
+FormWizard
+FormWizard
+FormWizard:CommitLastDocumentChanges
+FormWizard:DeleteFirstListboxEntry
+FormWizard:DeleteFirstTableListBoxEntry
+FormWizard:EmptyFieldsListboxes
+FormWizard:FillUpFieldsListbox
+FormWizard:FormGetFields
+FormWizard:InitializeLayoutSettings
+FormWizard:Main
+FormWizard:MainWithDefault
+FormWizard:NextStep
+FormWizard:PreviousStep
+FormWizard:StoreForm
+FormWizard:StoreFormInDatabase
+FormWizard:ToggleDatabasePage
+Layouter
+Layouter:ArrangeControls
+Layouter:ChangeArrangemode
+Layouter:ChangeBorderLayouts
+Layouter:ChangeLabelAlignments
+Layouter:ConfigurePageStyle
+Layouter:DestroyControlShapes
+Layouter:InitializeLabelValues
+Layouter:InsertControl
+Layouter:OpenFormDocument
+Layouter:SwitchAlignMode
+Layouter:SwitchArrangementButtons
+Layouter:SwitchBorderMode
+Layouter:ToggleAlignGroup
+Layouter:ToggleBorderGroup
+Layouter:ToggleLayoutPage
+Language
+Language:InitializeWidthList
+Language:LoadLanguage
+Language:SetDialogLanguage
+DBMeta
+DBMeta:AddOrRemoveBinaryFieldsToWidthList
+DBMeta:AssignFieldLength
+DBMeta:CreateCommandTypeList
+DBMeta:CreateDBForm
+DBMeta:GetConnection
+DBMeta:GetCurrentMetaValues
+DBMeta:GetDatabaseNames
+DBMeta:GetDBMetaData
+DBMeta:GetSelectedDBMetaData
+DBMeta:GetSpecificFieldNames
+DBMeta:GetTableMetaData
+tools
+tools:CalcUniqueContentName
+tools:CountItemsInArray
+tools:GetDBHeight
+tools:GetFilterName
+tools:GetFormWizardPaths
+tools:GetPeerSize
+tools:GetPoint
+tools:GetPreferredHeight
+tools:GetPreferredWidth
+tools:GetSize
+tools:ImportStyles
+tools:PixelTo100thMMX
+tools:PixelTo100thMMY
+tools:RemoveNirwanaShapes
+tools:RemoveShapes
+tools:SetNumerics
+tools:SetProgressValue
+tools:ShapesToNirwana
+tools:TwipTo100telMM
+tools:TwipToCM
+tools:TwipToPixel
+develop
+develop:AdjustLineWidth
+develop:CheckJustifiedPosition
+develop:CheckOuterPoints
+develop:ControlCaptionstoStandardLayout
+develop:GetCorrWidth
+develop:GetLabelDiffHeight
+develop:GroupShapesTogether
+develop:InitializePosSizes
+develop:InsertDBControl
+develop:InsertTextControl
+develop:InsertTimeStampShape
+develop:PositionControls
+develop:PositionGridControl
+develop:RepositionColumnarLeftControls
+develop:ResetDBShape
+develop:ResetPosSizes
+develop:SetupGridColumn
+Gimmicks
+GetTexts
+GetTexts:GetAnnotations
+GetTexts:GetCalcGraphicNames
+GetTexts:GetCalcStrings
+GetTexts:GetCellTexts
+GetTexts:GetChartStrings
+GetTexts:GetControlContent
+GetTexts:GetControlStrings
+GetTexts:GetDocumentProps
+GetTexts:GetDrawPageTitles
+GetTexts:GetDrawStrings
+GetTexts:GetFrameTexts
+GetTexts:GetGraphicNames
+GetTexts:GetHyperlinks
+GetTexts:GetLinkedFileNames
+GetTexts:GetNamedRanges
+GetTexts:GetPageStrings
+GetTexts:GetParagraphTexts
+GetTexts:GetSectionNames
+GetTexts:GetStyles
+GetTexts:GetTextFieldStrings
+GetTexts:GetWriterStrings
+GetTexts:Main
+GetTexts:MakeLogHeadLine
+GetTexts:WriteStringtoLogFile
+Userfields
+Userfields:AddRecord
+Userfields:DeleteCurrentSettings
+Userfields:FillDialog
+Userfields:FillupTextFields
+Userfields:InitializeUserFamily
+Userfields:SaveSettings
+Userfields:ScrollControls
+Userfields:ScrollTextFieldInfo
+Userfields:SelectCurrentFields
+Userfields:StartChangesUserfields
+Userfields:StepToRecord
+Userfields:StopMacro
+Userfields:ToggleButtons
+ChangeAllChars
+ChangeAllChars:ChangeAllChars
+ChangeAllChars:ReplaceAllStrings
+ChangeAllChars:ReplaceStrings
+AutoText
+AutoText:InsertStringToCell
+AutoText:Main
+ReadDir
+ReadDir:AdjustPageHeight
+ReadDir:CalculateXPoint
+ReadDir:CheckPageWidth
+ReadDir:CloseDialog
+ReadDir:CreateTextShape
+ReadDir:DrawLine
+ReadDir:GetSourceDirectory
+ReadDir:Main
+ReadDir:ReadSourceDirectory
+ReadDir:SetNewLevels
+ReadDir:ToggleDialogControls
+ReadDir:TreeInfo
+HelloWorld
+HelloWorld:helloworld.bsh
+HelloWorld:helloworld.js
+HelloWorld:HelloWorld.printHW
+HelloWorld:HelloWorldPython
+Highlight
+Highlight:ButtonPressHandler.bsh
+Highlight:ButtonPressHandler.js
+Highlight:HighlightText.showForm
+Highlight:ShowDialog.bsh
+Highlight:ShowDialog.js
+ImportWizard
+Main
+Main:CancelTask
+Main:CheckInstalledModule
+Main:CheckModuleInstallation
+Main:GetImportWizardPaths
+Main:Main
+Main:NextStep
+Main:PrevStep
+Main:RepaintHeaderPreview
+Main:TakeOverPathSettings
+Main:TemplateDirSearchDialog
+Main:ToggleCheckboxes
+Main:ToggleCheckboxesWithBoolean
+Main:ToggleNextButton
+DialogModul
+DialogModul:AssignPathToCurrentApplication
+DialogModul:CheckControlPath
+DialogModul:CheckInputPaths
+DialogModul:CheckMSImportAvailability
+DialogModul:CheckTextBoxPath
+DialogModul:FillStep_InputPaths
+DialogModul:FillStep_Progress
+DialogModul:FillStep_Summary
+DialogModul:FillStep_Welcome
+DialogModul:FillUpApplicationList
+DialogModul:FinalizeDialogButtons
+DialogModul:GetFilterTracingLogPath
+DialogModul:InitializePathsforCurrentApplication
+DialogModul:InitializeProgressPage
+DialogModul:MakeSummaryString
+DialogModul:SaveStep_InputPath
+DialogModul:SetProgressDisplay
+DialogModul:SetupMSConfiguration
+DialogModul:SetupXMLConfiguration
+DialogModul:TakoverFolderName
+DialogModul:ToggleInputPaths
+Language
+Language:GetApplResourceArray
+Language:LoadLanguage
+FilesModul
+FilesModul:AddCollectionPath
+FilesModul:AddFilterNameToPathItem
+FilesModul:AddListtoFilesList
+FilesModul:AddLogStatistics
+FilesModul:CheckIfMacroExists
+FilesModul:CheckIfToAddPathToCollection
+FilesModul:CheckPassWordProtection
+FilesModul:CollectPaths
+FilesModul:ConcatComment
+FilesModul:ConvertAllDocuments
+FilesModul:CreateLogDocument
+FilesModul:CreateLogTable
+FilesModul:GetApplicationIndex
+FilesModul:GetFilterName
+FilesModul:GetFilterTracingLogPath
+FilesModul:GetSize
+FilesModul:GetTargetTemplatePath
+FilesModul:InsertCommandButtonatViewCursor
+FilesModul:InsertCommentToLogCell
+FilesModul:InsertHyperLinkToLogCell
+FilesModul:InsertSourceUrlToLogDocument
+FilesModul:InsertTargetUrlToLogDocument
+FilesModul:InterruptProcess
+FilesModul:MergeRange
+FilesModul:OpenLogDocument
+FilesModul:ReadCollectionPaths
+FilesModul:SearchArrayforPartString
+FilesModul:SetExtension
+API
+API:GetDefaultPath
+API:GetTemplateDefaultPath
+API:OpenRegKey
+API:QueryValue
+API:QueryValueEx
+MemoryUsage
+MemoryUsage:MemoryUsage.updateMemoryUsage
+MemoryUsage:memusage.bsh
+Schedule
+OwnEvents
+OwnEvents:CalcmdInsertData
+OwnEvents:CalCreateDateStrOfInput
+OwnEvents:CalGetNameOfEvent
+OwnEvents:CalLoadOwnData
+OwnEvents:CalSaveOwnData
+OwnEvents:CheckInsertedDates
+OwnEvents:GetDateUnits
+OwnEvents:GetOwnMonth
+OwnEvents:GetSelectedDateUnits
+OwnEvents:Main
+CalendarMain
+CalendarMain:AddNumberFormat
+CalendarMain:CalAutopilotTable
+CalendarMain:CalChooseCalendar
+CalendarMain:CalcmdCancel
+CalendarMain:CalcmdOk
+CalendarMain:SetupNumberFormatter
+BankHoliday
+BankHoliday:AddFollowUpHolidays
+BankHoliday:CalEasterTable
+BankHoliday:CalGetIntOfShortMonthName
+BankHoliday:CalInitGlobalVariablesDate
+BankHoliday:CalInsertBankholiday
+BankHoliday:CalInsertOwnDataInTables
+BankHoliday:CalMaxDayInMonth
+BankHoliday:CalOrthodoxEasterTable
+BankHoliday:GetMonthDate
+BankHoliday:GetNextWeekDay
+BankHoliday:Main
+DlgControl
+DlgControl:CalClearInputMask
+DlgControl:CalcmdDeleteSelect
+DlgControl:CalmdSwitchOwnDataOrGeneral
+DlgControl:CalMouseMoved
+DlgControl:CalSaveOwnEventControls
+DlgControl:CalUpdateNewEventFrame
+DlgControl:Main
+DlgControl:MouseLeavesImage
+DlgControl:SelectState
+DlgControl:ToggleInsertButton
+Language
+Language:LoadLanguage
+CreateTable
+CreateTable:CalCreateMonthTable
+CreateTable:CalCreateYearTable
+CreateTable:FormatCalCells
+GermanHolidays
+GermanHolidays:CalFindWholeYearHolidays_GERMANY
+GermanHolidays:CalGetGermanLandAtMousePos
+GermanHolidays:Main
+LocalHolidays
+LocalHolidays:CalculateChineseNewYear
+LocalHolidays:CalculateJapaneseAutumnDay
+LocalHolidays:CalculateJapaneseSpringDay
+LocalHolidays:CalculateturkishReligousHolidays
+LocalHolidays:FindWholeYearHolidays_CN
+LocalHolidays:FindWholeYearHolidays_DK
+LocalHolidays:FindWholeYearHolidays_FI
+LocalHolidays:FindWholeYearHolidays_FRANCE
+LocalHolidays:FindWholeYearHolidays_GREEK
+LocalHolidays:FindWholeYearHolidays_ITA
+LocalHolidays:FindWholeYearHolidays_JP
+LocalHolidays:FindWholeYearHolidays_NL
+LocalHolidays:FindWholeYearHolidays_PL
+LocalHolidays:FindWholeYearHolidays_PORT
+LocalHolidays:FindWholeYearHolidays_RU
+LocalHolidays:FindWholeYearHolidays_SPAIN
+LocalHolidays:FindWholeYearHolidays_SWED
+LocalHolidays:FindWholeYearHolidays_TRK
+LocalHolidays:FindWholeYearHolidays_TW
+LocalHolidays:FindWholeYearHolidays_US
+LocalHolidays:Main
+ScriptBindingLibrary
+Template
+ModuleAgenda
+ModuleAgenda:CreateBookMarkCursor
+ModuleAgenda:DeleteButtons
+ModuleAgenda:FinishAgenda
+ModuleAgenda:GetOptionValues
+ModuleAgenda:Initialize
+ModuleAgenda:LoadLanguageAgenda
+ModuleAgenda:ModifyTemplate
+ModuleAgenda:NewTopic
+Correspondence
+Correspondence:Database
+Correspondence:GetFieldName
+Correspondence:InsertDBField
+Correspondence:InsertPlaceholder
+Correspondence:LoadLanguageCorrespondence
+Correspondence:Main
+Correspondence:OK
+Correspondence:Placeholder
+Samples
+Samples:CloseStyleDialog
+Samples:KillTempFile
+Samples:PrepareForEditing
+Samples:RestoreCurrentStyles
+Samples:SaveCurrentStyles
+Samples:SelectStyle
+Samples:ShowStyles
+Autotext
+Autotext:CreateBullet
+Autotext:CreatePlaceholder
+Autotext:CreateUserDatafield
+Autotext:Main
+Tools
+ModuleControls
+ModuleControls:AddFiltersToDialog
+ModuleControls:DisposeControl
+ModuleControls:GetControlGroupModel
+ModuleControls:getControlModel
+ModuleControls:GetControlShape
+ModuleControls:getControlView
+ModuleControls:GetFileName
+ModuleControls:GetFolderName
+ModuleControls:GetOptionGroupValue
+ModuleControls:GetRefValue
+ModuleControls:GetRefValueOfControlGroup
+ModuleControls:LoadDialog
+ModuleControls:SetOVERWRITEToAlways
+ModuleControls:SetOVERWRITEToNever
+ModuleControls:SetOVERWRITEToQuery
+ModuleControls:ShowOverwriteAllDialog
+ModuleControls:StoreDocument
+ModuleControls:SwitchMousePointer
+ModuleControls:WriteOptValueToCell
+Strings
+Strings:AddListtoList
+Strings:ArrayfromMultiArray
+Strings:ArrayOutOfString
+Strings:BubbleSortList
+Strings:CheckDouble
+Strings:ClearArray
+Strings:ClearMultiDimArray
+Strings:CountCharsinString
+Strings:DeleteStr
+Strings:DirectoryNameoutofPath
+Strings:ElimChar
+Strings:FieldinArray
+Strings:FieldinList
+Strings:FileNameoutofPath
+Strings:FindPartString
+Strings:FindSecondValue
+Strings:GetFileNameExtension
+Strings:GetFileNameWithoutExtension
+Strings:GetIndexForPartStringinMultiArray
+Strings:GetIndexInMultiArray
+Strings:GetValueoutofList
+Strings:IndexinArray
+Strings:LTRimChar
+Strings:MultiArrayInListbox
+Strings:PartStringInArray
+Strings:Power
+Strings:ReplaceString
+Strings:Round
+Strings:RTrimStr
+Strings:StringInMultiArray
+Misc
+Misc:AddNewSheetName
+Misc:AttachBasicMacroToEvent
+Misc:CalIsLeapYear
+Misc:ChangeCellValue
+Misc:ChangeValueofRange
+Misc:CheckNewSheetname
+Misc:ConnecttoDatabase
+Misc:CopySheetbyName
+Misc:CreateNewDocument
+Misc:CutPathView
+Misc:DeleteInputCells
+Misc:DispatchSlot
+Misc:DisposeDocument
+Misc:DuplicateRow
+Misc:GetCellByName
+Misc:GetColumnIndex
+Misc:GetDocumentType
+Misc:GetLastUsedRow
+Misc:GetLocale
+Misc:GetNumberFormatType
+Misc:GetOfficeSubPath
+Misc:GetPathSettings
+Misc:GetProductname
+Misc:GetPropertyValueIndex
+Misc:GetRegistryKeyContent
+Misc:GetResText
+Misc:GetRowIndex
+Misc:GetSheetIndex
+Misc:GetStarOfficeLocale
+Misc:GetStringofCellbyName
+Misc:GetValueofCellbyName
+Misc:InitResources
+Misc:IsFatOffice
+Misc:isHighContrast
+Misc:Main
+Misc:ModifyBorderLineWidth
+Misc:ModifyPropertyValue
+Misc:OpenDocument
+Misc:ProtectSheets
+Misc:RegisterNewDataSource
+Misc:ReplaceRangeValues
+Misc:RetrieveFileName
+Misc:ShowNoOfficePathError
+Misc:TaskonDesktop
+Misc:ToggleDesignMode
+Misc:ToggleWindow
+Misc:UnprotectSheets
+UCB
+UCB:AddFileNameToList
+UCB:AddFoldertoList
+UCB:CopyRecursively
+UCB:CreateFolder
+UCB:GetRealFileContent
+UCB:LoadDataFromFile
+UCB:Main
+UCB:ReadDirectories
+UCB:RetrieveDocTitle
+UCB:SaveDataToFile
+UCB:ShowHelperDialog
+Listbox
+Listbox:AddSingleItemToListbox
+Listbox:CopyListboxItems
+Listbox:EmptyListbox
+Listbox:FormMoveAll
+Listbox:FormMoveSelected
+Listbox:FormRemoveAll
+Listbox:FormRemoveSelected
+Listbox:FormSetMoveRights
+Listbox:GetItemPos
+Listbox:GetSelectedListboxItems
+Listbox:InitializeListboxProcedures
+Listbox:MergeList
+Listbox:MoveOrderedSelectedListbox
+Listbox:MoveSelectedListBox
+Listbox:RemoveListboxItemByName
+Listbox:RemoveListItems
+Listbox:RemoveSelected
+Listbox:SelectListboxItem
+Listbox:SetNewSelection
+Listbox:ToggleListboxControls
+Debug
+Debug:ActivateReadOnlyFlag
+Debug:DeactivateReadOnlyFlag
+Debug:FillDocument
+Debug:printdbgInfo
+Debug:ProtectCurrentSheets
+Debug:SetBasicReadOnlyFlag
+Debug:ShowArray
+Debug:ShowAvailableServiceNames
+Debug:ShowCommands
+Debug:ShowElementNames
+Debug:ShowNameValuePair
+Debug:ShowPropertyValues
+Debug:ShowSupportedServiceNames
+Debug:WritedbgInfo
+Debug:WriteDbgString
+WordCount
+WordCount:wordcount.bsh
+pythonSamples
+TableSample
+TableSample:createTable
+Untitled 1
+Standard
diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc
index e905b55bbebc..38664ef78501 100755..100644
--- a/testautomation/framework/tools/includes/CJK_tools.inc
+++ b/testautomation/framework/tools/includes/CJK_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : hercule.li@sun.com
+'* owner : hercule.li@oracle.com
 '*
 '* short description : Tools for CJK feature test in Writer
 '*
diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc
index 386c5423ee3a..9fbdb6928b08 100755..100644
--- a/testautomation/framework/tools/includes/customize_tools.inc
+++ b/testautomation/framework/tools/includes/customize_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 dd91cc08f498..061f9f606f48 100755..100644
--- a/testautomation/framework/tools/includes/fileoperations.inc
+++ b/testautomation/framework/tools/includes/fileoperations.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 03ebb004ee3a..6755ed2a2cdd 100755..100644
--- a/testautomation/framework/tools/includes/formcontrols.inc
+++ b/testautomation/framework/tools/includes/formcontrols.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@sun.com
+' ** owner : joerg.skottke@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 8552954f4f34..9c81084952df 100755..100644
--- a/testautomation/framework/tools/includes/help_tools.inc
+++ b/testautomation/framework/tools/includes/help_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 131f162c8436..f918b1fe5076 100755..100644
--- a/testautomation/framework/tools/includes/i18n_tools.inc
+++ b/testautomation/framework/tools/includes/i18n_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Tools to ease working with language dependent strings/values
 '*
diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc
index 27969686dea6..4f7a05154795 100755..100644
--- a/testautomation/framework/tools/includes/options_tools.inc
+++ b/testautomation/framework/tools/includes/options_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : tools for options tests
 '*
diff --git a/testautomation/framework/tools/includes/pbrowser_tools.inc b/testautomation/framework/tools/includes/pbrowser_tools.inc
index 912b3f85aec2..a6a089150a96 100755..100644
--- a/testautomation/framework/tools/includes/pbrowser_tools.inc
+++ b/testautomation/framework/tools/includes/pbrowser_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 87cfab146f15..af81110b3f18 100644
--- a/testautomation/framework/tools/includes/private_environment.inc
+++ b/testautomation/framework/tools/includes/private_environment.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 0b09ed6270ac..8cf067913d64 100755..100644
--- a/testautomation/framework/tools/includes/scriptorganizer_tools.inc
+++ b/testautomation/framework/tools/includes/scriptorganizer_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 b31e5dbe5a58..77cbdf61a44b 100755..100644
--- a/testautomation/framework/tools/includes/spadmin_tools.inc
+++ b/testautomation/framework/tools/includes/spadmin_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@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 5a1370b77262..c9d1e94fa16f 100755..100644
--- a/testautomation/framework/tools/includes/template_tools.inc
+++ b/testautomation/framework/tools/includes/template_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 8d0b198b0441..66c6c27982d0 100755..100644
--- a/testautomation/framework/tools/includes/toolbar_tools.inc
+++ b/testautomation/framework/tools/includes/toolbar_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : global update test (Standardbar)
 '*
@@ -200,7 +200,8 @@ function hStandardbarItemGetCount() as integer
     '///<ul>
     
     dim iToolbarItemsCurrent as integer
-    const EXPECTED_TOOLBAR_ITEMCOUNT = 30
+    const DEFAULT_TOOLBAR_ITEMCOUNT = 30
+    const WEBLOG_PUBLISHER = 2
     
     const CFN = "hStandardbarItemGetCount::"
 
@@ -226,13 +227,14 @@ function hStandardbarItemGetCount() as integer
     ' violate Sun's patching policy. So StarSuite/StarOffice now have 30 or 31
     ' items on the standardbar, OOo and its spinoffs have 30.
     
-    
-    if ( iToolbarItemsCurrent = EXPECTED_TOOLBAR_ITEMCOUNT ) then
-        printlog( CFN & "Correct number of items on the StandardBar. Good" )
-    else
-        warnlog( CFN & "Expected: " & EXPECTED_TOOLBAR_ITEMCOUNT & _
-                " entries, found: " & iToolbarItemsCurrent )
-    endif
+    select case ( iToolbarItemsCurrent )
+    case DEFAULT_TOOLBAR_ITEMCOUNT
+        printlog( CFN & "Default number of items found" )
+    case DEFAULT_TOOLBAR_ITEMCOUNT + WEBLOG_PUBLISHER
+        printlog( CFN & "Default icons + Weblog publisher icons found" )
+    case else
+        warnlog( CFN & "Number of icons is unexpected: " & iToolbarItemsCurrent )
+    end select
 
     '///+<li>close the context menu</li>
     hMenuClose()
diff --git a/testautomation/framework/tools/includes/webtools.inc b/testautomation/framework/tools/includes/webtools.inc
index a56639a269e3..424ace8c959e 100644
--- a/testautomation/framework/tools/includes/webtools.inc
+++ b/testautomation/framework/tools/includes/webtools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 bb8579edfba7..93a09ccf533d 100644
--- a/testautomation/framework/tools/includes/window_tools.inc
+++ b/testautomation/framework/tools/includes/window_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@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 a140401c1202..380f84141d34 100755..100644
--- a/testautomation/framework/tools/includes/wizards.inc
+++ b/testautomation/framework/tools/includes/wizards.inc
@@ -25,334 +25,12 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : helper functions for the wizards
 '*
 '\******************************************************************************
 
-function hOpenWizardWithMenu( cType as string ) as integer
-
-    const CFN = "hOpenWizardWithMenu::"
-
-    '///<h3>Open a wizard via menu</h3>
-    '///<i>Starting point: Any plain document</i><br>
-    '///<i>Uses: framework/tools/input/menuentries.txt</i><br>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Name of Wizard (string). Known Wizards are:</li>
-    '///<ul>
-    '///+<li>&quot;LETTER&quot;</li>
-    '///+<li>&quot;FAX&quot;</li>
-    '///+<li>&quot;AGENDA&quot;</li>
-    '///+<li>&quot;PRESENTATION&quot;</li>
-    '///+<li>&quot;WEBPAGE&quot;</li>
-    '///+<li>&quot;DOCCONV&quot;</li>
-    '///+<li>&quot;EUROCONV&quot;</li>
-    '///+<li>&quot;ADDRESS&quot;</li>
-    '///+<li>&quot;MAILMERGE&quot;</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Errorcode (integer)</li>
-    '///<ul>
-    '///+<li>0: The expected wizard is open</li>
-    '///+<li>1: No wizard is open</li>
-    '///+<li>2: The incorrect wizard is open</li>
-    '///+<li>3: The requested wizard is unknown to this function</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>
-    
-    dim iMainMenuPosition as integer   ' position in the main menu
-    dim iMenuPosition as integer       ' the position of the menuentry
-    dim iWizardMenuPosition as integer ' the position of the wizards menu
-    dim iWizardID as integer           ' a unique number to identify the wizard
-    dim iWait as integer               ' time of the wizard to open
-    dim iOpen as integer               ' identifier for the open dialog
-    dim brc as boolean                 ' some multi purpose boolean returnvalue
-
-    hOpenWizardWithMenu() = 0
-
-    '///+<li>find out where in the menustructure the wizards are located</li>
-    printlog( "Requested Wizard: " & cType )
-    iWizardID           = hGetWizardParams( cType , "ID"   )
-    iMainMenuPosition   = hGetWizardParams( cType , "MAIN" )
-    iMenuPosition       = hGetWizardParams( cType , "SUB"  )
-    iWizardMenuPosition = 4 ' This is the "Wizards" menuentry below "File"
-    
-    try
-        kontext "DocumentWriter"
-        hUseMenu()
-
-        '///+<li>Open the 'File' menu</li>
-        printlog( CFN & "Open Menu at pos " & iMainMenuPosition )
-        hMenuSelectNr( iMainMenuPosition )
-        WaitSlot( 2000 )
-  
-        '///+<li>if we are in the filemenu the wizards are below a submenu</li>
-        if ( iMainMenuPosition = 1 ) then
-            printlog( CFN & "Select wizards-submenu at pos " & iWizardMenuPosition )
-            hMenuSelectNr( iWizardMenuPosition )
-            WaitSlot( 2000 )
-        else
-            printlog( CFN & "Wizard is not in File-Menu" )
-        endif
-    
-        '///+<li>try to click the menuentry where we expect the wizard</li>
-        printlog( CFN & "Select " & cType & " wizard at pos " & iMenuPosition )
-        hMenuSelectNr( iMenuPosition )
-        WaitSlot( 2000 )
-        brc = true
-    catch
-        ' we end up here, when the menuitems could not be accessed
-        printlog( CFN & "Error accessing menuentry for wizard" )
-        hOpenWizardwithMenu() = 1
-        brc = false
-    endcatch
-    
-    if ( not brc ) then
-        printlog( CFN & "Trying to open wizard using the slot" )
-        select case iWizardId
-        case 1 : FileAutopilotLetter
-        case 2 : FileAutopilotFax
-        case 3 : FileAutopilotAgenda
-        case 4 : FileAutopilotPresentation
-        end select
-    endif
-    
-    '///+<li>wait for a wizard to open, iOpen is the number of the menuitem</li>
-    iOpen = hWaitForWizard()
-    
-    '///+<li>Verify that the correct wizard is open. iOpen should match iMenuPosition</li>
-    ' This works because the menu-positions are unique. BEWARE!
-    if ( iOpen <> iWizardID ) then
-            
-        qaerrorlog( CFN & "Incorrect Wizard is open, did the menu-order change?" )
-                
-        hFinishWizard( 2 ) 
-        hOpenWizardWithMenu() = 2
-
-    else
-    
-        hOpenWizardWithMenu() = 0
-                
-    endif    
-    '///</ul>
-    
-end function
-
-'*******************************************************************************
-
-function hFinishWizard( iMode as integer ) as boolean
-
-    const CFN = "hFinishWizard::"
-    
-    '///<h3>Finish or cancel a wizard</h3>
-    '///<i>Starting point: Any known wizard must be open</i><br>
-    '///<i>If several wizards are open at the same time the outcome is undefined</i><br>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Closing method (integer). Valid options are:</li>
-    '///<ul>
-    '///+<li>1: Click Finish-Button</li>
-    '///+<li>2: Click Cancel-Button</li>
-    '///+<li>3: Use Accelerator for Finish-Button</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Errorcode (boolean)</li>
-    '///<ul>
-    '///+<li>TRUE: If everything is ok</li>
-    '///+<li>FALSE: On any error (including incorrect function parameters)</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>    
-    
-    '///+<li>Handle possible errors when invoking this function</li>
-    if ( ( iMode < 1 ) or ( iMode > 3 ) ) then
-        printlog( CFN & "Invalid iMode = " & iMode )
-        hFinishWizard() = false
-        exit function
-    endif
-
-    dim cAccel as string
-    dim iWait as integer
-    dim brc as boolean : brc = false
-       
-        
-    '///+<li>Try to close the wizard</li>
-    for iWait = 1 to 5
-    
-        Kontext "AutopilotLetter"
-        if ( AutopilotLetter.exists() ) then
-            select case iMode
-            case 1 : hWaitForObject( FinishButton, 3000 ) : FinishButton.click()
-            case 2 : AutopilotLetter.cancel()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     AutopilotLetter.typeKeys( cAccel )
-            end select
-            brc = true
-            exit for
-        endif
-
-        Kontext "AutopilotFax"
-        if ( AutopilotFax.exists() ) then
-            select case iMode
-            case 1 : hWaitForObject( FinishButton, 3000 ) : FinishButton.click()
-            case 2 : AutopilotFax.cancel()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     AutopilotFax.typeKeys( cAccel )            
-            end select
-            brc = true
-            exit for
-        endif
-        
-        Kontext "AutopilotAgenda"
-        if ( AutopilotAgenda.exists() ) then
-            select case iMode
-            case 1 : hWaitForObject( createButton, 3000 ) : createButton.click()
-            case 2 : hWaitForObject( cancelButton, 3000 ) : cancelButton.click()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     AutopilotAgenda.typeKeys( cAccel )            
-            end select
-            brc = true
-            exit for
-        endif    
-        
-        Kontext "MailMergeWizard" 
-        if ( MailMergeWizard.exists() ) then
-            select case iMode
-            case 1 : MailMergeWizard.OK()
-            case 2 : MailMergeWizard.Cancel()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     MailMergeWizard.typeKeys( cAccel )            
-            end select
-            brc = true
-            exit for
-        endif      
-        
-        Kontext "AutopilotPraesentation3" 
-        if ( AutopilotPraesentation3.exists() ) then
-            select case iMode
-            case 1 : AutopilotPraesentation3.OK()
-            case 2 : AutopilotPraesentation3.Cancel()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     AutopilotPraesentation3.typeKeys( cAccel )            
-            end select
-            brc = true
-            exit for
-        endif    
-        
-        Kontext "AutoPilotEuroKonverter" 
-        if ( AutoPilotEuroKonverter.exists() ) then
-            select case iMode
-            case 1 : hWaitForObject( Konvertieren, 3000 ) : Konvertieren.click()
-            case 2 : hWaitForObject( abbrechen   , 3000 ) : abbrechen.click()
-            case 3 : cAccel = hGetAccel( "Finish_Wizard" )
-                     AutoPilotEuroKonverter.typeKeys( cAccel )            
-            end select
-            brc = true
-            exit for
-        endif            
-        
-    next iWait
-    
-    '///+<li>Verify that no wizard is open anymore</li>
-    if ( brc ) then
-        printlog( CFN & "Closed wizard" )
-        hFinishWizard() = true
-    else
-        qaerrorlog( CFN & "No (known) wizard is present to be closed" )
-        hFinishWizard() = false
-    endif
-    '///</ul>
-    
-end function   
-
-'*******************************************************************************
-
-function hGetWizardParams( cType as string, cParam as string ) as integer
-
-    const CFN = "hGetWizardParams::"
-    
-    '///<h3>Retrieve the location of a wizard in the menu</h3>
-    '///<i>Uses: framework/tools/input/menuentries.txt</i><br>
-    '///<i>Refer to inline documentation for further information</i><br>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Name of Wizard (string). Valid options are:</li>
-    '///<ul>
-    '///+<li>&quot;LETTER&quot;</li>
-    '///+<li>&quot;FAX&quot;</li>
-    '///+<li>&quot;AGENDA&quot;</li>
-    '///+<li>&quot;PRESENTATION&quot;</li>
-    '///+<li>&quot;WEBPAGE&quot;</li>
-    '///+<li>&quot;DOCCONV&quot;</li>
-    '///+<li>&quot;EUROCONV&quot;</li>
-    '///+<li>&quot;ADDRESS&quot;</li>
-    '///+<li>&quot;MAILMERGE&quot;</li>
-    '///</ul>
-    '///+<li>Menu Position (string). Valid options are:</li>
-    '///<ul>
-    '///+<li>&quot;ID&quot; - This is a unique id for the wizard</li>
-    '///+<li>&quot;MAIN&quot; - Main menu position (e.g. &quot;File&quot;</li>
-    '///+<li>&quot;SUB&quot; - Position below main menu</li>
-    '///</ul>    
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Position of a menu entry (integer)</li>
-    '///<ul>
-    '///+<li>0: Invalid function parameter</li>
-    '///+<li>1-n: Position of the item in the menu</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>    
-
-    dim iParam as integer
-    
-    dim cInputArray( 200 ) as string
-    dim iArraySize as integer
-    
-    dim cFile as string
-        cFile = gTesttoolPath & "framework\tools\input\menuentries.txt"
-        cFile = convertpath( cFile )
-    
-    '///+<li>Lowercase all function parameters</li>
-    cType = ucase( cType )
-    cParam = ucase( cParam )
-    
-    '///+<li>Read in the section containing the waizard parameters</li>
-    '///+<li>Retrieve the requested value from the section</li>
-    iArraySize = hGetDataFileSection( cFile , cInputArray() , ctype , "" , "" )
-    if ( iArraySize = 3 ) then
-    
-        select case cParam
-        case "ID"
-            iParam = hGetValueForKeyAsInt( cInputArray() , "iWizardId" )
-        case "MAIN"
-            iParam = hGetValueForKeyAsInt( cInputArray() , "iMainMenuPosition" )
-        case "SUB"
-            iParam = hGetValueForKeyAsInt( cInputArray() , "iMenuPosition" )
-        end select
-    
-        hGetWizardParams() = iParam
-    else
-        qaerrorlog( CFN & "hGetDataFileSection returned invalid data" )
-        hGetWizardParams() = 0
-    endif
-    '///</ul>
-    
-end function
-
-'*******************************************************************************
-
 function hWaitForWizard() as integer
 
     const CFN = "hWaitForWizard::"
diff --git a/testautomation/framework/tools/input/menuentries.txt b/testautomation/framework/tools/input/menuentries.txt
deleted file mode 100755
index e1517412bc26..000000000000
--- a/testautomation/framework/tools/input/menuentries.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file contains the position of the menuentries for all
-# wizards ∧assigns them a unique number
-# iWizardId = Unique number
-# iMenuPosition = Position below the main menu entry
-# iMainMenuPosition = Position ∈main menu, e.g. "File"
-
-[LETTER]
-iWizardID=1
-iMenuPosition=1
-iMainMenuPosition=1
-
-[FAX]
-iWizardID=2
-iMenuPosition=2
-iMainMenuPosition=1
-
-[AGENDA]
-iWizardID=3
-iMenuPosition=3
-iMainMenuPosition=1
-
-[PRESENTATION]
-iWizardID=4
-iMenuPosition=4
-iMainMenuPosition=1
-
-[WEBPAGE]
-iWizardID=5
-iMenuPosition=5
-iMainMenuPosition=1
-
-[DOCCONV]
-iWizardID=6
-iMenuPosition=6
-iMainMenuPosition=1
-
-[EUROCONV]
-iWizardID=7
-iMenuPosition=7
-iMainMenuPosition=1
-
-[ADDRESS]
-iWizardID=8
-iMenuPosition=8
-iMainMenuPosition=1
-
-[MAILMERGE]
-iWizardID=11
-iMenuPosition=11
-iMainMenuPosition=7
diff --git a/testautomation/global/input/empty/please_do_not_delete_this_file b/testautomation/global/input/empty/please_do_not_delete_this_file
index c6103b698301..0b366e10364f 100644..100755
--- a/testautomation/global/input/empty/please_do_not_delete_this_file
+++ b/testautomation/global/input/empty/please_do_not_delete_this_file
@@ -1,3 +1,3 @@
 Please do not delete this file. 
 
-thorsten.ziehm@sun.com
\ No newline at end of file
+thorsten.ziehm@oracle.com
\ No newline at end of file
diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc
index 07c294f44e2f..8cbc1bb24526 100755..100644
--- a/testautomation/global/required/includes/g_001.inc
+++ b/testautomation/global/required/includes/g_001.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global resource tests for the menu: File
 '*
diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc
index 17b31cf3fd08..61ef7dd95c37 100755..100644
--- a/testautomation/global/required/includes/g_009.inc
+++ b/testautomation/global/required/includes/g_009.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global resource tests for the menu: Help
 '*
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc
index f2df48f3c552..07c2dde3927d 100644
--- a/testautomation/global/required/includes/g_customize.inc
+++ b/testautomation/global/required/includes/g_customize.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for tools/customize
 '*
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index 38af3edd28aa..dd8e9062b604 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -87,7 +87,7 @@ testcase tUpdtFindBar()
             warnlog( "Messagebox missing <No matches found>" )
         endif
 
-        warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+        qaerrorlog( "#i111984 - exclude <SearchDialog> button from testing" )
         goto skip_SearchDialog
 
             printlog( "Search dialog button may not be visible by default" )
diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc
index 2271bc333142..2539e12455e5 100755..100644
--- a/testautomation/global/required/includes/g_numberformatter1.inc
+++ b/testautomation/global/required/includes/g_numberformatter1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : update and resouce test for numberformatter
 '*
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index fe462038899f..2f7b6aa33ac2 100755..100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for all option pages (at tools/options)
 '*
diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc
index 4fe4a6cb2cad..233b6cb9d9cc 100644
--- a/testautomation/global/required/includes/g_option_application.inc
+++ b/testautomation/global/required/includes/g_option_application.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : update and resouce test for all option pages (at tools/options)
 '*
diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
index e05c1ba1d7e6..15ee12c4308d 100755..100644
--- a/testautomation/global/required/includes/g_printing.inc
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Resource test for the printing dialog
 '*
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index cd7dfce11ca0..025cf6b617e1 100644..100755
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -533,7 +533,7 @@ ExtrasIndividuellePraesentation .uno:CustomShowDialog
 ' ExtrasSymbole .uno:Symbols
 ExtrasSymboleKatalog .uno:SymbolCatalogue
 ' ExtrasSymboleLaden SID_SYMBOLS_LOAD
-ExtrasFormelImportieren .uno:InsertFormula
+ExtrasFormelImportieren .uno:ImportFormula
 
 ' ***********************************
 ' *********** Praesentationmenue ************
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index 8efe7443e8a3..4770eab50f1b 100644..100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -21,6 +21,8 @@ FileAutopilotAddressDataSource .uno:AutoPilotAddressDataSource
 FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start
 FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start
 FileCloseAndReturn .uno:CloseDoc
+FileWizardDocumentConverter sym:vnd.sun.star.script:ImportWizard.Main.Main?language=Basic&location=application
+FileWizardEuroConverter sym:vnd.sun.star.script:Euro.AutoPilotRun.StartAutoPilot?language=Basic&location=application
 FileSaveCopy SID_SAVEASDOC
 FileClose .uno:CloseDoc
 FileSave SID_SAVEDOC
@@ -774,7 +776,7 @@ ToolsLanguageHyphenationDraw .uno:Hyphenation
 
 ' **** Math
 ToolsSymbolsCatalog .uno:SymbolCatalogue
-ToolsImportFormula .uno:InsertFormula
+ToolsImportFormula .uno:ImportFormula
 
 ' ******************************************
 ' ***********  Slide Show Menu  ************
diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc
index 97ef228a8118..5fed58be6cfd 100644
--- a/testautomation/global/system/includes/declare.inc
+++ b/testautomation/global/system/includes/declare.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : starting routines for declare.bas
 '*
diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index eff969fbee2c..ca3764a1a51b 100755..100644
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : all global variables
 '*
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index aa305b9a1a21..0b83af421eeb 100755..100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : get information for startup a test out of important ini-files
 '*
diff --git a/testautomation/global/system/includes/inivalue.inc b/testautomation/global/system/includes/inivalue.inc
index cf70fa365f7e..2cc13be957cb 100755..100644
--- a/testautomation/global/system/includes/inivalue.inc
+++ b/testautomation/global/system/includes/inivalue.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : routines to handle ini-files ( read/write items )
 '*
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index fafb5f758a85..880496e3dc42 100755..100644
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : very important routines to start a testscript
 '*
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index bf1ba6a74416..83430bfaa332 100755..100644
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Routines for the status page feature
 '*
diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc
index f6b7ba369b1f..30e00585d517 100644
--- a/testautomation/global/system/includes/sysinfo.inc
+++ b/testautomation/global/system/includes/sysinfo.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Establish facts of the operating system
 '*
diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas
index a2a9200d10c3..da402ecd40f7 100755
--- a/testautomation/global/tools/closeoffice.bas
+++ b/testautomation/global/tools/closeoffice.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Exit the [Star|Open][Office|Suite][.org] nicely
 '*
diff --git a/testautomation/global/tools/compressstatus.bas b/testautomation/global/tools/compressstatus.bas
index b8ed46d3b3f5..679b322096b0 100755
--- a/testautomation/global/tools/compressstatus.bas
+++ b/testautomation/global/tools/compressstatus.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Compress local written status files for submission
 '*
diff --git a/testautomation/global/tools/declare.bas b/testautomation/global/tools/declare.bas
index a874bb674a8c..7d00ef69f824 100755
--- a/testautomation/global/tools/declare.bas
+++ b/testautomation/global/tools/declare.bas
@@ -24,7 +24,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : To get Help ID's from the office
 '*
diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc
index 4d04afaf3554..04718449b13b 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@sun.com
+'*  owner : joerg.skottke@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 fcf8d301db58..f7537d52700c 100755..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@sun.com
+' ** owner : joerg.skottke@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 b813ee2bf706..f63d610dbdb8 100755..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@sun.com
+' ** owner : joerg.skottke@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 00bafbf04ed5..b1da7d7e8d95 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@sun.com
+'*  owner : joerg.skottke@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 c544db3111fa..7f43b7211630 100755..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@sun.com
+'* owner : joerg.skottke@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 0b530af4a274..654b1b76c515 100755..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@sun.com
+'*  owner : joerg.skottke@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 420b14ae9676..070427ef3c5b 100755..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@sun.com
+'*  owner : joerg.skottke@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 9bf994824cc9..14906c127c68 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@sun.com
+'* owner : joerg.skottke@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 ea8a5d5bec68..c90d077db651 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Replacements for routines in t_lists.inc adds some
 '*
@@ -140,6 +140,9 @@ function hManageComparisionList( sFileIn as string, sFileOut as string, sListOut
     '///<ul>
 
     const CFN = "hManageComparisionList::"
+
+    ' maximum lines per file. Currently this limit is determined by the help
+    ' tests which have up to 22000 entries + reseve.
     const FILESIZE = 25000
     const COMPARE_SUCCESS = 0
     const ENCODING_UTF8 = "UTF8"
@@ -148,39 +151,33 @@ function hManageComparisionList( sFileIn as string, sFileOut as string, sListOut
     dim aReferenceList( FILESIZE ) as string
 
     if ( GVERBOSE ) then printlog( CFN & "Reading: " & sFileIn )
-    ' disabled hGetDataFileSection because some lists contain a #
-    ' (hash) as value which is identified as comment by the function.
-    ' Fixing this for hGetDataFileSection() would break compatibility
-    ' to other functions both in framework and global module
-    'hgetDataFileSection( sFileIn , aReferenceList() , "" , "" , "" )
+
+    ' Do not use hGetDataFileSection() as strings in some lists may begin with a
+    ' "#" which is interpreted as a comment by hGetDataFileSection()
     listread( aReferenceList(), sFileIn, ENCODING_UTF8 )
+
+    ' Word of caution: If the number of new items equals the number of removed items
+    ' this function returns 0 -> success. This case is highly unlikely to ever happen
+    ' unless someone renames scripts.
     irc = hListCompare( sListOut() , aReferenceList() )
         
-    ' A this point there are three possible states:
-    ' a) the reference list does not exist
-    ' b) the comparision failed
-    ' c) the comparision succeeded
-    ' only if hListCompare() returns 0 the testrun is successful.
-    ' This means that on any error, the ref-list will be written so it can be
-    ' directly reviewed/compared to the "faulty" list without having to run this
-    ' test again (after deleting the ref-file)
     '///+<li>In case the lists are not identical, write the new one to the local work directory</li>
     if ( irc = COMPARE_SUCCESS ) then
         printlog( CFN & "Comparision succeeded" )
         hManageComparisionList() = COMPARE_SUCCESS
     else
-        if ( GVERBOSE ) then
-            printlog( CFN & "The two compared lists differ. There are two likely reasons:" )
-            printlog( CFN & "1) The reference file does not exist at all" )
-            printlog( CFN & "2) Reference and actual UI-Content do not match." )
-            printlog( CFN & "Verify and copy the file: " & sFileOut )
-            printlog( CFN & "to this location........: " & sFileIn  )
-        endif
+        printlog( CFN & "The two compared lists differ. There are a number of possible reasons:" )
+        printlog( CFN & "- Installation requirements are not met (setup /a?, missing packages?)" )
+        printlog( CFN & "- Reference and actual UI-Content do not match: File an issue." )
+        printlog( CFN & "- The reference file does not exist: Follow steps below." )
+        printlog( CFN & "Verify and copy the file: " & sFileOut )
+        printlog( CFN & "to this location........: " & sFileIn  )
+        printlog( CFN & "Check this file into the SCM or attach it to an issue" )
         listwrite( sListOut(), sFileOut, ENCODING_UTF8 )
         hManageComparisionList() = irc
     endif
-    
-    '///+<li>Return 0 if the lists are identical, 1 if not and 2-4 on any other error</li>
+
+    '///+<li>Return number of differences between the lists</li>
     '///</ul>
 
 end function
@@ -266,7 +263,7 @@ function hListCompare( aListOne() as String, aListTwo() as String ) as integer
     if ( ListCount( aTwoOnlyList() ) > 0 ) then
         printlog( CFN & "Objects have been removed from the list" )
         hListPrint( aTwoOnlyList() , "Items found in list TWO only (MISSING)" )
-        hListCompare() = ListCount( aOneOnlyList() ) * -1
+        hListCompare() = ListCount( aTwoOnlyList() ) * -1
     end if
 
     '///</ul>
@@ -428,7 +425,7 @@ function hCountMatchesInList( acItemList() as string, cSearchTerm as string ) as
         endif
     next iCurrentItem
 
-if ( GVERBOSE ) then printlog( CFN & "Exit with result: " & iHitCount )
+    if ( GVERBOSE ) then printlog( CFN & "Exit with result: " & iHitCount )
     hCountMatchesInList() = iHitCount
 
 end function
diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
index d3e7708dbd30..29c4bcf3cb6b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : defining locale dependant strings 
 '*
diff --git a/testautomation/global/tools/includes/optional/t_locale_tools.inc b/testautomation/global/tools/includes/optional/t_locale_tools.inc
index 83a80ad0d107..75d18e2c5856 100644
--- a/testautomation/global/tools/includes/optional/t_locale_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_tools.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : place it here
 '*
diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc
index 18d5245e13f7..6c1fcc478e5a 100755..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@sun.com
+' ** owner : joerg.skottke@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 63c55705add9..13138dfc52ab 100755..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@sun.com
+'*  owner : joerg.skottke@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 24a718fd7a48..28625be35880 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Tools to ease testing of security related funtionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
index bcc8cda10e5b..8384edcc27d1 100644
--- a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
+++ b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Tool library for setting controls and verifying the functionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
index cdc0eae38540..55da2fc1c9aa 100644
--- a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : oliver.craemer@sun.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Global tools for spreadsheet
 '*
diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc
index 914d8b7c6ab4..7f946fd3b046 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Functions for manipulation of strings
 '*
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
index 0bd7ae50525f..77c72a9ec2dc 100755..100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Toolbar tools 1
 '*
@@ -36,7 +36,7 @@
 '\*************************************************************************************
 
 '******************************************************************
-'* Created by hercule.li@sun.com
+'* Created by hercule.li@oracle.com
 '* This function will active or inactive image button in toolbar
 '* sToolbar : Toolbar name                  
 '* sObject  : image button name                   
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index dea5fe027a63..892dbd09bb36 100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Toolbar tools - Writer
 '*
diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
index 0c1d17e62c91..e9c254ac07b4 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Helpers for accessing treelists
 '*
@@ -255,6 +255,15 @@ end function
 
 '*******************************************************************************
 
+function hGetAllNodeNames( oControl as object , lsList() as string ) as integer
+
+    hExpandAllNodes( oControl )
+    hGetAllNodeNames() = hGetVisibleNodeNames( oControl, lsList() )
+
+end function
+
+'*******************************************************************************
+
 function hGetVisibleNodeNames( oControl as object , lsList() as string ) as integer
     
     '///<h3>Retrieve the names of all nodes in a treelist</h3>
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
index b76765e05069..7b9dd66e1a40 100755..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@sun.com
+'*  owner : joerg.skottke@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 7ad00b9e539e..d4771be2e3c9 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc
index e84dad7ddf47..5afd05cbb22f 100644
--- a/testautomation/global/tools/includes/optional/t_xml1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : helge.delfs@sun.com
+'* Owner : helge.delfs@oracle.com
 '*
 '* short description : simple XML-Parser for XML-Files from Registration-Database and Routines to work with SAX-Parser in Testtool
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc
index 93bd725dbc38..46dc9b350393 100644
--- a/testautomation/global/tools/includes/optional/t_xml2.inc
+++ b/testautomation/global/tools/includes/optional/t_xml2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : XML search routines II
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
index e82b7f17553f..7ccab1c0db88 100644
--- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Tools / XML Filter Settings Resource Test
 '*
diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc
index 04c4bd8956f9..ee673e6b1c47 100755..100644
--- a/testautomation/global/tools/includes/required/t_dir.inc
+++ b/testautomation/global/tools/includes/required/t_dir.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : functions for directories and files; execution happens in the office
 '*
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index 61c6afadab03..ff07554bca35 100644..100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global Routines for Document Handling
 '*
diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc
index 4941d0fcf7ad..4192563b0eba 100755..100644
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global Routines for Document Handling; Part two
 '*
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index d9da7ce5191a..4b0ddd09318b 100755..100644
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Global routines for loading, saving, printing, export
 '*
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index f6a2beca6eb0..243483be9e7d 100755..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@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Retrieve and set filternames and suffixes
 '*
@@ -34,6 +34,21 @@
 private const LENGTH_OF_FILTERFILE = 100
 private const FILE_DATA_SIZE = 300
 
+function hCheckForBinfilters() as boolean
+
+    try
+        hGetSuffix( "569" )
+        hCheckForBinfilters() = true
+    catch
+        warnlog( "Optional legacy filters package is not installed" )
+        printlog( "Please restart the setup to install the missing filters" )
+        hCheckForBinfilters() = false
+    endcatch
+
+end function
+
+'*******************************************************************************
+
 function hGetSuffix( optional cBuildId as string ) as string
 
     ' This function retrieves the suffix depending on the build id (e.g. 680)
diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc
index f32db2f29277..9fa2172fbccf 100755..100644
--- a/testautomation/global/tools/includes/required/t_lists.inc
+++ b/testautomation/global/tools/includes/required/t_lists.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : general routines to work with lists (arrays)
 '*
diff --git a/testautomation/global/tools/includes/required/t_menu.inc b/testautomation/global/tools/includes/required/t_menu.inc
index a7c64b37865d..830012cc7dae 100755..100644
--- a/testautomation/global/tools/includes/required/t_menu.inc
+++ b/testautomation/global/tools/includes/required/t_menu.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* Owner : thorsten.bosbach@sun.com
+'* Owner : thorsten.bosbach@oracle.com
 '*
 '* short description : wrappers for accessing menues (context-, bar-, button- menues)
 '*
diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc
index b94d4a028833..4f4467263072 100644
--- a/testautomation/global/tools/includes/required/t_option.inc
+++ b/testautomation/global/tools/includes/required/t_option.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : General option test (sub-routines for options tests)
 '*
diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc
index 2b10f50ce00a..7e97c58d2848 100755..100644
--- a/testautomation/global/tools/includes/required/t_option2.inc
+++ b/testautomation/global/tools/includes/required/t_option2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Tools library for options testcases
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 7242d1c3653d..051afec0ad24 100755..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@sun.com
+'* owner : joerg.skottke@oracle.com
 '*
 '* short description : Tools (1)
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc
index 449977d9329d..76422a5e8108 100755..100644
--- a/testautomation/global/tools/includes/required/t_tools2.inc
+++ b/testautomation/global/tools/includes/required/t_tools2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Global Tools II
 '*
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc
index 987a6ded6bb6..4b29928a1b93 100755..100644
--- a/testautomation/global/tools/includes/required/t_tools3.inc
+++ b/testautomation/global/tools/includes/required/t_tools3.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* short description : Global Tools III
 '*
@@ -34,7 +34,7 @@
 sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as boolean )
     Dim sDefault as integer, sKontext as string, sPosition as integer
     Dim SteppedThrough as boolean
-    '/// Created by helge.delfs@sun.com
+    '/// Created by helge.delfs@oracle.com
     '/// This function opens/closes a toolbar through View/Toolbar menu
     '/// Required parameters:
     '/// sType as string 		-> Name of the toolbar to be opened / closed
@@ -840,7 +840,7 @@ sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as
 end sub
 
 sub hCloseAllToolbars
-    '/// Created by thorsten.bosbach@sun.com
+    '/// Created by thorsten.bosbach@oracle.com
     '/// This function closes all known toolbars which are not docked
     '/// only if Build ID is below 8892
     if (gBuild < 8892) AND (gBuild > 8888) then
diff --git a/testautomation/global/tools/resetoffice.bas b/testautomation/global/tools/resetoffice.bas
index e6566c15de0c..ca7590ad753f 100755
--- a/testautomation/global/tools/resetoffice.bas
+++ b/testautomation/global/tools/resetoffice.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Exit the [Star|Open][Office|Suite][.org] and delete user directory
 '*
diff --git a/testautomation/global/tools/wintree.bas b/testautomation/global/tools/wintree.bas
index 944091e37f48..0d4c376316a0 100755
--- a/testautomation/global/tools/wintree.bas
+++ b/testautomation/global/tools/wintree.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : thorsten.bosbach@sun.com
+'* owner : thorsten.bosbach@oracle.com
 '*
 '* short description : Show the complete window hierarchy
 '*
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 524a79fe00d2..275cb8a4fa8f 100644
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -26,7 +26,7 @@
 '*
 '/************************************************************************
 '*
-'* owner : helge.delfs@sun.com
+'* owner : helge.delfs@oracle.com
 '*
 '* Description : Declaration of bars and buttons
 '*               Note: To be in kmost cases compatible with old regresson
diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win
index 2d6891d4d4e7..f258efe6a70a 100644
--- a/testautomation/global/win/dial_a_c.win
+++ b/testautomation/global/win/dial_a_c.win
@@ -261,16 +261,6 @@ AnimationenZulassen sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED
 DiawechselAufHintergrund sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE
 PraesentationImmerImVordergrund sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP
 
-*BMPOptionen sym:svtools:ModalDialog:DLG_EXPORT_PIX
-Farbaufloesung sym:svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS
-RLEKodierung sym:svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE
-Original sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX
-Aufloesung sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX
-DPI sym:svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX
-Groesse sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX
-Breite sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX
-Hoehe sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX
-
 *Browser .uno:Beamer
 
 *ChineseTranslation sym:svx:ModalDialog:DLG_CHINESETRANSLATION
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 2129f79d1b59..96c2d7a101f1 100644
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -172,19 +172,6 @@ WiederholungsspalteButton sym:sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL
 
 *Druckbestaetigung sym:SFX2_HID_PRINTMONITOR
 
-*Druckoptionen sym:SW_HID_DLG_PRV_PRT_OPTIONS
-Zeilen sym:sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS
-Spalten sym:sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS
-Links sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN
-Rechts sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN
-Oben sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN
-Unten sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN
-Horizontal sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN
-Vertikal sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN
-Querformat sym:sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE
-Hochformat sym:sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT
-Standard sym:sw:PushButton:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD
-
 *DruckerZusaetzeDraw sym:SD_HID_SD_PRINT_OPTIONS
 Zeichnung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW
 Notizen sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES
@@ -270,22 +257,6 @@ Titel sym:sw:Edit:DLG_FLD_INPUT:ED_LABEL
 EingabeText sym:sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT
 Weiter sym:sw:PushButton:DLG_FLD_INPUT:PB_NEXT
 
-*EMFOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC
-Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC
-Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
-Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
-
-*EPSOptionen sym:filter:ModalDialog:DLG_EXPORT_EPS
-VorschauTif sym:filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF
-InterchangeEPSI sym:filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI
-Level1 sym:filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1
-Level2 sym:filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2
-Farbe sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COLOR
-Graustufen sym:filter:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE
-LZWKodierung sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW
-Keine sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE
-
 *EtikettenSynchronisieren sym:SW_HID_SYNC_BTN
 Synchronisieren sym:sw:PushButton:DLG_SYNC_BTN:BTN_SYNC
 
@@ -403,14 +374,6 @@ Loeschen sym:SW_HID_FLDVAR_DELETE
 *Filterauswahl sym:UUI_HID_DLG_FILTER_SELECT
 Filter sym:uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS
 
-*FilterDlg sym:svtools:ModalDialog:DLG_EXPORT_PIX
-Original sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX
-Aufloesung sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX
-Groesse sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX
-AufloesungDPI sym:svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX
-Breite sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX
-Hoehe sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX
-
 *Fontwork .uno:FontWork
 KreisAuswahl sym:SVX_HID_FONTWORK_CTL_FORMS
 Aus sym:SVX_HID_FONTWORK_TBI_STYLE_OFF
@@ -479,10 +442,6 @@ Aktualisieren sym:SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE
 Vorlagenliste sym:SFX2_HID_TEMPLATE_FMT
 Gruppenliste sym:SFX2_HID_TEMPLATE_FILTER
 
-*GifOptionen sym:filter:ModalDialog:DLG_EXPORT_GIF
-Interlace sym:filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED
-TransparentSpeichern sym:filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT
-
 *GridControlDialogStarter ACTIVE
 ShowGridcontrol sym:showGridcontrol
 
diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win
index 93478238ed4e..a009dc2452a9 100644
--- a/testautomation/global/win/dial_i_o.win
+++ b/testautomation/global/win/dial_i_o.win
@@ -105,11 +105,6 @@ Vorschau sym:sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW
 
 +Interaktion TabInteraktion
 
-*JPEGOptionen sym:svtools:ModalDialog:DLG_EXPORT_JPG
-Qualitaet sym:svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY
-Graustufen sym:svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY
-Echtfarben sym:svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB
-
 *Kommentar sym:CUI_HID_REDLINING_DLG
 KommentarText sym:CUI_HID_REDLINING_EDIT
 Zurueck sym:CUI_HID_REDLINING_PREV
@@ -259,12 +254,6 @@ Vorgaben1 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE
 Vorgaben2 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL
 Vorgaben3 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL
 
-*MetOptionen sym:filter:ModalDialog:DLG_EXPORT_EMET
-Original sym:filter:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL
-Groesse sym:filter:RadioButton:DLG_EXPORT_EMET:RB_SIZE
-Breite sym:filter:MetricField:DLG_EXPORT_EMET:MTF_SIZEX
-Hoehe sym:filter:MetricField:DLG_EXPORT_EMET:MTF_SIZEY
-
 *ModuleBearbeiten sym:CUI_HID_EDIT_MODULES
 Sprache sym:cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE
 Module sym:CUI_HID_CLB_EDIT_MODULES_MODULES
diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win
index 4588cb599a2c..17f1cd06b2c0 100644
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -19,25 +19,11 @@ SchutzAufheben sym:SC_HID_CHG_PROTECT
 PasswortEingabe sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER
 PasswortBestaetigen sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM
 
-*PBMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPBM
-Binaer sym:filter:RadioButton:DLG_EXPORT_EPBM:RB_RAW
-Ascii sym:filter:RadioButton:DLG_EXPORT_EPBM:RB_ASCII
-
 *PfadeAuswaehlen sym:CUI_HID_MULTIPATH
 Pfade sym:CUI_HID_OPTIONS_MULTIPATH_LIST
 Hinzufuegen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH
 Loeschen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH
 
-*PGMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPGM
-Binaer sym:filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW
-Ascii sym:filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII
-
-*PICTOPtionen sym:filter:ModalDialog:DLG_EXPORT_EPCT
-Original sym:filter:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL
-Groesse sym:filter:RadioButton:DLG_EXPORT_EPCT:RB_SIZE
-Breite sym:filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX
-Hoehe sym:filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY
-
 *Pipette .uno:BmpMask sym:svx:DockingWindow:RID_SVXDLG_BMPMASK
 PipetteKnopf sym:SVX_HID_BMPMASK_TBI_PIPETTE
 Farbfeld sym:SVX_HID_BMPMASK_CTL_PIPETTE
@@ -79,14 +65,6 @@ DateiUrl sym:cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL
 Durchsuchen sym:cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL
 Optionen sym:cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS
 
-*PNGOptionen sym:svtools:ModalDialog:DLG_EXPORT_EPNG
-Kompression sym:svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION
-Interlaced sym:svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED
-
-*PPMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPPM
-Binaer sym:filter:RadioButton:DLG_EXPORT_EPPM:RB_RAW
-Ascii sym:filter:RadioButton:DLG_EXPORT_EPPM:RB_ASCII
-
 *QuelleAuswaehlen sym:SC_HID_DATAPILOT_TYPE
 AktuelleSelektion sym:sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION
 AngemeldeteDatenquelle sym:sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE
@@ -374,12 +352,6 @@ Persistent sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS
 
 +Stylist Gestalter
 
-*SVMOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC
-Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC
-Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
-Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
-
 *SymboleMath sym:starmath:ModalDialog:RID_SYMBOLDIALOG
 Symbolset sym:starmath:ListBox:RID_SYMBOLDIALOG:1
 Bearbeiten sym:starmath:PushButton:RID_SYMBOLDIALOG:1
diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win
index 31a842f3c48e..3c2516068f37 100644
--- a/testautomation/global/win/dial_t_z.win
+++ b/testautomation/global/win/dial_t_z.win
@@ -261,12 +261,6 @@ Neu sym:sw:PushButton:DLG_BIB_BASE:PB_NEW
 Loeschen sym:sw:PushButton:DLG_BIB_BASE:PB_DELETE
 Umbenennen sym:sw:PushButton:DLG_BIB_BASE:PB_RENAME
 
-*WMFOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC
-Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC
-Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC
-Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC
-Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC
-
 *Zahlenformat sym:CUI_HID_NUMBERFORMAT
 Kategorie sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
 KategorieFormat sym:CUI_HID_NUMBERFORMAT_LB_FORMAT
diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win
index d44b2464b2cc..638c1058ec1d 100644
--- a/testautomation/global/win/edia_a_c.win
+++ b/testautomation/global/win/edia_a_c.win
@@ -337,6 +337,15 @@ Remove sym:basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL
 ActiveBox sym:basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE
 Pass sym:basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS
 
+*BMPOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Colordepth sym:svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH
+Compression sym:svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING
+
 *CellWarning sym:SC_HID_SC_REPLCELLSWARN
 
 *ChangeIcon sym:CUI_HID_SVX_CONFIG_ICON_SELECTOR
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index db303c007652..78333f02ebff 100644
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -104,6 +104,24 @@ PreviousCommands sym:dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY
 Status sym:dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS
 CloseBtn sym:dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE
 
+*EMFOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
+*EPSOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Preview sym:svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF
+Epsi sym:svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI
+Color sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1
+Greyscale sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2
+Level1 sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1
+Level2 sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2
+LZWEncoding sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW
+NoneCompression sym:svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE
+
 *ExportBasicLibraryDlg sym:basctl:ModalDialog:RID_DLG_EXPORT
 ExportAsPackage sym:basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE
 ExportAsLibrary sym:basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC
@@ -441,6 +459,15 @@ Title sym:CUI_HID_GALLERY_TITLE_EDIT
 
 *HelpAgent sym:SVT_HID_HELPAGENT_WINDOW
 
+*GIFOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Interlaced sym:svtools:CheckBox:DLG_EXPORT:CB_INTERLACED
+Transparency sym:svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY
+
 *HangulHanjaConversion sym:CUI_HID_DIALOG_HANGULHANJA
 Original sym:CUI_HID_SPELLDLG_SETWORD
 Word sym:CUI_HID_HANGULDLG_EDIT_NEWWORD
diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win
index 9a1016deb8c6..ca8fb3659c1d 100644
--- a/testautomation/global/win/edia_i_o.win
+++ b/testautomation/global/win/edia_i_o.win
@@ -152,8 +152,18 @@ FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS
 LeftFieldCell sym:DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL
 RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL
 
+
 *LabelFieldSelection sym:extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL
 
+*JPGOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Colordepth sym:svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH
+Quality sym:svtools:NumericField:DLG_EXPORT:NF_COMPRESSION
+
 *LicenseAgreementDialog sym:FWK_HID_LICENSEDIALOG
 LicenseText sym:framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE
 ScrollBtn sym:framework:PushButton:DLG_LICENSE:PB_PAGEDOWN
@@ -226,6 +236,7 @@ PhoneBusiness sym:SW_HID_MM_HEADER_11
 Email sym:SW_HID_MM_HEADER_12
 Gender sym:SW_HID_MM_HEADER_13
 
+
 *Mplayer sym:AVMEDIA_HID_AVMEDIA_PLAYERWINDOW
 Mopen sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN
 mInsert sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT
@@ -239,6 +250,11 @@ mVolume sym:AVMEDIA_HID_AVMEDIA_VOLUMESLIDER
 mZoomlistbox sym:AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX
 mTimeedit sym:AVMEDIA_HID_AVMEDIA_TIMEEDIT
 
+*METOptions   sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *MenuOrganiser sym:CUI_HID_SVX_CONFIG_MENU_ORGANIZER
 MenuName sym:cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME
 ButtonUp sym:cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 11e9cef7ec00..da1f30a7f696 100644..100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -25,6 +25,7 @@ OldPassword sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD
 NewPassword sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD
 Confirm sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD
 
+
 *PDFOptions sym:HID_FILTER_PDF_OPTIONS
 RangeAll sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL
 RangePages sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE
@@ -41,6 +42,20 @@ TransitionEffects sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS
 FormsFormat sym:filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT
 ExportBlankPages sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES
 
+*PBMOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary sym:svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText sym:svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
+*PCTOptions  sym:svtools:ModalDialog:DLG_EXPORT
+ Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+ Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+ Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *PDFOptionsInitialView sym:HID_FILTER_PDF_INITIAL_VIEW
 PageOnly sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY
 BookmarksAndPage sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE
@@ -63,9 +78,37 @@ HideMenubar sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR
 HideToolbar sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR
 HideWindowControls sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL
 
+
 *Posterize .uno:GraphicFilterPoster
 PosterColors sym:cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER
 
+*PGMOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary sym:svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText sym:svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
+*PNGOptions  sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+Compression sym:svtools:NumericField:DLG_EXPORT:NF_COMPRESSION
+Interlaced sym:svtools:CheckBox:DLG_EXPORT:CB_INTERLACED
+
+*PPMOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+Resolution sym:svtools:NumericField:DLG_EXPORT:NF_RESOLUTION
+Resolutionmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_RESOLUTION
+QualityBinary sym:svtools:RadioButton:DLG_EXPORT:RB_BINARY
+QualityText sym:svtools:RadioButton:DLG_EXPORT:RB_TEXT
+
 *PortfolioCurrency sym:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY
 Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS
 OKButton sym:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY
@@ -625,3 +668,7 @@ Remove sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE
 RemoveAll sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL
 changePassword sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE
 
+*SVMOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index caea134d589c..c88417aabcc2 100644
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -236,12 +236,18 @@ NextBtn sym:DESKTOP_HID_FIRSTSTART_NEXT
 OKBtn sym:DESKTOP_HID_FIRSTSTART_FINISH
 CancelBtn sym:DESKTOP_HID_FIRSTSTART_CANCEL
 
+
 *XFormAddInstance sym:SVX_HID_XFORMS_ADDINSTANCE_DLG
 InstanceName sym:svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME
 InstanceURL .uno:OpenUrl
 BrowseBtn sym:svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER
 LinkInstance sym:svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST
 
+*WMFOptions sym:svtools:ModalDialog:DLG_EXPORT
+Exportwidth sym:svtools:MetricField:DLG_EXPORT:MF_SIZEX
+Exportmeasurement sym:svtools:ListBox:DLG_EXPORT:LB_SIZEX
+Exportheight sym:svtools:MetricField:DLG_EXPORT:MF_SIZEY
+
 *XFormAddItemDLG sym:SVX_HID_XFORMS_ADDDATAITEM_DLG
 ElementName sym:svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME
 DefaultValue sym:svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT
diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win
index 6276bd8da372..e06b0a6b77ff 100644
--- a/testautomation/global/win/sys_dial.win
+++ b/testautomation/global/win/sys_dial.win
@@ -127,7 +127,7 @@ OrdnerName sym:fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_N
 *TranslationWindow sym:svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION
 
 ' **** specal longnames for bas test
-' **** author marc.schwanz@sun.com
+' **** author marc.neumann@oracle.com
 *MSC_Special_Dialog MSC_Super_ID
 *MSC_Special_Dialog2 MSC_Super_ID2
 *MSC_Special_Dialog3 MSC_Super_ID3
diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas
index 406571f06a96..b5968240e024 100755
--- a/testautomation/graphics/optional/d_export_graphic_a.bas
+++ b/testautomation/graphics/optional/d_export_graphic_a.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export Test - A-tests. (More durable ones)
 '*
diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas
index a239feedf95c..97560705afc4 100755
--- a/testautomation/graphics/optional/d_export_graphic_b.bas
+++ b/testautomation/graphics/optional/d_export_graphic_b.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export Test - B-tests. (the usual suspects)
 '*
diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas
index 2460058af521..9dee4114b37f 100755
--- a/testautomation/graphics/optional/export_graphic_a.bas
+++ b/testautomation/graphics/optional/export_graphic_a.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export Test - A-tests. (More durable ones)
 '*
diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas
index 65dd8ae13621..9502b5005625 100755
--- a/testautomation/graphics/optional/export_graphic_b.bas
+++ b/testautomation/graphics/optional/export_graphic_b.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export Test - B-tests. (the usual suspects)
 '*
diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas
index fc03755763b5..1113dcb4324f 100644..100755
--- a/testautomation/graphics/optional/g_accessability.bas
+++ b/testautomation/graphics/optional/g_accessability.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Accessability
 '*
diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas
index 069066050810..3ad024ced1f6 100755
--- a/testautomation/graphics/optional/g_area.bas
+++ b/testautomation/graphics/optional/g_area.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Format Area
 '*
diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas
index cfe68eb49a67..3d9f2e2ab4ab 100755
--- a/testautomation/graphics/optional/g_arrangealign.bas
+++ b/testautomation/graphics/optional/g_arrangealign.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Arrange and Align
 '*
diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas
index f00e0eb136f3..b4fb2af0b472 100755
--- a/testautomation/graphics/optional/g_autocorrection.bas
+++ b/testautomation/graphics/optional/g_autocorrection.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphic Function: Tools - Autocorrect
 '*
diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas
index fcd4dff6907e..e13eccb813c3 100755
--- a/testautomation/graphics/optional/g_character.bas
+++ b/testautomation/graphics/optional/g_character.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Format - Character
 '*
diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas
index 3f542e9964ea..47b48949a162 100755
--- a/testautomation/graphics/optional/g_clipboard.bas
+++ b/testautomation/graphics/optional/g_clipboard.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Clipboard
 '*
diff --git a/testautomation/graphics/optional/g_clipexport.bas b/testautomation/graphics/optional/g_clipexport.bas
index b1d25469e758..d75eef694394 100755
--- a/testautomation/graphics/optional/g_clipexport.bas
+++ b/testautomation/graphics/optional/g_clipexport.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Clipboard export Test
 '*
diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas
index 4a1e76cfe04d..8283981462ee 100644..100755
--- a/testautomation/graphics/optional/g_convertto.bas
+++ b/testautomation/graphics/optional/g_convertto.bas
@@ -1,73 +1,73 @@
-'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 : wolfram.garten@sun.com

-'*

-'* short description : Graphics Function: Convert to ...

-'*

-'\******************************************************************

-

-global Ueber_Text_1 as string

-global Ueber_Text_2 as string

-global Ueber_Text_3 as string

-

-sub main

-    PrintLog "------------------------- g_convertto test -------------------------"

-    Call hStatusIn ( "Graphics","g_convertto.bas")

-

-    use "graphics\tools\id_tools.inc"

-    use "graphics\tools\id_tools_2.inc"

-    use "graphics\optional\includes\global\g_convertto.inc"

-

-    PrintLog "-------------------------" + gApplication + "-------------------"

-    Call tiModifyConvertToPolygon

-   ' Call tdContextConvertIntoBitmap

-    Call tiAendernUmwandelnInKurve

-    Call tiAendernUmwandelnInPolygonGrafik

-    'Call tiAendernUmwandelnIn3D

-    'Call tiAendernUmwandelnIn3DRotationsKoerper

-    'Call tiAendernUmwandelnInMetaFile

-

-    gApplication = "DRAW"

-    PrintLog "-------------------------" + gApplication + "-------------------"

-    'Call tiModifyConvertToPolygon

-    'Call tdContextConvertIntoBitmap

-    'Call tiAendernUmwandelnInKurve

-    'Call tiAendernUmwandelnInPolygonGrafik

-    'Call tiAendernUmwandelnIn3D

-    'Call tiAendernUmwandelnIn3DRotationsKoerper

-    'Call tiAendernUmwandelnInMetaFile

-

-    Call hStatusOut

-end sub

-

-sub LoadIncludeFiles

-    use "global\system\includes\master.inc"

-    use "global\system\includes\gvariabl.inc"

-    gApplication = "IMPRESS"

-    Call GetUseFiles

-end sub

+'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 : wolfram.garten@oracle.com
+'*
+'* short description : Graphics Function: Convert to ...
+'*
+'\******************************************************************
+
+global Ueber_Text_1 as string
+global Ueber_Text_2 as string
+global Ueber_Text_3 as string
+
+sub main
+    PrintLog "------------------------- g_convertto test -------------------------"
+    Call hStatusIn ( "Graphics","g_convertto.bas")
+
+    use "graphics\tools\id_tools.inc"
+    use "graphics\tools\id_tools_2.inc"
+    use "graphics\optional\includes\global\g_convertto.inc"
+
+    PrintLog "-------------------------" + gApplication + "-------------------"
+    Call tiModifyConvertToPolygon
+    Call tdContextConvertIntoBitmap
+    Call tiAendernUmwandelnInKurve
+    Call tiAendernUmwandelnInPolygonGrafik
+    Call tiAendernUmwandelnIn3D
+    Call tiAendernUmwandelnIn3DRotationsKoerper
+    Call tiAendernUmwandelnInMetaFile
+
+    gApplication = "DRAW"
+    PrintLog "-------------------------" + gApplication + "-------------------"
+    Call tiModifyConvertToPolygon
+    Call tdContextConvertIntoBitmap
+    Call tiAendernUmwandelnInKurve
+    Call tiAendernUmwandelnInPolygonGrafik
+    Call tiAendernUmwandelnIn3D
+    Call tiAendernUmwandelnIn3DRotationsKoerper
+    Call tiAendernUmwandelnInMetaFile
+
+    Call hStatusOut
+end sub
+
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    gApplication = "IMPRESS"
+    Call GetUseFiles
+end sub
diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas
index 1520f995e8ab..0c8102e70bde 100644..100755
--- a/testautomation/graphics/optional/g_crossfading.bas
+++ b/testautomation/graphics/optional/g_crossfading.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphic Optional Test for Edit/Crossfading
 '*
diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas
index f759be72f680..960fb7a2e19b 100644..100755
--- a/testautomation/graphics/optional/g_customshapes.bas
+++ b/testautomation/graphics/optional/g_customshapes.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Customshapes
 '*
diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas
index 62e0e487ca89..c3a8fe861724 100755
--- a/testautomation/graphics/optional/g_demoguide.bas
+++ b/testautomation/graphics/optional/g_demoguide.bas
@@ -25,7 +25,7 @@
 '
 '/***********************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : testcase to check the demo guide
 '*
diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas
index 1ebbb15e3c31..3644dfd3b0d8 100755
--- a/testautomation/graphics/optional/g_dimensions.bas
+++ b/testautomation/graphics/optional/g_dimensions.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Dimensioning Line
 '*
diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas
index f99f9e34e0fc..305967f73112 100755
--- a/testautomation/graphics/optional/g_edit.bas
+++ b/testautomation/graphics/optional/g_edit.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Edit
 '*
diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas
index c561f244c214..faa2783b6d2f 100755
--- a/testautomation/graphics/optional/g_export_html.bas
+++ b/testautomation/graphics/optional/g_export_html.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Export to HTML
 '*
diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas
index 55cd9ee405d1..9de7acfa2bc5 100755
--- a/testautomation/graphics/optional/g_findreplace.bas
+++ b/testautomation/graphics/optional/g_findreplace.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Optional Find and Replace Test
 '*
diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas
index 1ee537573a5f..1c03f7bf8801 100755
--- a/testautomation/graphics/optional/g_format.bas
+++ b/testautomation/graphics/optional/g_format.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Format
 '*
diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas
index f8d16e653c9c..93f542bcc027 100644..100755
--- a/testautomation/graphics/optional/g_group.bas
+++ b/testautomation/graphics/optional/g_group.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Group
 '*
diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas
index 20a785548c7c..b2dd4a62c182 100755
--- a/testautomation/graphics/optional/g_imagemap.bas
+++ b/testautomation/graphics/optional/g_imagemap.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: ImageMap
 '*
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index bae6d277c98f..a006e2f04c3e 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Insert
 '*
diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas
index 867621aa88b0..c1327e21bc96 100644..100755
--- a/testautomation/graphics/optional/g_line.bas
+++ b/testautomation/graphics/optional/g_line.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Format - Line
 '*
diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas
index 5ee50f636ea7..b68da93657fc 100755
--- a/testautomation/graphics/optional/g_load_save.bas
+++ b/testautomation/graphics/optional/g_load_save.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Load and Save
 '*
diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas
index 3e25c88b3e1f..e237ce752a2d 100755
--- a/testautomation/graphics/optional/g_mediaplayer.bas
+++ b/testautomation/graphics/optional/g_mediaplayer.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Mediaplayer-functionallity
 '*
diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas
index 41b1babec1ed..cc165c76b37e 100755
--- a/testautomation/graphics/optional/g_navigator.bas
+++ b/testautomation/graphics/optional/g_navigator.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Navigator
 '*
diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas
index 6409388ef2f6..98f99e4ab931 100644..100755
--- a/testautomation/graphics/optional/g_ole.bas
+++ b/testautomation/graphics/optional/g_ole.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Ole-behaviour
 '*
diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas
index da1043ba6e63..021a95cfbfad 100755
--- a/testautomation/graphics/optional/g_paneview.bas
+++ b/testautomation/graphics/optional/g_paneview.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Paneview-behaviour
 '*
diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas
index e45fa68c7ce4..502728773a6e 100755
--- a/testautomation/graphics/optional/g_paragraph.bas
+++ b/testautomation/graphics/optional/g_paragraph.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Format - Paragraph
 '*
diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas
index e3c5f3fc5b8d..332632dcdac6 100644..100755
--- a/testautomation/graphics/optional/g_savepictureas.bas
+++ b/testautomation/graphics/optional/g_savepictureas.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Contextmenu-SaveAs Picture -Test
 '*
diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas
index cdfc24c2ea90..c6e963ae1658 100755
--- a/testautomation/graphics/optional/g_shaddow.bas
+++ b/testautomation/graphics/optional/g_shaddow.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' *
-' * Owner : wolfram.garten@sun.com
+' * Owner : wolfram.garten@oracle.com
 ' *
 ' * short description : Shaddow Optional Test
 ' *
diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas
index ba444adbd71c..3ffd9a4ab37a 100755
--- a/testautomation/graphics/optional/g_slidelayer.bas
+++ b/testautomation/graphics/optional/g_slidelayer.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Slide and Layer
 '*
diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas
index bc975337b1d9..f8a8eb6c0668 100755
--- a/testautomation/graphics/optional/g_spellcheck.bas
+++ b/testautomation/graphics/optional/g_spellcheck.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Tools - Spellcheck
 '*
@@ -42,19 +42,16 @@ sub main
     use "graphics\optional\includes\global\g_spellcheck.inc"
 
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
-
-    PrintLog "-------------------------" + gApplication + "-------------------"
-    Call tiToolsSpellcheckCorrect
-    Call tiToolsSpellcheckError
-    Call tiToolsSpellcheckCheck
-    Call tToolsSpellcheckAutoSpellcheck
+    PrintLog "-------------------------" + gApplication + "-------------------"    
+    call tiToolsSpellcheckCheck_AlwaysIgnore
+    call tiToolsSpellcheckCheck_Change
+    call tiToolsSpellcheckCheck_ChangeAll
 
     gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
-    Call tiToolsSpellcheckCorrect
-    Call tiToolsSpellcheckError
-    Call tiToolsSpellcheckCheck
-    Call tToolsSpellcheckAutoSpellcheck
+    call tiToolsSpellcheckCheck_AlwaysIgnore
+    call tiToolsSpellcheckCheck_Change
+    call tiToolsSpellcheckCheck_ChangeAll
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas
index 0e3b66922af2..50da6610c41a 100755
--- a/testautomation/graphics/optional/g_stylist.bas
+++ b/testautomation/graphics/optional/g_stylist.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Stylist
 '*
diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas
index 4d4979631839..dee2e14c67a5 100755
--- a/testautomation/graphics/optional/g_tables.bas
+++ b/testautomation/graphics/optional/g_tables.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : Testing of impress tables
 '*
diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas
index 12ff49f97cc9..b643e02c9e9b 100755
--- a/testautomation/graphics/optional/g_toolbars.bas
+++ b/testautomation/graphics/optional/g_toolbars.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Toolbars
 '*
diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas
index 272840602ac4..4e79a89ca469 100644..100755
--- a/testautomation/graphics/optional/g_tools.bas
+++ b/testautomation/graphics/optional/g_tools.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Tools
 '*
diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas
index 204338131c63..1b494950ce44 100755
--- a/testautomation/graphics/optional/g_zoom.bas
+++ b/testautomation/graphics/optional/g_zoom.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Zoom
 '*
diff --git a/testautomation/graphics/optional/gallery.bas b/testautomation/graphics/optional/gallery.bas
index c26526ee7791..9b81954f8902 100755
--- a/testautomation/graphics/optional/gallery.bas
+++ b/testautomation/graphics/optional/gallery.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : (quick test) Checking functionality and all Gallery themes
 '*
diff --git a/testautomation/graphics/optional/gallery2.bas b/testautomation/graphics/optional/gallery2.bas
index ca0ef0ad3bcb..d467b0a74876 100755
--- a/testautomation/graphics/optional/gallery2.bas
+++ b/testautomation/graphics/optional/gallery2.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : (long duration! > 6h) Testing all Gallery items
 '*
diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas
index 6b2c4851a28a..85503fc790c1 100644..100755
--- a/testautomation/graphics/optional/i_animation.bas
+++ b/testautomation/graphics/optional/i_animation.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Function: Animation
 '*
diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas
index 2ed85c89553c..e050b914ca9e 100755
--- a/testautomation/graphics/optional/i_headerfooter.bas
+++ b/testautomation/graphics/optional/i_headerfooter.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Header and Footer
 '*
diff --git a/testautomation/graphics/optional/i_only_updt_1.bas b/testautomation/graphics/optional/i_only_updt_1.bas
index cd14cca268dc..98d226424f00 100755
--- a/testautomation/graphics/optional/i_only_updt_1.bas
+++ b/testautomation/graphics/optional/i_only_updt_1.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Only Required Test (Part 1)
 '*
@@ -58,7 +58,7 @@ sub main
     call im_004_
     call id_004
     call id_005
-    call id_006
+    call id_Tools
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/i_only_updt_2.bas b/testautomation/graphics/optional/i_only_updt_2.bas
index 13faba0d6f2f..7b35dbab5740 100755
--- a/testautomation/graphics/optional/i_only_updt_2.bas
+++ b/testautomation/graphics/optional/i_only_updt_2.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Only Required (Test Part 2)
 '*
diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas
index 994d3486736e..5ddefe26ca94 100755
--- a/testautomation/graphics/optional/i_pengine.bas
+++ b/testautomation/graphics/optional/i_pengine.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' *
-' * Owner : wolfram.garten@sun.com
+' * Owner : wolfram.garten@oracle.com
 ' *
 ' * short description : Presentation-Engine Optional Test
 ' *
diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas
index 08fc52a44270..137007da7c8f 100644..100755
--- a/testautomation/graphics/optional/i_saveloadlayout.bas
+++ b/testautomation/graphics/optional/i_saveloadlayout.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Save & Load testing of Layout -templates.
 '*
diff --git a/testautomation/graphics/optional/i_shape.bas b/testautomation/graphics/optional/i_shape.bas
index e92e97898448..0ebb3c1e4864 100755
--- a/testautomation/graphics/optional/i_shape.bas
+++ b/testautomation/graphics/optional/i_shape.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : wolfram.garten@sun.com
+'* owner : wolfram.garten@oracle.com
 '*
 '* short description : Import presentations with shapes in .ppt format
 '*
diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas
index cc1ac3f9d7bd..c780904e542d 100644..100755
--- a/testautomation/graphics/optional/i_slidecopy.bas
+++ b/testautomation/graphics/optional/i_slidecopy.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Slidecopy-behaviour
 '*
diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas
index 30d309dc41f9..8a9062c87c05 100755
--- a/testautomation/graphics/optional/i_slideshow.bas
+++ b/testautomation/graphics/optional/i_slideshow.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Function: Slideshow
 '*
diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas
index a9f95f97d23c..fc1196fdb182 100755
--- a/testautomation/graphics/optional/i_us_presentation.bas
+++ b/testautomation/graphics/optional/i_us_presentation.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics User-scenario-test: 2 Users creates Presentations.
 '*
diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas
index eab1e9fdfc06..7dacea82d1b2 100755
--- a/testautomation/graphics/optional/i_view.bas
+++ b/testautomation/graphics/optional/i_view.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Impress Function: View
 '*
diff --git a/testautomation/graphics/optional/includes/draw/d_002_.inc b/testautomation/graphics/optional/includes/draw/d_002_.inc
index d3d0ee81a9c3..9b2f267a0729 100644
--- a/testautomation/graphics/optional/includes/draw/d_002_.inc
+++ b/testautomation/graphics/optional/includes/draw/d_002_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/draw/d_003_.inc b/testautomation/graphics/optional/includes/draw/d_003_.inc
index 3a7c7da12c38..744461061559 100644
--- a/testautomation/graphics/optional/includes/draw/d_003_.inc
+++ b/testautomation/graphics/optional/includes/draw/d_003_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/draw/d_005_.inc b/testautomation/graphics/optional/includes/draw/d_005_.inc
index 046e0bd76a30..6c3e7b2484df 100644
--- a/testautomation/graphics/optional/includes/draw/d_005_.inc
+++ b/testautomation/graphics/optional/includes/draw/d_005_.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/draw/d_007.inc b/testautomation/graphics/optional/includes/draw/d_007.inc
index 6582ff2c34c1..89fef373f161 100644
--- a/testautomation/graphics/optional/includes/draw/d_007.inc
+++ b/testautomation/graphics/optional/includes/draw/d_007.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index e1d1479f5ee1..f4c34ec36795 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export A-tests
 '*
@@ -43,34 +43,24 @@ testcase tEPS
     hFileOpen( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString )
 
     if ( hCallExport ( OutputGrafikTBO , sFilter ) ) then
-        Kontext "EPSOptionen"
-        if ( EPSOptionen.Exists( 2 ) ) then
+        Kontext "EPSOptions"
+        if ( EPSOptions.Exists( 2 ) ) then
             printlog "check if all properties have the right count, and depend on each other"
-            ' they do not affect annything, i can check (TBO)
-            ' VorschauTIF.Check
-            '  InterchangeEPSI.Check
+
             Level1.Check
-            if Farbe.IsEnabled then warnlog " :-("
-            if Graustufen.IsEnabled then warnlog " :-("
-            if LZWKodierung.IsEnabled then warnlog " :-("
-            if Keine.IsEnabled then warnlog " :-("
-            ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
+            if Color.IsEnabled then warnlog " :-("
+            if Greyscale.IsEnabled then warnlog " :-("
+            if LZWEncoding.IsEnabled then warnlog " :-("
+            if NoneCompression.IsEnabled then warnlog " :-("
+
             Level2.Check
-            if (Farbe.IsEnabled <> TRUE) then warnlog " :-("
-            if (Graustufen.IsEnabled <> TRUE) then warnlog " :-("
-            if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-("
-            if (Keine.IsEnabled <> TRUE) then warnlog " :-("
-            ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
-            printlog "'Color Resolution' listbox contains eight items"
-            ' x = TextEinstellungen.GetItemCount
-            ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x
-            ' for i = 1 to x
-            ' TextEinstellungen.Select i
-            ' sleep 1
-            ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'"
-            ' next i
+            if (Color.IsEnabled <> TRUE) then warnlog " :-("
+            if (Greyscale.IsEnabled <> TRUE) then warnlog " :-("
+            if (LZWEncoding.IsEnabled <> TRUE) then warnlog " :-("
+            if (NoneCompression.IsEnabled <> TRUE) then warnlog " :-("
+
             printlog "leave dialog with cancel -> there has to be no file created!"
-            hCloseDialog( EPSOptionen, "cancel" )
+            hCloseDialog( EPSOptions, "cancel" )
 
             if ( FileExists( OutputGrafikTBO+sExt ) ) then ' inspired by bug #99932 Graphic is exported though cancel is pressed
                 warnlog "Dialog was canceled, but file got saved, too :-(  - i35177"
@@ -89,10 +79,9 @@ testcase tEPS
     printlog( "Save the file" )
     if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
 
-        Kontext "EPSOptionen"
-        if ( EPSOptionen.Exists( 2 ) ) then
-            printlog "TextEinstellungen.select 2"
-            hCloseDialog( EPSOptionen, "ok" )
+        Kontext "EPSOptions"
+        if ( EPSOptions.Exists( 2 ) ) then
+            hCloseDialog( EPSOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -127,24 +116,13 @@ testcase tPCT
     printlog "open the document"
     sDocument = convertpath( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString )
     hFileOpen( sDocument )
-
+    printlog "----------1st: Trying export and canceling it."
     if ( hCallExport( OutputGrafikTBO , sFilter ) ) then
-
-        Kontext "PICTOptionen"
+        Kontext "PCTOptions"
         printlog( "Export options dialog" )
-        if ( PICTOptionen.Exists( 2 ) ) then
-
-            printlog "check if all properties have the right count, and depend on each other"
-            Original.Check
-            if Breite.IsEnabled then warnlog " :-("
-            if Hoehe.IsEnabled then warnlog " :-("
-            Groesse.Check
-            Breite.More
-            Hoehe.Less
-
+        if PCTOptions.Exists(2) then
             printlog "leave dialog with cancel -> there has to be no file created!"
-            hCloseDialog( PICTOptionen, "cancel" )
-
+            hCloseDialog( PCTOptions, "cancel" )
             if ( FileExists( OutputGrafikTBO + sExt ) ) then
                 warnlog( "#i35177# - dialog <PictOptions> canceled, still the file was saved" )
             endif
@@ -157,33 +135,25 @@ testcase tPCT
             Warnlog " '" + sFilter + "'  has a problem"
             Active.OK
         end if
-
     end if
 
-    printlog " now save it realy and load the file afterwards"
+    printlog "----------2nd: now save it really and load the file afterwards"
     if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
 
-        Kontext "PICTOptionen"
+        Kontext "PCTOptions"
         printlog( "Export options dialog" )
-        if ( PICTOptionen.Exists( 2 ) ) then
-            Groesse.Check
-            Breite.Less
-            Hoehe.More
-            hCloseDialog( PICTOptionen, "ok" )
+        if ( PCTOptions.Exists( 2 ) ) then
+            hCloseDialog( PCTOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
-
         sOutputFile = OutputGrafikTBO+sExt
-
         if ( hWaitForOutputFile( sOutputFile ) ) then
-
-            printlog( "Close file and re-insert graphics into new document" )
+            printlog "Close file and re-insert graphics into new document"
             hInsertGraphicsToNewFile( sOutputFile ) ' local helper function, see bottom of this file
         else
             warnlog( "File was not saved: " & sOutputFile )
         endif
-
     endif
 
     hFileReOpen( sDocument )
@@ -197,16 +167,16 @@ testcase tPCT
         endif
     endif
 
+    printlog "----------3rd: exporting part of the picture and inserting into new file."
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
 
     if ( hCallExport( OutputGrafikTBO + "1", sFilter, TRUE ) ) then
 
-        Kontext "PICTOptionen"
+        Kontext "PCTOptions"
         printlog( "Export options dialog" )
-        if ( PICTOptionen.Exists( 2 ) ) then
-            Original.Check
-            hCloseDialog( PICTOptionen, "ok" )
+        if ( PCTOptions.Exists( 2 ) ) then
+            hCloseDialog( PCTOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -226,22 +196,29 @@ testcase tPCT
     endif
 
     hFileReOpen( "" )
+    printlog "----------4th: exporting rectangle and reload file."
     hRechteckErstellen ( 10, 10, 30, 40 )
 
     if ( hCallExport( OutputGrafikTBO + "2" , sFilter, TRUE ) ) then
 
-        Kontext "PICTOptionen"
+        Kontext "PCTOptions"
         printlog( "Export options dialog" )
-        if ( PICTOptionen.Exists( 2 ) ) then
-            Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check
-
-            printlog "Check 'Size' one more time to make the change go through"
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-            hCloseDialog( PICTOptionen, "ok" )
+        if ( PCTOptions.Exists( 2 ) ) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportheight.GetText)+ "cm"
+            endif
+            hCloseDialog( PCTOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -262,34 +239,6 @@ testcase tPCT
         if ( not bTemp ) then warnlog "Selected original size NOT OK :-("
     endif
 
-    if ( hCallExport( OutputGrafikTBO + "3", sFilter, TRUE ) ) then
-
-        Kontext "PICTOptionen"
-        printlog( "Export options dialog" )
-        if ( PICTOptionen.Exists( 2 ) ) then
-            Groesse.Check
-            sX2 = Breite.GetText
-            if (LiberalMeasurement(sx1, sX2)) <> TRUE then
-                if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
-                    Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'"
-                else
-                    warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'"
-                endif
-            endif
-            sY2 = Hoehe.GetText
-            if (LiberalMeasurement(sY, sY2)) <> TRUE then
-                if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
-                    Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'"
-                else
-                    warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'"
-                endif
-            endif
-            hCloseDialog( PICTOptionen, "cancel" )
-        else
-            warnlog( "No export options dialog was displayed" )
-        endif
-    endif
-
     call hCloseDocument
 
 endcase 'tPCT
@@ -305,15 +254,17 @@ testcase tPBM
     printlog "Save it"
     if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
 
-        Kontext "PBMOptionen"
-        if ( PBMOptionen.Exists( 2 ) ) then
-            Ascii.Check
-            hCloseDialog( PBMOptionen, "ok" )
+        Kontext "PBMOptions"
+        if ( PBMOptions.Exists( 2 ) ) then
+            QualityBinary.Check
+            QualityText.Check
+            hCloseDialog( PBMOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
 
         printlog( "Close file and re-insert graphics into new document" )
+        sleep (1)
         hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file
 
     endif
@@ -333,10 +284,11 @@ testcase tPGM
     printlog "Save it"
     if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
 
-        Kontext "PGMOptionen"
-        if ( PGMOptionen.Exists( 2 ) ) then
-            Ascii.Check
-            hCloseDialog( PGMOptionen, "ok" )
+        Kontext "PGMOptions"
+        if ( PGMOptions.Exists( 2 ) ) then
+            QualityBinary.Check
+            QualityText.Check
+            hCloseDialog( PGMOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -361,10 +313,11 @@ testcase tPPM
     printlog "Save it"
     if ( hCallExport (OutputGrafikTBO , sFilter ) ) then
 
-        Kontext "PPMOptionen"
-        if ( PPMOptionen.Exists( 2 ) ) then
-            Ascii.Check
-            hCloseDialog( PPMOptionen, "ok" )
+        Kontext "PPMOptions"
+        if ( PPMOptions.Exists( 2 ) ) then
+            QualityBinary.Check
+            QualityText.Check
+            hCloseDialog( PPMOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -452,16 +405,17 @@ testcase tGIF
     printlog "save it"
     if ( hCallExport( OutputGrafikTBO, sFilter ) ) then
 
-        Kontext "GIFOptionen"
-        if GIFOptionen.Exists (2) then
-            Interlace.Uncheck
-            TransparentSpeichern.UnCheck
-            hCloseDialog( GIFOptionen, "ok" )
+        Kontext "GIFOptions"
+        if GIFOptions.Exists (2) then
+            Interlaced.Uncheck
+            Transparency.UnCheck
+            hCloseDialog( GIFOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
 
         printlog( "Close file and re-insert graphics into new document" )
+        sleep (1)
         hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file
 
     endif
@@ -481,11 +435,10 @@ testcase tJPEG
     printlog " save it "
     if ( hCallExport( OutputGrafikTBO , sFilter ) ) then
 
-        Kontext "JpegOptionen"
-        if ( JpegOptionen.Exists( 2 ) ) then
-            Echtfarben.Check
-            Qualitaet.ToMin
-            hCloseDialog( JpegOptionen, "ok" )
+        Kontext "JPGOptions"
+        if ( JPGOptions.Exists( 2 ) ) then
+            Quality.ToMin
+            hCloseDialog( JPGOptions, "ok" )
         else
             warnlog( "No export options dialog was displayed" )
         endif
@@ -502,7 +455,7 @@ endcase 'tJPEG
 '*******************************************************************************
 
 function hInsertGraphicsToNewFile( sOutputFile as string )
-
+    sleep (1)
     if ( FileExists( sOutputFile ) ) then
         hFileReOpen( "" )
         Call hGrafikEinfuegen( sOutputFile )
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index 2a2cbac2020a..3beefb13dd64 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Graphics Export B-tests. (the usual suspects)
 '*
@@ -44,13 +44,13 @@ testcase tPNG
     hFileOpen( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString )
 
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "PNGOptionen"
-        if PNGOptionen.Exists (2) then
-            Kompression.ToMax
+        Kontext "PNGOptions"
+        if PNGOptions.Exists (2) then
+            Compression.ToMax
             Interlaced.UnCheck
-            PNGOptionen.OK
+            PNGOptions.OK
             iWaitIndex = 0
-            do while PNGOptionen.Exists AND iWaitIndex < 30
+            do while PNGOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -87,25 +87,19 @@ testcase tSVM
 
     sFilter = "SVM - StarView Metafile (.svm)"
     sExt = ".svm"
-
+    printlog "opening test file"
     sDocument = ConvertPath ( gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString)
     hFileOpen sDocument
 
+    printlog "Trying export and canceling it.."
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            if Breite.IsEnabled then
-                warnlog " :-("
-            endif
-            if Hoehe.IsEnabled then
-                warnlog " :-("
-            endif
-            Groesse.Check
-            Breite.More
-            Hoehe.Less
-            SVMOptionen.Cancel
+        Kontext "SVMOptions"
+        if SVMOptions.Exists (2) then
+            Exportwidth.More
+            Exportheight.Less
+            SVMOptions.Cancel
             sleep 5
+            printlog "Checking if directory is still empty.."
             if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
                 Printlog "ok :-)"
             else
@@ -122,13 +116,14 @@ testcase tSVM
             Active.OK
         end if
     end if
+
+    printlog "Doing real SVM export."
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.Less
-            Hoehe.More
-            SVMOptionen.OK
+        Kontext "SVMOptions"
+        if SVMOptions.Exists (2) then
+            Exportwidth.Less
+            Exportheight.More
+            SVMOptions.OK
             sleep 5
         endif
         if ( dir(OutputGrafikTBO+sExt) <> "") then
@@ -136,56 +131,77 @@ testcase tSVM
         else
             warnlog "File didn't get saved :-("
         endif
-        hCloseDocument ()
-        sleep 5
-        hNewDocument()
-        sleep 5
-        Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
     endif
+    printlog "Closing TestDoc."
     hCloseDocument ()
+    sleep 5
+    printlog "Opening new doc and inserting exported file."
+    hNewDocument()
+    sleep 5
+    Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
+    printlog "Closing doc with inserted file."
+    hCloseDocument ()
+
+    printlog "Loading testdoc."
     hFileOpen (sDocument)
     sleep (10)
-
+    printlog "Making doc editable."
     call fMakeDocumentWritable
-
+    printlog "Selecting part of doc."
     hTypeKeys ("<escape><tab>")
+     printlog "getting size of part. "
     fGetSizeXY sx1, sY, TRUE
+    printlog "exporting part of doc."
     if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            SVMOptionen.OK
-            sleep 5
-        endif
+        Kontext "SVMOptions"
+        SVMOptions.OK
+        sleep 5
         if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then
             Printlog "Ok :-) Saved as: '" & OutputGrafikTBO & "1" & sExt & "'"
         else
             warnlog "File didn't get saved :-("
         endif
+        printlog "Closing testdoc."
         hCloseDocument ()
         sleep 5
+        printlog "Opening new doc."
         hNewDocument()
         sleep 5
+        printlog "Inserting exported part of Testdoc."
         Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
         bTemp = FALSE
+        printlog "checking size of inserted file."
         fGetSizeXY sx1, sY, bTemp
         if (bTemp = FALSE) then
             warnlog "Selected original size NOT OK :-("
         endif
     endif
+    printlog "closing doc."
     hCloseDocument ()
+
+    printlog "opening new doc."
     hNewDocument()
+    printlog "inserting Rectangle."
     hRechteckErstellen ( 10, 10, 30, 40 )
+    printlog "Exporting Rectangle"
     if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check 'Check to make settings go throught
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-            SVMOptionen.OK
+        Kontext "SVMOptions"
+        if SVMOptions.Exists (2) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportwidth.GetText)+ "cm"
+            endif
+            SVMOptions.OK
             sleep 5
         endif
         if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then
@@ -193,8 +209,10 @@ testcase tSVM
         else
             warnlog "File didn't get saved :-("
         endif
+        printlog "Closing doc."
         hCloseDocument ()
         sleep 5
+        printlog "Opening exported rectangle."
         hFileOpen (OutputGrafikTBO & "2" & sExt)
         kontext "Filterauswahl"
         if Filterauswahl.exists then
@@ -204,6 +222,7 @@ testcase tSVM
         endif
         kontext "DocumentDraw"
         DocumentDraw.TypeKeys ("<escape><tab>")
+        printlog "Selecting and checking size.."
         ContextOriginalSize
         bTemp = FALSE
         fGetSizeXY sx1, sY, bTemp
@@ -211,31 +230,8 @@ testcase tSVM
             warnlog "Selected original size NOT OK :-("
         endif
     endif
-    if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            sX2 = Breite.GetText
-            if (LiberalMeasurement(sx1, sX2)) <> TRUE then
-                if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
-                    Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
-                else
-                    warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
-                endif
-            endif
-            sY2 = Hoehe.GetText
-            if (LiberalMeasurement(sY, sY2)) <> TRUE then
-                if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
-                    Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
-                else
-                    warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
-                endif
-            endif
-            SVMOptionen.Cancel
-            sleep 5
-        endif
-    endif
 
+    printlog "Closing doc."
     call hCloseDocument
     
 endcase 'tSVM
@@ -657,7 +653,7 @@ endcase 'tSVG
 
 '-------------------------------------------------------------------------------
 testcase tBMP
-qaerrorlog
+
    dim x as integer
    dim i as integer
    dim bTemp as boolean
@@ -668,50 +664,24 @@ qaerrorlog
    dim sY2 as string
    dim sDocument as string
 
-    '/// open the document
+    printlog "open the Test-document"
     sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
     hFileOpen sDocument
 
-   if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
-      Kontext "BMPOptionen"
-      if BMPOptionen.Exists (2) then
-      '/// check if all properties have the right count, and depend on each other ///'
-         '/// 'Color Resolution' listbox contains eight items ///'
-         x = Farbaufloesung.GetItemCount
-         if x <> 8 then warnlog "Color Resolution Count is wrong; should be:8, is:" + x
+    printlog "Trying to export and canceling.."
+    if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
+      Kontext "BMPOptions"
+      if BMPOptions.Exists (2) then
+         x = Colordepth.GetItemCount
+         if x <> 7 then warnlog "Color Resolution Count is wrong; should be:7, is:" + x
          for i = 1 to x
-            Farbaufloesung.Select i
+            Colordepth.Select i
             sleep 1
-            Printlog " - " + i + ": '" +Farbaufloesung.GetSelText + "'"
-            '/// checkbox RLE coding has to be enabled only for '4 and 8 bit' color palettes ///'
-            if ((i > 3) AND (i < 8)) then
-               if RLEKodierung.IsEnabled <> TRUE then warnlog "'RLE coding' is not checkable :-("
-            else
-               if RLEKodierung.IsEnabled <> FALSE then warnlog "'RLE coding' is checkable :-("
-            endif
+            Printlog " - " + i + ": '" +Colordepth.GetSelText + "'"
          next i
-         '/// if Mode 'original' is selected, DPI///'
-         Original.Check
-            if DPI.IsEnabled then warnlog " :-("
-            if Breite.IsEnabled then warnlog " :-("
-            if Hoehe.IsEnabled then warnlog " :-("
-         Aufloesung.Check
-            x = DPI.GetItemCount
-            '/// 'DPI' listbox contains eight items ///'
-            if x <> 4 then warnlog "'DPI' Count is wrong; should be:4, is:" + x
-            for i = 1 to x
-               DPI.Select i
-               Printlog " - " + i + ": '" +DPI.GetSelText + "'"
-            next i
-            if Breite.IsEnabled then warnlog " :-("
-            if Hoehe.IsEnabled then warnlog " :-("
-         Groesse.Check
-            if DPI.IsEnabled then warnlog " :-("
-            Breite.More
-            Hoehe.Less
          Sleep 1
-         '/// leave dialog with cancel -> there has to be no file created! ///'
-         BMPOptionen.Cancel
+         printlog "Leave dialog with cancel -> there has to be no file created!"
+         BMPOptions.Cancel
          sleep 5
          if ( dir(OutputGrafikTBO+".bmp") = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
             Printlog "ok :-)"
@@ -729,15 +699,14 @@ qaerrorlog
          Active.OK
       end if
    end if
-   Printlog "'/// now save it realy and load the file afterwards ///'"
+
+   Printlog " now save it really and load the file afterwards"
    if hCallExport (OutputGrafikTBO , "BMP - Windows Bitmap (.bmp)" ) = TRUE then
-      Kontext "BMPOptionen"
-      if BMPOptionen.Exists (2) then
-         Farbaufloesung.Select 7
-         RLEKodierung.Check
-         Aufloesung.Check
-         DPI.Select 3
-         BMPOptionen.OK
+      Kontext "BMPOptions"
+      if BMPOptions.Exists (2) then
+         Colordepth.Select 7
+         Compression.Check
+         BMPOptions.OK
          sleep 5
       endif
       if ( dir(OutputGrafikTBO+".bmp") <> "") then
@@ -745,14 +714,18 @@ qaerrorlog
       else
          warnlog "File didn't get saved :-("
       endif
+      printlog "Closing doc."
       hCloseDocument ()
       sleep 5
+      printlog "Opening new doc."
       hNewDocument()
       sleep 5
+      printlog "Inserting exported file."
       Call hGrafikEinfuegen ( OutputGrafikTBO+".bmp" )
    endif
+   printlog "Closing doc again."
    hCloseDocument ()
-   Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'"
+   Printlog "Now save a SELECTION in and load the file afterwards"
    
    hFileOpen (sDocument)
    kontext "Filterauswahl"
@@ -762,51 +735,58 @@ qaerrorlog
       goto endsub
    endif
 
-   ' check if the document is writable
+   printlog "check if the document is writable"
    call fMakeDocumentWritable
     
    hTypeKeys ("<escape><tab>")
    fGetSizeXY sx1, sy, TRUE
-   if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
-      Kontext "BMPOptionen"
-      if BMPOptionen.Exists (2) then
-         Original.Check
-         BMPOptionen.OK
-         sleep 5
-      endif
-      if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
-         Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
-      else
-         warnlog "File didn't get saved :-("
-      endif
-    hCloseDocument ()
-      sleep 5
-      hNewDocument()
-      sleep 5
-      Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
-      bTemp = FALSE
-      fGetSizeXY sx1, sY, bTemp
-      if (bTemp = FALSE) then
-         warnlog "Selected original size NOT OK :-("
+    if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
+        Kontext "BMPOptions"
+        if BMPOptions.Exists (2) then
+             BMPOptions.OK
+             sleep 5
+        endif
+        if ( dir(OutputGrafikTBO + "1"+".bmp") <> "") then
+            Printlog "Ok :-) Saved as: '" + OutputGrafikTBO + "1"+".bmp" + "'"
+        else
+            warnlog "File didn't get saved :-("
+        endif
+        hCloseDocument ()
+        sleep 5
+        hNewDocument()
+        sleep 5
+        Call hGrafikEinfuegen ( OutputGrafikTBO + "1"+".bmp" )
+        bTemp = FALSE
+        fGetSizeXY sx1, sY, bTemp
+        if (bTemp = FALSE) then
+            warnlog "Selected original size NOT OK :-("
       endif
    endif
    hCloseDocument ()
    
-   Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'"
+   Printlog "Now create a rectangle, select it, save it in SIZE and load the file afterwards"
    hNewDocument()
    hTypeKeys "<TAB>"
    gMouseClick 50, 50
    hRechteckErstellen ( 10, 10, 30, 40 )
    if hCallExport (OutputGrafikTBO + "2" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
-      Kontext "BMPOptionen"
-      if BMPOptionen.Exists (2) then
-         Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check  'Press "Size" one more time in order to make the change go through"
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-         BMPOptionen.OK
+      Kontext "BMPOptions"
+      if BMPOptions.Exists (2) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportwidth.GetText)+ "cm"
+            endif
+         BMPOptions.OK
          sleep 5
       endif
       if ( dir(OutputGrafikTBO + "2"+".bmp") <> "") then
@@ -814,6 +794,7 @@ qaerrorlog
       else
          warnlog "File didn't get saved :-("
       endif
+      printlog "Closing doc."
       hCloseDocument ()
       sleep 5
       hFileOpen (OutputGrafikTBO + "2"+".bmp")
@@ -834,31 +815,6 @@ qaerrorlog
       endif
       
    endif
-   if hCallExport (OutputGrafikTBO + "3" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then
-      Kontext "BMPOptionen"
-      if BMPOptionen.Exists (2) then
-         Groesse.Check
-            sX2 = Breite.GetText
-            if (LiberalMeasurement(sx1, sX2)) <> TRUE then
-               if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
-                  Printlog "Width was ok. Expected: " + sx1 + "' was: '" + sX2 + "'"
-               else
-                  warnLog "Width is different expected: '" + sx1 + "' is: '" + sX2 + "'"
-               endif
-            endif
-            sY2 = Hoehe.GetText
-            if (LiberalMeasurement(sY, sY2)) <> TRUE then
-               if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
-                  Printlog "Height was ok. Expected: " + sY + "' was: '" + sY2 + "'"
-               else
-                  warnLog "Height is different expected: '" + sY + "' is: '" + sY2 + "'"
-               endif
-            endif
-         BMPOptionen.Cancel
-         sleep 5
-       endif
-   endif
-
    call hCloseDocument
 
 endcase 'tBMP
@@ -884,19 +840,11 @@ testcase tEMF
     hFileOpen sDocument
 
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            if Breite.IsEnabled then
-                warnlog " :-("
-            endif
-            if Hoehe.IsEnabled then
-                warnlog " :-("
-            endif
-            Groesse.Check
-            Breite.More
-            Hoehe.Less
-            SVMOptionen.Cancel
+        Kontext "EMFOptions"
+        if EMFOptions.Exists (2) then
+            Exportwidth.More
+            Exportheight.Less
+            EMFOptions.Cancel
             sleep 5
             if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
                 Printlog "ok :-)"
@@ -915,12 +863,11 @@ testcase tEMF
         end if
     end if
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.Less
-            Hoehe.More
-            SVMOptionen.OK
+        Kontext "EMFOptions"
+        if EMFOptions.Exists (2) then
+            Exportwidth.More
+            Exportheight.Less
+            EMFOptions.OK
             sleep 5
         endif
         if ( dir(OutputGrafikTBO+sExt) <> "") then
@@ -935,53 +882,26 @@ testcase tEMF
         Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
     endif
     hCloseDocument ()
-    hFileOpen (sDocument)
-    kontext "Filterauswahl"
-    if Filterauswahl.Exists(10) then
-        Warnlog "Error when loading the file. The Filter-dialogue came up. Test aborted."
-        Filterauswahl.Cancel
-        goto endsub
-    endif
-   printlog "making doc editable if it is readonly"   
-    call fMakeDocumentWritable
-    hTypeKeys ("<escape><tab>")
-    fGetSizeXY sx1, sY, TRUE
-    if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            SVMOptionen.OK
-            sleep 5
-        endif
-        if ( dir(OutputGrafikTBO & "1" & sExt) <> "") then
-            Printlog "Ok :-) saved as: '" & OutputGrafikTBO & "1" & sExt & "'"
-        else
-            warnlog "File didn't get saved :-("
-        endif
-        hCloseDocument ()
-        sleep 5
-        hNewDocument()
-        sleep 5
-        Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
-        bTemp = FALSE
-        fGetSizeXY sx1, sY, bTemp
-        if (bTemp = FALSE) then
-            warnlog "Selected original size NOT OK :-("
-        endif
-    endif
-    hCloseDocument ()
+   
     hNewDocument()
     hRechteckErstellen ( 10, 10, 30, 40 )
     if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check   'Press "Size" one more time to make the change go through"
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-            SVMOptionen.OK
+        Kontext "EMFOptions"
+        if EMFOptions.Exists (2) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportwidth.GetText)+ "cm"
+            endif
+            EMFOptions.OK
             sleep 5
         endif
         if ( dir(OutputGrafikTBO & "2" & sExt) <> "") then
@@ -1002,10 +922,9 @@ testcase tEMF
         endif
 
         if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
-            Kontext "SVMOptionen"
-            if SVMOptionen.Exists (2) then
-                Groesse.Check
-                sX2 = Breite.GetText
+            Kontext "EMFOptions"
+            if EMFOptions.Exists (2) then
+                sX2 = Exportwidth.GetText
                 if (LiberalMeasurement(sx1, sX2)) <> TRUE then
                     if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
                         Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
@@ -1013,7 +932,7 @@ testcase tEMF
                         warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
                     endif
                 endif
-                sY2 = Hoehe.GetText
+                sY2 = Exportheight.GetText
                 if (LiberalMeasurement(sY, sY2)) <> TRUE then
                     if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
                         Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
@@ -1021,7 +940,7 @@ testcase tEMF
                         warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
                     endif
                 endif
-                SVMOptionen.Cancel
+                EMFOptions.Cancel
                 sleep 5
             endif
         endif
@@ -1050,32 +969,26 @@ testcase tMET
     sExt = ".met"
 
     sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString
+    printlog "loading Test File"
     hFileOpen sDocument
 
+    printlog "----------1st: Trying to export and then canceling it"
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "METOptionen"
-        if METOptionen.Exists (2) then
-            Original.Check
-            if Breite.IsEnabled then
-                warnlog " :-("
-            endif
-            if Hoehe.IsEnabled then
-                warnlog " :-("
-            endif
-            Groesse.Check
-            sTemp = Breite.getText
-            Breite.More
-            if (sTemp = Breite.getText) then
+        Kontext "METOptions"
+        if METOptions.Exists (2) then
+            sTemp = Exportwidth.getText
+            Exportwidth.More
+            if (sTemp = Exportwidth.getText) then
                 qaErrorLog "Width didn't change on pressing button 'More' #112225#"
-                Breite.setText "10"
-                Hoehe.setText "10"
+                Exportwidth.setText "10"
             endif
-            sTemp = Hoehe.getText
-            Hoehe.Less
-            if (sTemp = Hoehe.getText) then
+            sTemp = Exportheight.getText
+            Exportheight.Less
+            if (sTemp = Exportheight.getText) then
                 warnlog "Height didn't change on pressing button 'Less'"
             endif
-            METOptionen.Cancel
+            printlog "Canceling export..."
+            METOptions.Cancel
             sleep 5
             if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
                 Printlog "ok :-)"
@@ -1093,25 +1006,24 @@ testcase tMET
             Active.OK
         end if
     end if
+    printlog "----------2nd: doing real export.."
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "METOptionen"
-        if METOptionen.Exists (2) then
-            Groesse.Check
-            sTemp = Breite.getText
-            Breite.Less
-            if (sTemp = Breite.getText) then
+        Kontext "METOptions"
+        if METOptions.Exists (2) then
+            sTemp = Exportwidth.getText
+            Exportwidth.Less
+            if (sTemp = Exportwidth.getText) then
                 warnlog "Width didn't change on pressing button 'Less'"
             endif
-            sTemp = Hoehe.getText
-            Hoehe.More
-            if (sTemp = Hoehe.getText) then
+            sTemp = Exportheight.getText
+            Exportheight.More
+            if (sTemp = Exportheight.getText) then
                 qaErrorLog "Height didn't change on pressing button 'More' #112225#"
-                Breite.setText "10"
-                Hoehe.setText "10"
+                Exportwidth.setText "10"
             endif
-            METOptionen.OK
+            METOptions.OK
             iWaitIndex = 0
-            do while METOptionen.Exists AND iWaitIndex < 30
+            do while METOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1121,28 +1033,33 @@ testcase tMET
         else
             warnlog "File didn't get saved :-("
         endif
+        printlog "Closing test doc."
         hCloseDocument ()
         sleep 5
+        printlog "----------3rd: Inserting export into new doc."
+        printlog "Opening new doc."
         hNewDocument()
         sleep 5
+        printlog "Inserting the exported file..."
         Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
     endif
+    printlog "Closing file with inserted graphic."
     hCloseDocument ()
+    printlog "----------4th: Exporting part of test doc."
+    printlog "Opening test file.."
     hFileOpen (sDocument)
     sleep (10)
-   
     printlog "making doc editable if it is readonly"
     call fMakeDocumentWritable
-
+    printlog "Selecting part of doc for export.."
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
     if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
-        Kontext "METOptionen"
-        if METOptionen.Exists (2) then
-            Original.Check
-            METOptionen.OK
+        Kontext "METOptions"
+        if METOptions.Exists (2) then
+            METOptions.OK
             iWaitIndex = 0
-            do while METOptionen.Exists AND iWaitIndex < 30
+            do while METOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1152,32 +1069,51 @@ testcase tMET
         else
             warnlog "File didn't get saved :-("
         endif
+        printlog "Closing testfile"
         hCloseDocument ()
         sleep 5
+        printlog "----------5th: Inserting exported part into new doc."
+        printlog "Opening new file.."
         hNewDocument()
         sleep 5
+        printlog "inserting exported part."
         Call hGrafikEinfuegen ( OutputGrafikTBO & "1" & sExt )
         bTemp = FALSE
+        printlog "Checking size."
         fGetSizeXY sx1, sY, bTemp
         if (bTemp = FALSE) then
             warnlog "Selected original size NOT OK :-("
         endif
     endif
+    printlog "Closing doc."
     hCloseDocument ()
+    printlog "----------6th: exporting fresh rectangle."
+    printlog "opening new file."
     hNewDocument()
+    printlog "inserting rectangle."
     hRechteckErstellen ( 10, 10, 30, 40 )
+    printlog "Exporting rectangle.."
     if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
-        Kontext "METOptionen"
-        if METOptionen.Exists (2) then
-            Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check  ' Click "Size" one more time to make the changes go through.
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-            METOptionen.OK
+        Kontext "METOptions"
+        if METOptions.Exists (2) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportwidth.GetText)+ "cm"
+            endif
+
+            METOptions.OK
             iWaitIndex = 0
-            do while METOptionen.Exists AND iWaitIndex < 30
+            do while METOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1187,11 +1123,14 @@ testcase tMET
         else
             warnlog "File didn't get saved :-("
         endif
+        printlog "closing doc."
         hCloseDocument ()
         sleep 5
+        printlog "----------7th:Opening exported file with rectangle"
         hFileOpen (OutputGrafikTBO & "2" & sExt)
         kontext "DocumentDraw"
         DocumentDraw.TypeKeys ("<escape><tab>")
+        printlog "Checking file size."
         ContextOriginalSize
         bTemp = FALSE
         fGetSizeXY sx1, sY, bTemp
@@ -1199,30 +1138,6 @@ testcase tMET
             warnlog "Selected original size NOT OK :-("
         endif
     endif
-    if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
-        Kontext "METOptionen"
-        if METOptionen.Exists (2) then
-            Groesse.Check
-            sX2 = Breite.GetText
-            if (LiberalMeasurement(sx1, sX2)) <> TRUE then
-                if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
-                    Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
-                else
-                    warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
-                endif
-            endif
-            sY2 = Hoehe.GetText
-            if (LiberalMeasurement(sY, sY2)) <> TRUE then
-                if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
-                    Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
-                else
-                    warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
-                endif
-            endif
-            METOptionen.Cancel
-            sleep 5
-        endif
-    endif
 
     call hCloseDocument
 endcase 'tMET
@@ -1270,27 +1185,20 @@ testcase tWMF
 
     sFilter = "WMF - Windows Metafile (.wmf)"
     sExt = ".wmf"
-
     sDocument = gTesttoolPath & "graphics\required\input\graphicexport." & ExtensionString
+    printlog "Loading testdoc."
     hFileOpen sDocument
 
+    printlog "Starting export as WMF and canceling.."
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            if Breite.IsEnabled then
-                warnlog " :-("
-            endif
-            if Hoehe.IsEnabled then
-                warnlog " :-("
-            endif
-            Groesse.Check
-            Breite.More
-            Hoehe.Less
-            SVMOptionen.Cancel
+        Kontext "WMFOptions"
+        if WMFOptions.Exists (2) then
+            Exportwidth.Less
+            Exportheight.More
+            WMFOptions.Cancel
             sleep 5
             if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
-                Printlog "ok :-)"
+                Printlog "ok :-), nothing exported due to canceling."
             else
                 warnlog "Dialog was canceled, but file got saved, too :-(  - i35177"
             endif
@@ -1305,15 +1213,15 @@ testcase tWMF
             Active.OK
         end if
     end if
+    printlog "Doing real export."
     if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.Less
-            Hoehe.More
-            SVMOptionen.OK
+        Kontext "WMFOptions"
+        if WMFOptions.Exists (2) then
+            Exportwidth.Less
+            Exportheight.More
+            WMFOptions.OK
             iWaitIndex = 0
-            do while SVMOptionen.Exists AND iWaitIndex < 30
+            do while WMFOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1323,13 +1231,18 @@ testcase tWMF
         else
             warnlog "File didn't get saved :-("
         endif
+        Printlog "Closing test doc."
         hCloseDocument ()
         sleep 5
+        printlog "Opening new odc."
         hNewDocument()
         sleep 5
+        printlog "Inserting exported graphic."
         Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
     endif
+    printlog "Closing."
     hCloseDocument ()
+    Printlog "Opening exported file."
     hFileOpen (sDocument)
     sleep (10)
    
@@ -1339,12 +1252,11 @@ testcase tWMF
     hTypeKeys ("<escape><tab>")
     fGetSizeXY sx1, sY, TRUE
     if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Original.Check
-            SVMOptionen.OK
+        Kontext "WMFOptions"
+        if WMFOptions.Exists (2) then
+            WMFOptions.OK
             iWaitIndex = 0
-            do while SVMOptionen.Exists AND iWaitIndex < 30
+            do while WMFOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1369,17 +1281,25 @@ testcase tWMF
     hNewDocument()
     hRechteckErstellen ( 10, 10, 30, 40 )
     if hCallExport (OutputGrafikTBO & "2" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            Breite.SetText "9"
-            Hoehe.SetText "9"
-            Groesse.Check 'Check "Size" to make changes really go through.
-            sx1 = Breite.GetText
-            sY = Hoehe.GetText
-            SVMOptionen.OK
+        Kontext "WMFOptions"
+        if WMFOptions.Exists (2) then
+            Exportwidth.SetText "9"
+            if Exportmeasurement.GetSelText = "inches" then
+                sx1 = (Exportwidth.GetText)+ """"
+                printlog "sx1= " & sx1
+            else
+                sx1 = (Exportwidth.GetText)+ "cm"
+            endif
+
+            if Exportmeasurement.GetSelText = "inches" then
+                sY = (Exportheight.GetText)+ """"
+                printlog "sY= " & sY
+            else
+                sY = (Exportwidth.GetText)+ "cm"
+            endif
+            WMFOptions.OK
             iWaitIndex = 0
-            do while SVMOptionen.Exists AND iWaitIndex < 30
+            do while WMFOptions.Exists AND iWaitIndex < 30
                 sleep (1)
                 iWaitIndex = iWaitIndex + 1
             loop
@@ -1401,30 +1321,6 @@ testcase tWMF
             warnlog "Selected original size NOT OK :-("
         endif
     endif
-    if hCallExport (OutputGrafikTBO & "3" , sFilter, TRUE ) = TRUE then
-        Kontext "SVMOptionen"
-        if SVMOptionen.Exists (2) then
-            Groesse.Check
-            sX2 = Breite.GetText
-            if (LiberalMeasurement(sx1, sX2)) <> TRUE then
-                if (val(str(StrToDouble(sx1)+5)) >= StrToDouble(sX2) ) AND (val(str(StrToDouble ( sx1 )-5)) <= StrToDouble ( sX2 )) then
-                    Printlog "Width was ok. Expected: " & sx1 & "' was: '" & sX2 & "'"
-                else
-                    warnLog "Width is different expected: '" & sx1 & "' is: '" & sX2 & "'"
-                endif
-            endif
-            sY2 = Hoehe.GetText
-            if (LiberalMeasurement(sY, sY2)) <> TRUE then
-                if ( val(str(StrToDouble(sY)+5)) >= StrToDouble(sY2) ) AND (val(str(StrToDouble ( sY )-5)) <= StrToDouble ( sY2 )) then
-                    Printlog "Height was ok. Expected: " & sY & "' was: '" & sY2 & "'"
-                else
-                    warnLog "Height is different expected: '" & sY & "' is: '" & sY2 & "'"
-                endif
-            endif
-            SVMOptionen.Cancel
-            sleep 5
-        endif
-    endif
 
     call hCloseDocument
 endcase 'tWMF
diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc
index 8d59b0c6b387..6fa992308c44 100644
--- a/testautomation/graphics/optional/includes/global/g_accessability.inc
+++ b/testautomation/graphics/optional/includes/global/g_accessability.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Accessability
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_area.inc b/testautomation/graphics/optional/includes/global/g_area.inc
index caab5801a075..758044290d45 100644
--- a/testautomation/graphics/optional/includes/global/g_area.inc
+++ b/testautomation/graphics/optional/includes/global/g_area.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
index 16f0ca213d26..48c6599efa72 100644
--- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc
+++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
index 447808b4bc8e..731c9e0ed21f 100644
--- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc
+++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index 31b4f364c50c..a9d578665c5a 100644
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 9bc85a4bbad1..4c1900876565 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description :
 '*
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport.inc b/testautomation/graphics/optional/includes/global/g_clipexport.inc
index 91357e867937..c9569cbf8741 100644
--- a/testautomation/graphics/optional/includes/global/g_clipexport.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* Owner : wolfram.garten@sun.com
+'* Owner : wolfram.garten@oracle.com
 '*
 '* short description : Tests the clipboard-function with a rectangle
 '*
@@ -165,87 +165,138 @@ global Text5 as string
 global Text6 as string
 global Text7 as string
 
+'--------------------------- Tests for Writer ----------------------------------
+sub writertest
+
+    try
+        call Make_And_Check_Formatted_Text_Line_From_Application
+    catch
+        warnlog "Something went wrong with testing writertest"
+    endcatch
+
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch
+        warnlog "something wrong with testing writertest"
+    endcatch
+end sub ' big one
+
+'---------------------------- Tests for Calc -----------------------------------
+sub calctest
+
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch
+        warnlog "something wrong with calctest"
+    endcatch
+    printlog "currently no specific tests from Calc"
+end sub
+
+'-------------------------------------------------------------------------------
+sub tClipboardFromDrawTest
+
+    EnableQAErrors = false
+    FromApp2 = gApplication
+    printlog "gApplication = " + gApplication
+
+    select case( gApplication )
+    case "WRITER" : call writertest()
+    case "CALC"   : call calctest()
+    case else     : warnlog( "Unsupported gApplication provided: " & gApplication )
+    end select
+
+end sub
+
 '------------------------------- "object"-dependant tests ----------------------
 
-try
-    call Make_Rectangle_From_Application
-    call Full_test_Draw
-    call Full_test_Impress
-    call Full_test_Writer
-    call Full_test_Calc
-catch
-    warnlog "something wrong with testing Rectangle"
-endcatch
-
-try
-    call Make_Make3dObject_From_Application
-    call Full_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing 3dObject"
-endcatch
-
-'qaerrorlog "Make_CurveObject_From_Application needs an overview - FHA"
-try
-    call Make_CurveObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing CurveObj"
-endcatch
-
-try
-    call Make_ConnectorObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing ConnectorObject"
-endcatch
-
-try
-    call Make_LineObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    '   call Small_test_Calc
-    '   call Small_test_Writer
-catch
-    warnlog "something wrong with testing LineObject"
-endcatch
-
-try
-catch
-    warnlog "something wrong with testing ConnectorObject"
-endcatch
-
-try
-    call Make_Circle_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing Circle"
-endcatch
-
-try
-    call Make_TextSquare_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-
-catch
-    warnlog "something wrong with testing TextSquare"
-endcatch
-
-call clear_all_and_close
-Printlog "tClipboardFromDrawTest finished"
+sub g_clipexport
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch