From 0c01055a1a50b7851755d6a564b5c5906e54d286 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 24 Mar 2009 14:52:04 +0000 Subject: CWS-TOOLING: integrate CWS automation_gapplication_unify 2009-03-24 14:40:09 +0100 jsk r269948 : #i99878# - and another one... 2009-03-24 14:36:22 +0100 jsk r269946 : #i99878# - another one... 2009-03-23 14:52:17 +0100 jsk r269873 : #i99878# replace DESKTOP with BACKGROUND 2009-03-23 12:49:08 +0100 jsk r269868 : #i99878# - special focus on database application 2009-03-23 12:46:13 +0100 jsk r269867 : #i100474# - fix broken writer update testcase names 2009-03-20 15:44:29 +0100 jsk r269817 : #i99878 - Step 3: Fixing round three - applications.txt 2009-03-20 15:40:43 +0100 jsk r269816 : #i99878 - Step 3: Fixing round two - .bas-files 2009-03-20 15:19:04 +0100 jsk r269813 : #i99878 - Step 3: Fixing round one 2009-03-20 15:01:07 +0100 jsk r269811 : #i99878 - Step 1: rename, Step 2: Uppercase --- testautomation/chart2/optional/ch2_losa_ods_to_ods.bas | 2 +- testautomation/chart2/optional/ch2_losa_ods_to_ots.bas | 2 +- testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas | 2 +- testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas | 2 +- testautomation/chart2/optional/ch2_losa_ods_to_xls.bas | 2 +- testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas | 2 +- testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas | 2 +- testautomation/chart2/optional/ch2_lvl1_wizard.bas | 2 +- testautomation/chart2/required/ch2_chart_data_dlg_impress.bas | 2 +- .../chart2/required/ch2_flexible_source_range_selection.bas | 6 +++--- testautomation/chart2/required/ch2_updt_calc.bas | 2 +- testautomation/chart2/required/includes/ch2_ole.inc | 10 +++++----- 12 files changed, 18 insertions(+), 18 deletions(-) (limited to 'testautomation/chart2') diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas index b9d785e9eec2..8d2f6de7039d 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas index 94e00806c27a..cb800ef28cd4 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas index edc462e988c1..12b8090e6614 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas @@ -68,6 +68,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas index c2cb62130266..b0b164757f7b 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas index cc1bd9a6602b..23b33cb47ad1 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas index f7e3f21ce22d..2128e3df56fb 100755 --- a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas +++ b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas index 36b63687132f..7c1a47b9bebc 100755 --- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas +++ b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas @@ -69,6 +69,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/chart2/optional/ch2_lvl1_wizard.bas b/testautomation/chart2/optional/ch2_lvl1_wizard.bas index a5db1dbc6a35..f580be4e51c6 100755 --- a/testautomation/chart2/optional/ch2_lvl1_wizard.bas +++ b/testautomation/chart2/optional/ch2_lvl1_wizard.bas @@ -63,6 +63,6 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_set_standard_controls.inc" Call GetUseFiles - gApplication = "Calc" + gApplication = "CALC" end sub diff --git a/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas index d0218558fd68..ed3e1efc8980 100755 --- a/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas +++ b/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas @@ -56,6 +56,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Impress" + gApplication = "IMPRESS" end sub diff --git a/testautomation/chart2/required/ch2_flexible_source_range_selection.bas b/testautomation/chart2/required/ch2_flexible_source_range_selection.bas index 5543e2a6eb86..4f2ed0841e5c 100644 --- a/testautomation/chart2/required/ch2_flexible_source_range_selection.bas +++ b/testautomation/chart2/required/ch2_flexible_source_range_selection.bas @@ -47,13 +47,13 @@ sub main printlog "Updatetest for Flexible Source Range Selection" printlog "----------------------------------------------" printlog "------------ Chart in Spreadsheet ------------" - gApplication = "Calc" + gApplication = "CALC" Call tDataRangeWizardCalc Call tDataSeriesWizardCalc Call tDataRangeDialogCalc Call tDataSeriesDialogCalc printlog "-------------- Chart in Writer ---------------" - gApplication = "Writer" + gApplication = "WRITER" Call tDataRangeWizardWriter Call tDataSeriesWizardWriter Call tDataRangeDialogWriter @@ -67,5 +67,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Calc" + gApplication = "CALC" end sub diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas index 61b68d6504fb..57c5fa52bcec 100755 --- a/testautomation/chart2/required/ch2_updt_calc.bas +++ b/testautomation/chart2/required/ch2_updt_calc.bas @@ -152,6 +152,6 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_set_standard_controls.inc" Call GetUseFiles - gApplication = "Calc" + gApplication = "CALC" end sub diff --git a/testautomation/chart2/required/includes/ch2_ole.inc b/testautomation/chart2/required/includes/ch2_ole.inc index 7a7b58fc70b7..3d6ffb698d36 100755 --- a/testautomation/chart2/required/includes/ch2_ole.inc +++ b/testautomation/chart2/required/includes/ch2_ole.inc @@ -85,8 +85,8 @@ testcase tChartOLE ( sCurrentApplication as STRING ) case ("IMPRESS") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".odp" ) case ("DRAW") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".odg" ) case ("WRITER") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".odt" ) - case ("MASTERDOC") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".odm" ) - case ("HTMLDOKUMENT") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".html" ) + case ("MASTERDOCUMENT") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".odm" ) + case ("HTML") : sOutputFile = ( gOfficePath & ConvertPath("user\work\") & "tChartOLE_" & sCurrentApplication & ".html" ) case else : warnlog "The modul " & sCurrentApplication & " is not supported in this test case!" Call hCloseDocument goto endsub @@ -110,8 +110,8 @@ testcase tChartOLE ( sCurrentApplication as STRING ) case ("WRITER") : call gMouseclick (99,99) call gMouseclick (50,50) Call fSelectFirstOLE - case ("MASTERDOC") : call gMouseclick (99,99) - case ("HTMLDOKUMENT") : call gMouseclick (99,99) + case ("MASTERDOCUMENT") : call gMouseclick (99,99) + case ("HTML") : call gMouseclick (99,99) call gMouseclick (50,50) Call fSelectFirstOLE case else : warnlog "The modul " & sCurrentApplication & " is not supported in this test case!" @@ -138,6 +138,6 @@ testcase tChartOLE ( sCurrentApplication as STRING ) end if '/// Close document Call hCloseDocument - gApplication = "Calc" + gApplication = "CALC" endcase -- cgit