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 --- .../chart2/optional/ch2_losa_ods_to_ods.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_ots.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_sdc.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_sxc.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_xls.bas | 2 +- .../chart2/optional/ch2_losa_sxc_to_ods.bas | 2 +- .../chart2/optional/ch2_losa_sxc_to_sdc.bas | 2 +- testautomation/chart2/optional/ch2_lvl1_wizard.bas | 2 +- .../chart2/required/ch2_chart_data_dlg_impress.bas | 2 +- .../ch2_flexible_source_range_selection.bas | 6 +- testautomation/chart2/required/ch2_updt_calc.bas | 2 +- .../chart2/required/includes/ch2_ole.inc | 10 +- .../dbaccess/optional/includes/ctrl_Clipboard.inc | 30 +- .../optional/includes/ctrl_Spreadsheet.inc | 10 +- .../optional/includes/ctrl_TextControl.inc | 2 +- .../dbaccess/optional/includes/db_Query.inc | 2 +- .../dbaccess/optional/includes/db_Spreadsheet.inc | 2 +- .../dbaccess/optional/includes/db_Text.inc | 14 +- .../dbaccess/optional/includes/db_hsqldb.inc | 8 +- .../dbaccess/optional/includes/frm_Forms.inc | 16 +- .../optional/includes/wiz_CopyTableWizard.inc | 50 +- .../dbaccess/optional/includes/wiz_FormWizard.inc | 18 +- .../optional/includes/wiz_ReportWizard.inc | 6 +- .../dbaccess/required/includes/DatabaseTypes.inc | 62 +- .../dbaccess/required/includes/Forms.inc | 6 +- .../dbaccess/required/includes/MainApp.inc | 86 +- .../dbaccess/required/includes/Query.inc | 16 +- .../dbaccess/required/includes/ReportBuilder01.inc | 6 +- .../dbaccess/required/includes/Table.inc | 6 +- .../dbaccess/required/includes/TableDesign.inc | 6 +- .../dbaccess/required/includes/Wizards.inc | 24 +- testautomation/dbaccess/tools/controltools.inc | 6 +- testautomation/dbaccess/tools/dbcreatetools.inc | 4 +- testautomation/dbaccess/tools/dbtools.inc | 20 +- testautomation/dbaccess/tools/formtools.inc | 8 +- testautomation/dbaccess/tools/querytools.inc | 28 +- testautomation/dbaccess/tools/reporttools.inc | 28 +- testautomation/dbaccess/tools/tabletools.inc | 42 +- .../framework/optional/f_CJK_CollationDialogue.bas | 2 +- .../framework/optional/f_CJK_FeatureSwitch.bas | 4 +- .../framework/optional/f_CJK_GridLayout.bas | 2 +- .../optional/f_CJK_RubyDialogueProposal.bas | 2 +- .../optional/f_NewSortingAlgorithmForJapanese.bas | 4 +- .../framework/optional/f_configuration.bas | 2 +- .../framework/optional/f_loadsave_general.bas | 2 +- testautomation/framework/optional/f_ole.bas | 2 +- .../framework/optional/f_options_ooo.bas | 2 +- .../optional/includes/basic_delete_modules.inc | 2 +- .../framework/optional/includes/basic_ide.inc | 2 +- .../framework/optional/includes/basic_macros.inc | 2 +- .../optional/includes/basic_modulehide.inc | 2 +- .../optional/includes/basic_modulenames.inc | 4 +- .../framework/optional/includes/configuration.inc | 2 +- .../optional/includes/fontworkgallery.inc | 2 +- .../framework/optional/includes/loadsave_files.inc | 8 +- .../framework/optional/includes/loadsave_new.inc | 28 +- .../framework/optional/includes/menuentries.inc | 4 +- .../framework/optional/includes/ole_2.inc | 4 +- .../framework/optional/includes/ole_3.inc | 2 +- .../framework/optional/includes/ole_tools.inc | 97 +- .../framework/optional/includes/options_ls_2.inc | 2 +- .../framework/optional/includes/options_so_4.inc | 2 +- .../framework/optional/includes/options_so_5.inc | 2 +- .../includes/security_certification_dialogs.inc | 6 +- testautomation/framework/required/f_first.bas | 4 +- testautomation/framework/required/f_topten.bas | 2 +- .../framework/required/includes/first.inc | 22 +- .../required/includes/standard_toolbar_1.inc | 2 +- .../required/includes/standard_toolbar_3.inc | 2 +- .../required/includes/standard_toolbar_6.inc | 12 +- .../framework/required/includes/topten.inc | 8 +- .../required/includes/window_functions.inc | 24 +- .../framework/tools/includes/toolbar_tools.inc | 2 +- .../framework/tools/includes/window_tools.inc | 2 +- .../framework/tools/includes/wizards.inc | 2 +- testautomation/global/input/applications.txt | 6 +- .../required/includes/g_numberformatter1.inc | 4 +- .../global/required/includes/g_option.inc | 24 +- .../global/required/includes/g_option2.inc | 32 +- testautomation/global/system/includes/iniinfo.inc | 32 +- testautomation/global/system/includes/status.inc | 2 +- .../global/tools/includes/optional/t_docfuncs.inc | 6 +- .../tools/includes/optional/t_toolbar_impress.inc | 2 +- .../tools/includes/optional/t_toolbar_tools1.inc | 4 +- .../tools/includes/optional/t_ui_filters.inc | 2 +- .../tools/includes/optional/t_xml_filter1.inc | 8 +- .../global/tools/includes/required/t_dir.inc | 367 +++--- .../global/tools/includes/required/t_dirloc.inc | 253 ++-- .../global/tools/includes/required/t_doc1.inc | 837 +++++++------- .../global/tools/includes/required/t_doc2.inc | 370 +++--- .../global/tools/includes/required/t_files.inc | 172 +-- .../global/tools/includes/required/t_filters.inc | 128 +-- .../global/tools/includes/required/t_lists.inc | 233 ++-- .../global/tools/includes/required/t_menu.inc | 26 +- .../global/tools/includes/required/t_option.inc | 1068 ++++++++--------- .../global/tools/includes/required/t_option2.inc | 1210 ++++++++++---------- .../global/tools/includes/required/t_tools1.inc | 36 +- .../global/tools/includes/required/t_tools2.inc | 60 +- .../global/tools/includes/required/t_tools3.inc | 8 +- testautomation/global/win/edia_d_h.win | 11 + testautomation/global/win/edia_i_o.win | 11 - .../graphics/optional/d_export_graphic_a.bas | 2 +- .../graphics/optional/d_export_graphic_b.bas | 2 +- .../graphics/optional/export_graphic_a.bas | 2 +- .../graphics/optional/export_graphic_b.bas | 2 +- .../graphics/optional/g_accessability.bas | 4 +- testautomation/graphics/optional/g_area.bas | 4 +- .../graphics/optional/g_arrangealign.bas | 4 +- .../graphics/optional/g_autocorrection.bas | 6 +- testautomation/graphics/optional/g_character.bas | 4 +- testautomation/graphics/optional/g_clipboard.bas | 4 +- testautomation/graphics/optional/g_convertto.bas | 4 +- testautomation/graphics/optional/g_crossfading.bas | 4 +- .../graphics/optional/g_customshapes.bas | 4 +- testautomation/graphics/optional/g_demoguide.bas | 2 +- testautomation/graphics/optional/g_dimensions.bas | 4 +- testautomation/graphics/optional/g_edit.bas | 4 +- testautomation/graphics/optional/g_export_html.bas | 4 +- testautomation/graphics/optional/g_findreplace.bas | 4 +- testautomation/graphics/optional/g_format.bas | 4 +- testautomation/graphics/optional/g_group.bas | 4 +- testautomation/graphics/optional/g_imagemap.bas | 4 +- testautomation/graphics/optional/g_insert.bas | 4 +- testautomation/graphics/optional/g_line.bas | 4 +- testautomation/graphics/optional/g_load_save.bas | 4 +- testautomation/graphics/optional/g_mediaplayer.bas | 4 +- testautomation/graphics/optional/g_navigator.bas | 4 +- testautomation/graphics/optional/g_ole.bas | 2 +- testautomation/graphics/optional/g_paneview.bas | 4 +- testautomation/graphics/optional/g_paragraph.bas | 4 +- testautomation/graphics/optional/g_print.bas | 4 +- .../graphics/optional/g_savepictureas.bas | 4 +- testautomation/graphics/optional/g_shaddow.bas | 6 +- testautomation/graphics/optional/g_slidelayer.bas | 4 +- testautomation/graphics/optional/g_spellcheck.bas | 4 +- testautomation/graphics/optional/g_stylist.bas | 6 +- testautomation/graphics/optional/g_tables.bas | 4 +- testautomation/graphics/optional/g_toolbars.bas | 4 +- testautomation/graphics/optional/g_tools.bas | 4 +- testautomation/graphics/optional/g_zoom.bas | 4 +- testautomation/graphics/optional/i_animation.bas | 2 +- .../graphics/optional/i_headerfooter.bas | 2 +- testautomation/graphics/optional/i_pengine.bas | 2 +- .../graphics/optional/i_saveloadlayout.bas | 2 +- testautomation/graphics/optional/i_slidecopy.bas | 2 +- testautomation/graphics/optional/i_slideshow.bas | 2 +- .../graphics/optional/i_us_presentation.bas | 2 +- testautomation/graphics/optional/i_view.bas | 2 +- .../optional/includes/global/export_graphic_2.inc | 4 +- .../optional/includes/global/g_accessability.inc | 4 +- .../optional/includes/global/g_autocorrection.inc | 2 +- .../optional/includes/global/g_character.inc | 4 +- .../optional/includes/global/g_clipboard.inc | 4 +- .../optional/includes/global/g_clipexport2.inc | 2 +- .../optional/includes/global/g_clipexport3.inc | 12 +- .../optional/includes/global/g_customshapes.inc | 8 +- .../graphics/optional/includes/global/g_edit.inc | 4 +- .../optional/includes/global/g_export_html.inc | 2 +- .../graphics/optional/includes/global/g_format.inc | 6 +- .../graphics/optional/includes/global/g_group.inc | 2 +- .../graphics/optional/includes/global/g_insert.inc | 10 +- .../graphics/optional/includes/global/g_line.inc | 14 +- .../optional/includes/global/g_load_save.inc | 24 +- .../optional/includes/global/g_mediaplayer.inc | 2 +- .../optional/includes/global/g_navigator.inc | 2 +- .../graphics/optional/includes/global/g_ole.inc | 8 +- .../optional/includes/global/g_paragraph.inc | 4 +- .../graphics/optional/includes/global/g_print.inc | 2 +- .../optional/includes/global/g_savepictureas.inc | 12 +- .../optional/includes/global/g_shaddow.inc | 16 +- .../optional/includes/global/g_stylist.inc | 2 +- .../graphics/optional/includes/global/g_zoom.inc | 2 +- .../graphics/optional/includes/global/gallery.inc | 26 +- .../graphics/optional/includes/global/gallery2.inc | 4 +- .../graphics/optional/includes/global/id_001.inc | 16 +- .../graphics/optional/includes/global/id_003.inc | 2 +- .../graphics/optional/includes/global/id_006.inc | 2 +- .../graphics/optional/includes/global/id_011.inc | 2 +- .../optional/includes/impress/i_saveloadlayout.inc | 14 +- .../optional/includes/impress/i_slidelayer.inc | 2 +- .../graphics/optional/includes/impress/im_011_.inc | 4 +- testautomation/graphics/required/d_opt.bas | 2 +- testautomation/graphics/required/d_updt.bas | 2 +- testautomation/graphics/required/i_opt.bas | 2 +- .../graphics/required/includes/global/gallery.inc | 26 +- .../graphics/required/includes/global/gallery2.inc | 4 +- .../graphics/required/includes/global/id_001.inc | 18 +- .../graphics/required/includes/global/id_003.inc | 2 +- .../graphics/required/includes/global/id_006.inc | 2 +- .../graphics/required/includes/global/id_011.inc | 2 +- .../graphics/required/includes/global/id_opt_1.inc | 26 +- .../graphics/required/includes/global/id_opt_2.inc | 4 +- .../graphics/required/includes/impress/im_011_.inc | 4 +- testautomation/graphics/tools/id_tools.inc | 2 +- testautomation/graphics/tools/id_tools_2.inc | 46 +- testautomation/graphics/tools/makeLokaleTxt.bas | 14 +- testautomation/math/optional/includes/m_101_.inc | 4 +- testautomation/math/optional/includes/m_105.inc | 18 +- testautomation/math/optional/m_lvl1.bas | 2 +- .../spreadsheet/optional/c_import_general.bas | 2 +- .../spreadsheet/optional/c_namedrange.bas | 2 +- .../spreadsheet/optional/c_printrange.bas | 2 +- testautomation/spreadsheet/optional/c_so7_pp1.bas | 2 +- testautomation/spreadsheet/required/c_updt1.bas | 2 +- testautomation/spreadsheet/required/c_updt2.bas | 2 +- .../required/includes/c_upd_toolsmenu2.inc | 14 +- .../optional/includes/clipboard/clipbrd_func.inc | 12 +- .../writer/optional/includes/clipboard/w_210_.inc | 4 +- .../writer/optional/includes/clipboard/w_211_.inc | 4 +- .../writer/optional/includes/clipboard/w_212_.inc | 4 +- .../writer/optional/includes/clipboard/w_213_.inc | 4 +- .../writer/optional/includes/clipboard/w_214_.inc | 22 +- .../writer/optional/includes/clipboard/w_216_.inc | 12 +- .../writer/optional/includes/clipboard/w_217_.inc | 12 +- .../writer/optional/includes/clipboard/w_218_.inc | 12 +- .../writer/optional/includes/clipboard/w_219_.inc | 12 +- .../writer/optional/includes/clipboard/w_220_.inc | 24 +- .../writer/optional/includes/clipboard/w_221_.inc | 28 +- .../writer/optional/includes/clipboard/w_222_.inc | 14 +- .../writer/optional/includes/fields/w_fields6.inc | 8 +- .../writer/optional/includes/filter/w_filter.inc | 4 +- .../formatparagraph/w_formatparagraph1.inc | 4 +- .../writer/optional/includes/option/wh_o_2.inc | 2 +- .../writer/optional/includes/option/wr_o_1.inc | 46 +- .../writer/optional/includes/option/wr_o_2.inc | 40 +- .../writer/optional/includes/option/wr_o_3.inc | 62 +- .../writer/optional/includes/option/wr_o_4.inc | 46 +- .../writer/optional/includes/option/wr_o_a.inc | 18 +- .../optional/includes/redlining/w_redlining1.inc | 2 +- .../issuezilla/w_issuezilla_regression.inc | 2 +- .../optional/includes/section/w_section_tools.inc | 2 +- .../optional/includes/spellcheck/w_spellcheck.inc | 10 +- .../writer/optional/includes/stylist/w_stylist.inc | 2 +- .../writer/optional/includes/table/w_204_.inc | 12 +- .../optional/includes/undo/w_undo_history_3.inc | 4 +- testautomation/writer/optional/w_autotext.bas | 2 +- testautomation/writer/optional/w_calculate.bas | 2 +- .../writer/optional/w_chinesetranslate.bas | 2 +- testautomation/writer/optional/w_clipbrd.bas | 2 +- testautomation/writer/optional/w_contextmenu.bas | 2 +- testautomation/writer/optional/w_drawing_tools.bas | 2 +- testautomation/writer/optional/w_dropdownLB.bas | 2 +- testautomation/writer/optional/w_fields.bas | 2 +- testautomation/writer/optional/w_filter.bas | 2 +- testautomation/writer/optional/w_fontwork.bas | 2 +- .../writer/optional/w_formatcharacter.bas | 2 +- testautomation/writer/optional/w_formatpage.bas | 2 +- .../writer/optional/w_formatparagraph.bas | 2 +- testautomation/writer/optional/w_hhConversion.bas | 2 +- testautomation/writer/optional/w_hyphenation.bas | 2 +- testautomation/writer/optional/w_insertgraphic.bas | 2 +- .../writer/optional/w_issuezilla_regression.bas | 2 +- testautomation/writer/optional/w_loadsave.bas | 2 +- testautomation/writer/optional/w_numbering.bas | 2 +- testautomation/writer/optional/w_opt.bas | 2 +- testautomation/writer/optional/w_redlining.bas | 2 +- testautomation/writer/optional/w_search.bas | 2 +- testautomation/writer/optional/w_section.bas | 2 +- testautomation/writer/optional/w_shortcuts.bas | 2 +- testautomation/writer/optional/w_sorting.bas | 2 +- testautomation/writer/optional/w_spellcheck.bas | 2 +- testautomation/writer/optional/w_stylist.bas | 2 +- testautomation/writer/optional/w_table.bas | 2 +- testautomation/writer/optional/w_textframes.bas | 2 +- testautomation/writer/required/includes/w_001_.inc | 56 +- .../writer/required/includes/w_001a_.inc | 14 +- testautomation/writer/required/includes/w_002_.inc | 28 +- testautomation/writer/required/includes/w_003_.inc | 16 +- testautomation/writer/required/includes/w_004_.inc | 46 +- testautomation/writer/required/includes/w_005_.inc | 28 +- .../writer/required/includes/w_005b_.inc | 50 +- testautomation/writer/required/includes/w_006_.inc | 4 +- testautomation/writer/required/includes/w_007_.inc | 26 +- testautomation/writer/required/includes/w_008_.inc | 6 +- testautomation/writer/required/includes/w_009_.inc | 4 +- testautomation/writer/required/includes/w_010_.inc | 14 +- .../writer/required/includes/w_010_1.inc | 17 +- testautomation/writer/required/includes/w_011_.inc | 18 +- testautomation/writer/required/includes/w_020_.inc | 30 +- testautomation/writer/tools/includes/w_tool1.inc | 8 +- testautomation/writer/tools/includes/w_tool3.inc | 6 +- testautomation/writer/tools/includes/w_tool4.inc | 4 +- testautomation/writer/tools/includes/w_tool6.inc | 4 +- testautomation/writer/tools/includes/w_tools.inc | 66 +- .../writer/tools/w_get_locale_strings.bas | 2 +- .../xml/optional/w_xml_vertical_alignment.bas | 2 +- 286 files changed, 3613 insertions(+), 3647 deletions(-) (limited to 'testautomation') 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 diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc index 40cf105351a6..611778a4536e 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc @@ -99,7 +99,7 @@ testcase tFromText for i = 1 to 3 '/// paste control from clipboard and open control property browser if i = 1 then - gApplication = "Calc" + gApplication = "CALC" printlog "-- Text to Calc Clipboard Test --" printlog "open a new Calc document" call hNewDocument @@ -112,7 +112,7 @@ testcase tFromText call hMenuSelectNr(4) endif if i = 2 then - gApplication = "Draw" + gApplication = "DRAW" printlog "-- Text to Draw Clipboard Test --" printlog "open a new Draw document" call hNewDocument @@ -125,7 +125,7 @@ testcase tFromText call hMenuSelectNr(2) endif if i = 3 then - gApplication = "Impress" + gApplication = "IMPRESS" printlog "-- Text to Impress Clipboard Test --" printlog "open a new Impress document" call hNewDocument @@ -168,7 +168,7 @@ testcase tFromCalc '/// Open a new document and empty clipboard printlog "Open a new document and empty clipboard" - gApplication = "Calc" + gApplication = "CALC" call hNewDocument Kontext "DocumentCalc" DocumentCalc.TypeKeys "tt_doc" , true @@ -215,7 +215,7 @@ testcase tFromCalc for i = 1 to 3 '/// paste control from clipboard and open control property browser if i = 1 then - gApplication = "Writer" + gApplication = "WRITER" printlog "-- Calc to Text Clipboard Test --" printlog "open a new Text document" call hNewDocument @@ -228,7 +228,7 @@ testcase tFromCalc call hMenuSelectNr(4) endif if i = 2 then - gApplication = "Draw" + gApplication = "DRAW" printlog "-- Calc to Draw Clipboard Test --" printlog "open a new Draw document" call hNewDocument @@ -241,7 +241,7 @@ testcase tFromCalc call hMenuSelectNr(2) endif if i = 3 then - gApplication = "Impress" + gApplication = "IMPRESS" printlog "-- Calc to Impress Clipboard Test --" printlog "open a new Impress document" call hNewDocument @@ -285,7 +285,7 @@ testcase tFromDraw '/// Open a new document and empty clipboard printlog "Open a new document and empty clipboard" - gApplication = "Draw" + gApplication = "DRAW" call hNewDocument Kontext "DocumentDraw" DocumentDraw.TypeKeys "tt_doc" , true @@ -332,7 +332,7 @@ testcase tFromDraw for i = 1 to 3 '/// paste control from clipboard and open control property browser if i = 1 then - gApplication = "Writer" + gApplication = "WRITER" printlog "-- Draw to Text Clipboard Test --" printlog "open a new Text document" call hNewDocument @@ -345,7 +345,7 @@ testcase tFromDraw call hMenuSelectNr(4) endif if i = 2 then - gApplication = "Calc" + gApplication = "CALC" printlog "-- Draw to Calc Clipboard Test --" printlog "open a new Calc document" call hNewDocument @@ -358,7 +358,7 @@ testcase tFromDraw call hMenuSelectNr(4) endif if i = 3 then - gApplication = "Impress" + gApplication = "IMPRESS" printlog "-- Draw to Impress Clipboard Test --" printlog "open a new Impress document" call hNewDocument @@ -401,7 +401,7 @@ testcase tFromImpress '/// Open a new document and empty clipboard printlog "Open a new document and empty clipboard" - gApplication = "Impress" + gApplication = "IMPRESS" call hNewDocument Kontext "DocumentImpress" DocumentImpress.TypeKeys "tt_doc" , true @@ -448,7 +448,7 @@ testcase tFromImpress for i = 1 to 3 '/// paste control from clipboard and open control property browser if i = 1 then - gApplication = "Writer" + gApplication = "WRITER" printlog "-- Impress to Text Clipboard Test --" printlog "open a new Text document" call hNewDocument @@ -461,7 +461,7 @@ testcase tFromImpress call hMenuSelectNr(4) endif if i = 2 then - gApplication = "Calc" + gApplication = "CALC" printlog "-- Impress to Calc Clipboard Test --" printlog "open a new Calc document" call hNewDocument @@ -474,7 +474,7 @@ testcase tFromImpress call hMenuSelectNr(4) endif if i = 3 then - gApplication = "Draw" + gApplication = "DRAW" printlog "-- Impress to Draw Clipboard Test --" printlog "open a new Draw document" call hNewDocument diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc index e8d08e0cdbe9..8cfeea2ec6ca 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc @@ -56,7 +56,7 @@ testcase tListBox dim i as integer printlog "- Formular toolbox: List box element (" & gApplication & ")" '/// open a spreadsheet, insert a listbox (the wizard appears) - gApplication = "Calc" + gApplication = "CALC" call hNewDocument Kontext "DocumentCalc" DocumentCalc.TypeKeys("Value1") @@ -134,7 +134,7 @@ endcase testcase tTextBox '/// Open a new document, - gApplication = "Calc" + gApplication = "CALC" printlog "Open a new document," call hNewDocument Kontext "DocumentCalc" @@ -248,14 +248,14 @@ testcase tTextBox warnlog "the cell bound doesn't work" endif hCloseDocument - gApplication = "Writer" + gApplication = "WRITER" endcase '-------------------------------------------------------------------------------------- testcase tCheckBox '/// Open a new document, - gApplication = "Calc" + gApplication = "CALC" printlog "Open a new document," call hNewDocument Kontext "DocumentCalc" @@ -378,7 +378,7 @@ testcase tCheckBox warnlog "the cell bound doesn't work" endif hCloseDocument - gApplication = "Writer" + gApplication = "WRITER" endcase '------------------------------------------------------------------------- diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc index 0faaf121ab2b..2c9a352c2284 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc @@ -194,7 +194,7 @@ testcase tRichTextControlDraw '/// Open a new document, printlog "Open a new document," - gApplication = "Draw" + gApplication = "DRAW" call hNewDocument Kontext "DocumentDraw" DocumentDraw.TypeKeys "tt_doc" , true diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc index b5097ad69f95..d9efb9ef3802 100755 --- a/testautomation/dbaccess/optional/includes/db_Query.inc +++ b/testautomation/dbaccess/optional/includes/db_Query.inc @@ -46,7 +46,7 @@ function db_Query( sFileName , optional sType , optional sPassword) sType = UCase(sType) printlog sType select case sType - case "TEXT", "SPREADSHEET" + case "TEXT", "CALC" sType = "1" case "ODBC", "JDBC" sType = "2" diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc index aec84e36ed21..8d87dd4c3507 100755 --- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc @@ -52,7 +52,7 @@ testcase db_Spreadsheet dbok = fCreateSpreadsheetDatasource(sFileName, gOfficePath + ConvertPath(sDBURL),"tt_spreadsheet") if dbok = true then - call db_Query(sFileName, "spreadsheet") + call db_Query(sFileName, "CALC") 'outcomment because of several bugs inside forms 'use "dbaccess/optional/includes/b_lvl1_Forms.inc" diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc index 1097b41fdc6a..016df0a55caa 100755 --- a/testautomation/dbaccess/optional/includes/db_Text.inc +++ b/testautomation/dbaccess/optional/includes/db_Text.inc @@ -51,8 +51,8 @@ testcase tCountCharacterSet(sFilename as string) '/// open the properties dialog of the open database printlog "open the properties dialog of the open database" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(1) @@ -85,17 +85,17 @@ endcase '------------------------------------------------------------------------- testcase tOpenUTF8File(sFilename as string) - '/// copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_database.txt" to your local wotk directory - printlog "copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_database.txt to your local wotk directory" - app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_database.txt"),gOfficePath + ConvertPath("user/work/text_database.txt") + '/// copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt" to your local wotk directory + printlog "copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt to your local wotk directory" + app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_Database.txt"),gOfficePath + ConvertPath("user/work/text_Database.txt") '/// open the text database create in the bas file call fOpendatabase(sFileName) '/// open the properties dialog of the open database printlog "open the properties dialog of the open database" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(1) diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc index c9d6dca4d6ec..fbdf1789451c 100755 --- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc +++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc @@ -148,8 +148,8 @@ testcase tRenameTable fFindTable("TT_1") printlog "rename the selected table" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu call hMenuSelectNr(2) call hMenuSelectNr(7) @@ -213,8 +213,8 @@ testcase tRenameTableWhichUsedInViews '/// rename the selcted table printlog "rename the selcted table" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu call hMenuSelectNr(2) call hMenuSelectNr(7) diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc index 1d38b9ad9c1c..26445ddc0b3d 100755 --- a/testautomation/dbaccess/optional/includes/frm_Forms.inc +++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc @@ -891,8 +891,8 @@ testcase tNewFolder '/// insert a new folder via INSERT/FOLDER menu printlog "insert a new folder via INSERT/FOLDER menu" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(4) hMenuSelectNr(8) @@ -944,8 +944,8 @@ testcase tRenameFolder '/// insert a new folder via INSERT/FOLDER menu printlog "insert a new folder via INSERT/FOLDER menu" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(4) hMenuSelectNr(8) @@ -967,8 +967,8 @@ testcase tRenameFolder '/// insert a new folder under the first folder printlog "insert a new folder under the first folder" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(4) hMenuSelectNr(8) @@ -989,8 +989,8 @@ testcase tRenameFolder '/// rename the firt folder printlog "rename the firt folder" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(7) diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc index c030bd53883c..016c7d79b2e8 100755 --- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc @@ -79,10 +79,10 @@ testcase tCopy_Table_Dialog_Definition_and_data '/// press CTRL + C to copy the table and CTRL + V to paste the table again printlog "press CTRL + C to copy the table and CTRL + V to paste the table again" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) - Insight.typeKeys("",true) + Database.typeKeys("",true) sleep(1) '/// the copy table dialog appear @@ -185,10 +185,10 @@ testcase tCopy_Table_Dialog_Definition '/// press CTRL + C to copy the table and CTRL + V to paste the table again printlog "press CTRL + C to copy the table and CTRL + V to paste the table again" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) - Insight.typeKeys("",true) + Database.typeKeys("",true) sleep(1) @@ -257,10 +257,10 @@ testcase tCopy_Table_Dialog_Attach_data '/// press CTRL + C to copy the table and CTRL + V to paste the table again printlog "press CTRL + C to copy the table and CTRL + V to paste the table again" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) - Insight.typeKeys("",true) + Database.typeKeys("",true) sleep(1) '/// the copy table dialog appear @@ -311,10 +311,10 @@ testcase tCopy_Table_Dialog_Attach_data '/// press CTRL + C to copy the table and CTRL + V to paste the table again printlog "press CTRL + C to copy the table and CTRL + V to paste the table again" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) - Insight.typeKeys("",true) + Database.typeKeys("",true) sleep(1) '/// the copy table dialog appear @@ -397,8 +397,8 @@ testcase tCopy_Table_from_Text_Document call fFindtable("biblio") '/// press CTRL + V to paste the table - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) '/// the copy table dialog appear @@ -460,7 +460,7 @@ testcase tCopy_Table_from_Calc_Document '/// open a new calc document printlog "open a calc new document" - gApplication = "Calc" + gApplication = "CALC" call hNewDocument '/// insert some data @@ -503,8 +503,8 @@ testcase tCopy_Table_from_Calc_Document call fFindtable("biblio2") '/// press CTRL + V to paste the table again - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) '/// the copy table dialog appear @@ -618,7 +618,7 @@ testcase tCopy_Table_from_Calc_Document printlog "close the spreadsheet document" call hCloseDocument - gApplication = "Writer" + gApplication = "WRITER" endcase '-------------------------------------------------------------------- @@ -639,8 +639,8 @@ testcase tCopy_Table_from_hsql_to_dBase '/// press CTRL + C to copy the table printlog "press CTRL + C to copy the table" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) '/// open the bibliography database printlog "open the bibliography database" @@ -653,8 +653,8 @@ testcase tCopy_Table_from_hsql_to_dBase call fFindTable("biblio") '/// press CTRL + V to paste the table - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) '/// the copy table dialog appear printlog "the copy table dialog appear" @@ -744,10 +744,10 @@ testcase tCopy_Table_Paste_Special '/// press CTRL + C to copy the table and CTRL + V to paste the table again printlog "press CTRL + C to copy the table and CTRL + V to paste the table again" - Kontext "Insight" - Insight.typeKeys("",true) + Kontext "DATABASE" + Database.typeKeys("",true) sleep(1) - Insight.UseMenu + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(5) sleep(1) diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc index fafc237ceb22..a6b1cc788590 100755 --- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc @@ -50,10 +50,10 @@ testcase tNewForm ViewForms - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) StartFormWizard @@ -106,10 +106,10 @@ testcase tCheckTemplate ViewForms - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) StartFormWizard @@ -222,10 +222,10 @@ testcase tStartFromTableContextMenu call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb")) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) '/// select the table biblio diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc index cb53cb66efde..83d3dad111fc 100755 --- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc @@ -49,12 +49,12 @@ testcase tNewReport call fOpenDatabase(gOfficePath + ConvertPath("user/database/biblio.odb")) - Kontext "Insight" + Kontext "DATABASE" ViewReports - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) StartReportWizard diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc index 0285ccd50b12..7a24feb50024 100755 --- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc +++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc @@ -79,8 +79,8 @@ testcase tMySQLODBCProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -117,8 +117,8 @@ testcase tMySQLJDBCProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -165,8 +165,8 @@ testcase tAdabasProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -205,8 +205,8 @@ testcase tOracleJDBCProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -241,8 +241,8 @@ testcase tJDBCProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -274,8 +274,8 @@ testcase tLDAPProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -315,8 +315,8 @@ testcase tEvolutionProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -357,8 +357,8 @@ testcase tMozillaProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -388,25 +388,25 @@ testcase tSpreadsheetProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) Kontext "TabGeneral" call DialogTest(TabGeneral) - DataBaseType.select(getIdForDatabaseType("Spreadsheet")) + DataBaseType.select(getIdForDatabaseType("CALC")) Kontext "ConnectionType" NextBtn.Click sleep(1) - call fCheckConnectionTabPage("Spreadsheet") + call fCheckConnectionTabPage("CALC") Kontext "ConnectionType" ConnectionType.Cancel - 'call fCheckAdvancedDialog("Spreadsheet") + 'call fCheckAdvancedDialog("CALC") call fCloseDatabase() @@ -418,8 +418,8 @@ testcase tTextProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -456,8 +456,8 @@ testcase tdBaseProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -494,8 +494,8 @@ testcase tODBCProperties ViewForms - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(2) @@ -549,8 +549,8 @@ function fCheckAdvancedDialog(sType as string) printlog "+Check the Advanced Settings for the datasource type " + sType - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(3) @@ -590,7 +590,7 @@ function fCheckAdvancedDialog(sType as string) 'call fcheckControl(BooleanComparison) 'call fcheckControl(AppendAlias) - elseif sType = "Spreadsheet" OR sType = "Mozilla" OR sType = "Evolution" OR sType = "LDAP" then + elseif sType = "CALC" OR sType = "Mozilla" OR sType = "Evolution" OR sType = "LDAP" then ' call fcheckControl(BooleanComparison) ' call fcheckControl(AppendAlias) @@ -672,7 +672,7 @@ function fCheckConnectionTabPage(sType as string) call fcheckControl(SelectPath) call fcheckControl(TestConnection) - elseif sType = "Spreadsheet" then + elseif sType = "CALC" then call fcheckControl(SpreadsheetPath) call fcheckControl(SelectPath) call fcheckControl(TestConnection) diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc index f6358ca6cd6b..7549b63d1100 100755 --- a/testautomation/dbaccess/required/includes/Forms.inc +++ b/testautomation/dbaccess/required/includes/Forms.inc @@ -54,10 +54,10 @@ testcase tNewFormDesign printlog "open biblio database" hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) '/// view forms diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index 599c767e0b7c..a20b278a971a 100755 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc @@ -69,10 +69,10 @@ testcase tTableFilters hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) TableFilters sleep(1) @@ -90,12 +90,12 @@ testcase tTableView hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) - if not InsightSwapIconView.exists(1) then + if not DatabaseSwapIconView.exists(1) then warnlog "InsightSwapIconView doesn't exists" goto endsub end if @@ -124,20 +124,20 @@ testcase tMainApp hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) - Kontext "Insight" - if Insight.exists() then + Kontext "DATABASE" + if Database.exists() then printlog "Insight appear" else warnlog "Insight doesn't appear" goto endsub end if - if InsightSwapView.exists() then + if DatabaseSwapView.exists() then printlog "InsightSwapView appear" else warnlog "InsightSwapView doesn't appear" @@ -147,7 +147,7 @@ testcase tMainApp '/// display Tables View printlog "display Tables View" ViewTables - if InsightTablesView.exists(1) then + if DatabaseTablesView.exists(1) then printlog "InsightTablesView appear" else warnlog "InsightTablesView doesn't appear" @@ -164,7 +164,7 @@ testcase tMainApp '/// display Queries View printlog "display Queries View" ViewQueries - if InsightQueriesView.exists(1) then + if DatabaseQueriesView.exists(1) then printlog "InsightQueriesView appear" else warnlog "InsightQueriesView doesn't appear" @@ -188,7 +188,7 @@ testcase tMainApp warnlog "InsightFormsView doesn't appear" goto endsub end if - Kontext "Insight" + Kontext "DATABASE" '/// count the items in the CreationList printlog "count the items in the CreationList" iCount = CreationList.getItemCount() @@ -199,7 +199,7 @@ testcase tMainApp '/// display Reports View printlog "display Reports View" ViewReports - if InsightReportsView.exists(1) then + if DatabaseReportsView.exists(1) then printlog "InsightReportsView appear" else warnlog "InsightReportsView doesn't appear" @@ -227,10 +227,10 @@ testcase tPreview hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) ViewTables @@ -239,8 +239,8 @@ testcase tPreview Kontext "ContainerView" TableTree.select 1 - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(3) hMenuSelectNr(4) hMenuSelectNr(3) @@ -255,8 +255,8 @@ testcase tPreview printlog "preview displayed" endif - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(3) hMenuSelectNr(4) hMenuSelectNr(1) @@ -282,8 +282,8 @@ testcase tMainMenuBar hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu '/// check if there are 11 items in the file menu. printlog "check if there are 11 items in the file menu." '/// + there different count related to the file pick list. @@ -311,7 +311,7 @@ testcase tMainMenuBar '/// check the FILE/AUTOPILOTS printlog "check the FILE/AUTOPILOTS" - Insight.UseMenu + Database.UseMenu hMenuSelectNr(1) ' the file menu hMenuSelectNr(4) ' the autopilots menu iCount = hMenuItemGetCount() @@ -322,7 +322,7 @@ testcase tMainMenuBar '/// check if there are 15 items in the edit menu. printlog "check if there are 15 items in the edit menu." - Insight.UseMenu + Database.UseMenu hMenuSelectNr(2) iCount = hMenuItemGetCount() if (iCount <> 15) then @@ -332,7 +332,7 @@ testcase tMainMenuBar '/// check if there are 6 items in the view menu. printlog "check if there are 6 items in the view menu." - Insight.UseMenu + Database.UseMenu hMenuSelectNr(3) iCount = hMenuItemGetCount() if (iCount <> 6) then @@ -342,7 +342,7 @@ testcase tMainMenuBar '/// check the VIEW/DATABASE OBJECTS printlog "check the VIEW/DATABASE OBJECTS" - Insight.UseMenu + Database.UseMenu hMenuSelectNr(3) hMenuSelectNr(1) iCount = hMenuItemGetCount() @@ -353,7 +353,7 @@ testcase tMainMenuBar '/// check the VIEW/SORT OBJECTS printlog "check the VIEW/SORT OBJECTS" - Insight.UseMenu + Database.UseMenu hMenuSelectNr(3) hMenuSelectNr(5) iCount = hMenuItemGetCount() @@ -364,7 +364,7 @@ testcase tMainMenuBar '/// check the VIEW/PREVIEW printlog "check the VIEW/PREVIEW" - Insight.UseMenu + Database.UseMenu hMenuSelectNr(3) hMenuSelectNr(4 ) iCount = hMenuItemGetCount() @@ -375,7 +375,7 @@ testcase tMainMenuBar '/// check if there are 8 items in the insert menu. printlog "check if there are 8 items in the insert menu." - Insight.UseMenu + Database.UseMenu hMenuSelectNr(4) iCount = hMenuItemGetCount() if (iCount <> 8) then @@ -385,7 +385,7 @@ testcase tMainMenuBar '/// check if there are 10 items in the tools menu. printlog "check if there are 10 items in the tools menu." - Insight.UseMenu + Database.UseMenu hMenuSelectNr(5) iCount = hMenuItemGetCount() if ( lcase( gPlatform ) = "osx" ) then @@ -401,7 +401,7 @@ testcase tMainMenuBar '/// check if there are 4 items in the TOOLS/MACRO menu. printlog "check if there are 4 items in the TOOLS/MACRO menu." - Insight.UseMenu + Database.UseMenu hMenuSelectNr(5) hMenuSelectNr(6) iCount = hMenuItemGetCount() @@ -420,12 +420,12 @@ testcase tDatabaseProperties hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(15) hMenuSelectNr(1) @@ -525,7 +525,7 @@ testcase tRegisterDatabaseDialog Kontext "TabRegisteredDatabase" call DialogTest( TabRegisteredDatabase ) if (RegisteredDatabases.getItemCount() = 0 ) then - warnlog "there are no registered databases. There should be at least a registered 'Bibliography' database." + warnlog "there are no registered databases. There should be at least a registered 'Bibliography' Database." Kontext "OptionenDlg" OptionenDlg.Cancel call hCloseDocument @@ -596,8 +596,8 @@ testcase tDatabaseBeamer hMenuSelectNr(1) WaitSlot(1) - Kontext "Insight" - If Insight.exists(10) then + Kontext "DATABASE" + If Database.exists(10) then printlog "database open -> OK" printlog "close the open database" call fCloseDatabase diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc index 37367e6e371d..a91d28ddb39b 100755 --- a/testautomation/dbaccess/required/includes/Query.inc +++ b/testautomation/dbaccess/required/includes/Query.inc @@ -936,16 +936,16 @@ sub initQueryDesign hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) NewQueryDesign - ' if not InsightSwapIconView.exists(1) then + ' if not DatabaseSwapIconView.exists(1) then ' warnlog "InsightSwapIconView doesn't exists" ' exit sub ' end if @@ -953,17 +953,17 @@ sub initQueryDesign ' '/// display Queries View ' printlog "display Queries View" ' ViewQueries - ' if InsightQueriesView.exists(1) then + ' if DatabaseQueriesView.exists(1) then ' printlog "InsightQueriesView appear" ' else ' warnlog "InsightQueriesView doesn't appear" ' exit sub ' end if ' - ' Kontext "Insight" + ' Kontext "DATABASE" ' CreationList.select(1) ' sleep(1) - ' Insight.TypeKeys "" , true - ' Insight.TypeKeys "" , true + ' Database.TypeKeys "" , true + ' Database.TypeKeys "" , true ' sleep(1) end sub diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index 15394e2e9b05..cc774430d51b 100755 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc @@ -69,10 +69,10 @@ testcase tMainMenuBar call hFileOpen(gOfficePath + ConvertPath("user/database/biblio.odb")) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) '/// open the report designer diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc index 01519534063d..5564ecf150fd 100755 --- a/testautomation/dbaccess/required/includes/Table.inc +++ b/testautomation/dbaccess/required/includes/Table.inc @@ -616,10 +616,10 @@ sub initTable hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc index 65eff82c0066..8cb9c3999289 100755 --- a/testautomation/dbaccess/required/includes/TableDesign.inc +++ b/testautomation/dbaccess/required/includes/TableDesign.inc @@ -494,10 +494,10 @@ sub initTableDesign hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc index 5c8c62ea334d..c8b7d747cd29 100755 --- a/testautomation/dbaccess/required/includes/Wizards.inc +++ b/testautomation/dbaccess/required/includes/Wizards.inc @@ -60,10 +60,10 @@ testcase tQueryWizard hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) call fStartQueryWizard @@ -114,10 +114,10 @@ testcase tReportWizard hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) StartReportWizard @@ -166,10 +166,10 @@ testcase tTableWizard hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) ViewTables @@ -207,10 +207,10 @@ testcase tFormWizard hFileOpen( gOfficePath & "user/database/biblio.odb" ) - Kontext "Insight" + Kontext "DATABASE" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) StartFormWizard diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc index a5efe6aa23ca..f7614cba40b3 100755 --- a/testautomation/dbaccess/tools/controltools.inc +++ b/testautomation/dbaccess/tools/controltools.inc @@ -57,7 +57,7 @@ function fSwitchAutopilotOff(SwitchAutoOff as boolean) '/// open a new document printlog "open a new document" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext "DocumentWriter" DocumentWriter.TypeKeys "tt_doc" , true @@ -590,12 +590,12 @@ sub hDrawingWithSelection ( iStartX, iStartY, iEndX, iEndY ) DocumentWriter.MouseMove ( iEndX, iEndY ) DocumentWriter.MouseUp ( iEndX, iEndY ) - case "HTMLDOKUMENT": Kontext "DocumentWriterWeb" + case "HTML": Kontext "DocumentWriterWeb" DocumentWriterWeb.MouseDown ( iStartX, iStartY ) DocumentWriterWeb.MouseMove ( iEndX, iEndY ) DocumentWriterWeb.MouseUp ( iEndX, iEndY ) - case "GLOBALDOC" : Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT" : Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown ( iStartX, iStartY ) DocumentMasterDoc.MouseMove ( iEndX, iEndY ) DocumentMasterDoc.MouseUp ( iEndX, iEndY ) diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc index 99de3175cd22..d0c8dba29d9e 100755 --- a/testautomation/dbaccess/tools/dbcreatetools.inc +++ b/testautomation/dbaccess/tools/dbcreatetools.inc @@ -859,7 +859,7 @@ function fCreateSpreadsheetDatasource(sFileName,sURL, optional sRegister) as boo Kontext "DatabaseWizard" ConnectToDatabase.Check sleep(1) - DatabaseType.Select (getIdForDatabaseType("Spreadsheet", DatabaseType) - 1) ' -1 because in the wizard there is on datasource less because of mysql + DatabaseType.Select (getIdForDatabaseType("CALC", DatabaseType) - 1) ' -1 because in the wizard there is on datasource less because of mysql sleep(1) NextBtn.Click sleep(1) @@ -1512,7 +1512,7 @@ function getIdForDatabaseType(sType as String ) as Integer endif elseif (sType = "OracleJDBC") then ii = 3 - elseif (sType = "Spreadsheet") then + elseif (sType = "CALC") then if gPlatform = "osx" then ii = 4 else diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc index f2bdfb0bb796..22e16211360c 100755 --- a/testautomation/dbaccess/tools/dbtools.inc +++ b/testautomation/dbaccess/tools/dbtools.inc @@ -122,8 +122,8 @@ function fSelectSchemaInTableFilter(sSchema as String) dim iRem as integer iRem = 0 - Kontext "Insight" - Insight.useMenu + Kontext "DATABASE" + Database.useMenu hMenuSelectNr 5 hMenuSelectNr 3 @@ -182,14 +182,14 @@ function fOpenDataBase ( sFileName , optional sPassword) sleep (3) 'click on the main window to get the focus - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) ViewTables sleep(1) - Kontext "Insight" + Kontext "DATABASE" '/// if the password is given add the password if ( Not IsMissing(sPassword) ) then printlog "set password : " + sPassword @@ -227,10 +227,10 @@ function fCloseDatabase(optional bSave) '/// parameter: '/// optionalbSave: if true the the database is saved if false then the changes are lost sleep(1) - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) - Insight.useMenu + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) + Database.useMenu hMenuSelectNr 1 hMenuSelectNr 5 diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc index f67bed5e9df8..609f58463649 100755 --- a/testautomation/dbaccess/tools/formtools.inc +++ b/testautomation/dbaccess/tools/formtools.inc @@ -49,14 +49,14 @@ function fOpenNewFormDesign() '/// open a a new form design from an open database '/// parameter: - Kontext "Insight" - if ( Insight.NotExists(3) ) then + Kontext "DATABASE" + if ( Database.NotExists(3) ) then fOpenNewFormDesign = false exit function end if - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc index e98e81e8d44f..8f4f181e51e2 100755 --- a/testautomation/dbaccess/tools/querytools.inc +++ b/testautomation/dbaccess/tools/querytools.inc @@ -100,11 +100,11 @@ function fOpenNewQueryDesign() as boolean '/// open a new query design '/// parameter: - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) - if ( Insight.NotExists(3) ) then + if ( Database.NotExists(3) ) then fOpenNewQueryDesign = false warnlog "The database windows doesn't exists" exit function @@ -124,11 +124,11 @@ function fOpenNewSQLQueryDesign() as boolean '/// open a new query design in SQL mode '/// parameter: - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) - if ( Insight.NotExists(3) ) then + if ( Database.NotExists(3) ) then fOpenNewSQLQueryDesign = false warnlog "The database windows doesn't exists" exit function @@ -148,14 +148,14 @@ function fStartQueryWizard() '/// start the query wizard '/// parameter: - Kontext "Insight" - if ( Insight.NotExists(3) ) then + Kontext "DATABASE" + if ( Database.NotExists(3) ) then fStartQueryWizard = false exit function end if - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) @@ -209,8 +209,8 @@ function fOpenQueryInSQLDesign(sQueryName as String) if ( fFindQuery(sQueryName) = true ) then printlog "Query " + sQueryName + " found -> open in sql design" - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu hMenuSelectNr(2) hMenuSelectNr(9) diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc index 333e5f8ccb9d..1050f6b5e5e4 100755 --- a/testautomation/dbaccess/tools/reporttools.inc +++ b/testautomation/dbaccess/tools/reporttools.inc @@ -56,14 +56,14 @@ function fOpenNewReportDesign() '/// open a a new report design from an open database '/// parameter: - Kontext "Insight" - if ( Insight.NotExists(3) ) then + Kontext "DATABASE" + if ( Database.NotExists(3) ) then fOpenNewReportDesign = false exit function end if - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) @@ -209,38 +209,38 @@ function fFindReport(sReportName as string) Dim iNumbersOfReports as integer Dim i as integer - Kontext "Insight" + Kontext "DATABASE" ViewReports fFindReport = false - if ( Not InsightReportsView.exists(1) ) then + if ( Not DatabaseReportsView.exists(1) ) then warnlog "The Report tree doesn't exists" exit function end if - iNumbersOfReports = InsightReportsView.getItemCount() + iNumbersOfReports = DatabaseReportsView.getItemCount() ' this select the first entry - InsightReportsView.TypeKeys "" - InsightReportsView.TypeKeys "" + DatabaseReportsView.TypeKeys "" + DatabaseReportsView.TypeKeys "" for i = 1 to iNumbersOfReports - InsightReportsView.TypeKeys "" + DatabaseReportsView.TypeKeys "" 'printlog "i = " + i 'printlog "ReportName.getItemCount = " + ReportTree.getItemCount - if InsightReportsView.getItemCount > iNumbersOfReports then - iNumbersOfReports = InsightReportsView.getItemCount() + if DatabaseReportsView.getItemCount > iNumbersOfReports then + iNumbersOfReports = DatabaseReportsView.getItemCount() endif 'printlog "ReportName.getSeltext = " + ReportTree.getSeltext - if InsightReportsView.getSeltext = sReportName then + if DatabaseReportsView.getSeltext = sReportName then fFindReport = true exit for endif - InsightReportsView.TypeKeys "" + DatabaseReportsView.TypeKeys "" next sleep(1) diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc index 1bd715ed003f..0ae6f2587ae6 100755 --- a/testautomation/dbaccess/tools/tabletools.inc +++ b/testautomation/dbaccess/tools/tabletools.inc @@ -579,18 +579,18 @@ function fOpenRelationDesign() '/// open a new relation design '/// parameter: - Kontext "Insight" - if ( Insight.NotExists(3) ) then + Kontext "DATABASE" + if ( Database.NotExists(3) ) then fOpenRelationDesign = false exit function end if - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) - Insight.UseMenu + Database.UseMenu hMenuSelectNr(5) hMenuSelectNr(1) @@ -631,15 +631,15 @@ end function function fOpenNewTableDesign printlog "fOpenNewTableDesign called" - printlog "check if Insight exists" + printlog "check if Database exists" - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) - if ( Insight.NotExists(3) ) then + if ( Database.NotExists(3) ) then fOpenNewTableDesign = false - warnlog "The Insight windows doesn't exists" + warnlog "The Database windows doesn't exists" exit function end if @@ -658,15 +658,15 @@ end function function fOpenTableInDesign(sTableName as String) printlog "fOpenTableInDesign called" - printlog "check if Insight exists" + printlog "check if Database exists" - Kontext "Insight" - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Kontext "DATABASE" + Database.MouseDown(50,50) + Database.MouseUp(50,50) - if ( Insight.NotExists(3) ) then + if ( Database.NotExists(3) ) then fOpenTableInDesign = false - warnlog "The Insight windows doesn't exists" + warnlog "The Database windows doesn't exists" exit function end if @@ -756,14 +756,14 @@ function fStartTableWizard() '/// start the table wizard '/// parameter: - Kontext "Insight" - if ( Insight.NotExists(3) ) then + Kontext "DATABASE" + if ( Database.NotExists(3) ) then fStartTableWizard = false exit function end if - Insight.MouseDown(50,50) - Insight.MouseUp(50,50) + Database.MouseDown(50,50) + Database.MouseUp(50,50) sleep(1) diff --git a/testautomation/framework/optional/f_CJK_CollationDialogue.bas b/testautomation/framework/optional/f_CJK_CollationDialogue.bas index 6d42cdacf283..9614115b8591 100755 --- a/testautomation/framework/optional/f_CJK_CollationDialogue.bas +++ b/testautomation/framework/optional/f_CJK_CollationDialogue.bas @@ -56,7 +56,7 @@ sub main call tStrokeSort call tPinyinSort - gApplication = "Calc" + gApplication = "CALC" printlog Chr(13) + "- Sort option --- Calc" call tSortOptionTest_1 diff --git a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas index c482af8784e9..8f05f67359bc 100755 --- a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas +++ b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas @@ -67,7 +67,7 @@ sub main call tWriterUIChangesTest11 call tProlongedVowelsTest1 printlog Chr(13) + "- CJK Feature Switch test -- Calc" - gApplication = "Calc" + gApplication = "CALC" '--Turn on/off Asian language support --" call tCalcUIChangesTest_10 printlog Chr(13) + "- CJK Feature Switch test -- Impress" @@ -97,7 +97,7 @@ sub LoadIncludeFiles use "framework\tools\includes\CJK_tools.inc" - gApplication = "Writer" + gApplication = "WRITER" call GetUseFiles end sub diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas index a666143163e4..fb33fa326802 100755 --- a/testautomation/framework/optional/f_CJK_GridLayout.bas +++ b/testautomation/framework/optional/f_CJK_GridLayout.bas @@ -90,7 +90,7 @@ sub LoadIncludeFiles use "framework\tools\includes\CJK_tools.inc" - gApplication = "Writer" + gApplication = "WRITER" Call GetUseFiles End sub diff --git a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas index 2fd98ae78ada..2f8991ee9304 100755 --- a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas +++ b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas @@ -74,6 +74,6 @@ sub LoadIncludeFiles use "framework\tools\includes\CJK_tools.inc" - gApplication = "Writer" + gApplication = "WRITER" Call GetUseFiles End sub diff --git a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas index f8ab636e2025..df4107caf2a1 100755 --- a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas +++ b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas @@ -59,7 +59,7 @@ sub main Call NewSortingForJapanese_4 'Check the number of key type in data/sort printLog Chr(13) + "-New Sorting Algorithm For Japanese test -- Calc" - gApplication = "Calc" + gApplication = "CALC" Call NewSortingForJapanese_5 'Check the number of key type in data/sort -- Calc Call hStatusOut @@ -79,7 +79,7 @@ sub LoadIncludeFiles use "framework\tools\includes\CJK_tools.inc" - gApplication = "Writer" + gApplication = "WRITER" Call GetUseFiles end sub diff --git a/testautomation/framework/optional/f_configuration.bas b/testautomation/framework/optional/f_configuration.bas index f99d1dbadd2e..9f68550646f8 100755 --- a/testautomation/framework/optional/f_configuration.bas +++ b/testautomation/framework/optional/f_configuration.bas @@ -52,7 +52,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Desktop" + gApplication = "BACKGROUND" Call GetUseFiles end sub diff --git a/testautomation/framework/optional/f_loadsave_general.bas b/testautomation/framework/optional/f_loadsave_general.bas index 1b0497e60f9e..8f826dd46af7 100755 --- a/testautomation/framework/optional/f_loadsave_general.bas +++ b/testautomation/framework/optional/f_loadsave_general.bas @@ -55,7 +55,7 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "DESKTOP" + gApplication = "BACKGROUND" End Sub diff --git a/testautomation/framework/optional/f_ole.bas b/testautomation/framework/optional/f_ole.bas index 9bdd2db1fc07..432f3c0bdc4a 100755 --- a/testautomation/framework/optional/f_ole.bas +++ b/testautomation/framework/optional/f_ole.bas @@ -105,7 +105,7 @@ sub LoadIncludeFiles use "global\tools\includes\optional\t_stringtools.inc" Call GetUseFiles - gApplication = "DESKTOP" + gApplication = "BACKGROUND" End Sub diff --git a/testautomation/framework/optional/f_options_ooo.bas b/testautomation/framework/optional/f_options_ooo.bas index 6ac79d8490be..6730568cbc15 100755 --- a/testautomation/framework/optional/f_options_ooo.bas +++ b/testautomation/framework/optional/f_options_ooo.bas @@ -88,7 +88,7 @@ sub LoadIncludeFiles use "framework\tools\includes\options_tools.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc index c5720c232adf..3ad36ac5b596 100755 --- a/testautomation/framework/optional/includes/basic_delete_modules.inc +++ b/testautomation/framework/optional/includes/basic_delete_modules.inc @@ -48,7 +48,7 @@ testcase tDeleteModulesAtRunningBasic '///
    '///
  • open a new writer-doc
    • printlog "open a new writer-doc" - gApplication = "Writer" + gApplication = "WRITER" Call hNewDocument() diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc index 1b23f58b5514..579ce197f521 100755 --- a/testautomation/framework/optional/includes/basic_ide.inc +++ b/testautomation/framework/optional/includes/basic_ide.inc @@ -53,7 +53,7 @@ testcase tBasic_IDE_Toolbar_Module '///+
  • Open a new writer-doc
    • printlog "open a new writer-doc" - gApplication = "Writer" + gApplication = "WRITER" hCreateDocument() '///+
  • Create a new module for the new document (named TTModule)
    • diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc index 86b266ffda85..e741f5fd0499 100755 --- a/testautomation/framework/optional/includes/basic_macros.inc +++ b/testautomation/framework/optional/includes/basic_macros.inc @@ -127,7 +127,7 @@ testcase tMakro_Dialog const CMACRO = "MacroDlg" - gApplication = "Writer" + gApplication = "WRITER" '///+
  • Open a new document
    • printlog( "Open a new document" ) brc = hCreateDocument() diff --git a/testautomation/framework/optional/includes/basic_modulehide.inc b/testautomation/framework/optional/includes/basic_modulehide.inc index aa5f127ead2e..96d3f585584f 100755 --- a/testautomation/framework/optional/includes/basic_modulehide.inc +++ b/testautomation/framework/optional/includes/basic_modulehide.inc @@ -48,7 +48,7 @@ testcase tBasicIdeModuleHide dim brc as boolean dim cDefaultTabName as string - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument() '///
  • Create a new BASIC module for the current (writer) document
    • diff --git a/testautomation/framework/optional/includes/basic_modulenames.inc b/testautomation/framework/optional/includes/basic_modulenames.inc index 85c58ddf1b73..00d559ebddf3 100755 --- a/testautomation/framework/optional/includes/basic_modulenames.inc +++ b/testautomation/framework/optional/includes/basic_modulenames.inc @@ -48,7 +48,7 @@ testcase tBasicIdeModuleNames const CMODULE = "TModuleNames" dim cTabName as string - gApplication = "Writer" + gApplication = "WRITER" hCreateDocument() ' ------ prerequisites --------- @@ -287,7 +287,7 @@ function hBasicModuleCreateNew() as boolean const CFN = "hBasicModuleCreateNew::" '///+
  • Open a new writer document
    • - gApplication = "Writer" + gApplication = "WRITER" brc = hCreateDocument() '///+
  • Open the BASIC Macro Organizer
    • diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc index 0705aabb2b38..321930e5db67 100755 --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc @@ -44,7 +44,7 @@ sub sToolsCustomizeKeyboardFunction dim sTemp as string ' go through all applications: - aApplication()=array("WRITER","MASTERDOC","HTMLDOKUMENT","CALC","IMPRESS","DRAW","MATH","INSIGHT") + aApplication()=array("WRITER","MASTERDOCUMENT","HTML","CALC","IMPRESS","DRAW","MATH","DATABASE") a=uBound(aApplication()) sTemp = gApplication for i = 0 to a diff --git a/testautomation/framework/optional/includes/fontworkgallery.inc b/testautomation/framework/optional/includes/fontworkgallery.inc index d0337fc72974..b282caaf9c84 100755 --- a/testautomation/framework/optional/includes/fontworkgallery.inc +++ b/testautomation/framework/optional/includes/fontworkgallery.inc @@ -41,7 +41,7 @@ sub sFontworkGalleryUpdate dim sApplication dim i,a as integer - sApplication = array("WRITER","MASTERDOC","CALC","IMPRESS","DRAW") + sApplication = array("WRITER","MASTERDOCUMENT","CALC","IMPRESS","DRAW") ' for every application a = uBound(sApplication()) diff --git a/testautomation/framework/optional/includes/loadsave_files.inc b/testautomation/framework/optional/includes/loadsave_files.inc index 601025362424..a219405f0269 100755 --- a/testautomation/framework/optional/includes/loadsave_files.inc +++ b/testautomation/framework/optional/includes/loadsave_files.inc @@ -52,7 +52,7 @@ sub l1_lasp Call tFileLoadSave gApplication = "HTML" Call tFileLoadSave - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tFileLoadSave end sub @@ -91,7 +91,7 @@ testcase tFileLoadSave Call hNewDocument '///+ insert a short text in Writer/MasterDoc/WriterWeb document - if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOC" then + if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOCUMENT" then Kontext "DocumentWriter" DocumentWriter.TypeKeys gApplication + " => Load - Save - Load - Save" DocumentWriter.TypeKeys "- first saving / loading" @@ -130,7 +130,7 @@ testcase tFileLoadSave '///change the file and save if again ( edit/save ) PrintLog "- change and save" '///+ insert a short text in Writer/MasterDoc/WriterWeb document - if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOC" then + if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOCUMENT" then Kontext "DocumentWriter" DocumentWriter.TypeKeys "- file/save" end if @@ -166,7 +166,7 @@ testcase tFileLoadSave sleep( 2 ) '///+ insert a short text in Writer/MasterDoc/WriterWeb document - if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOC" then + if gApplication = "WRITER" OR gApplication = "HTML" OR gApplication = "MASTERDOCUMENT" then Kontext "DocumentWriter" gMouseClick ( 50, 50 ) Kontext "DocumentWriter" diff --git a/testautomation/framework/optional/includes/loadsave_new.inc b/testautomation/framework/optional/includes/loadsave_new.inc index d12d44540e27..eb84c6e33fb3 100755 --- a/testautomation/framework/optional/includes/loadsave_new.inc +++ b/testautomation/framework/optional/includes/loadsave_new.inc @@ -41,19 +41,19 @@ testcase NewCloseDok PrintLog " open and close all documenttypes" '///open all applications and close the document '///file/new/textdocument => file/close - Call hNewCloseDocument ("Writer") + Call hNewCloseDocument ("WRITER") '///file/new/spreadsheet => file/close - Call hNewCloseDocument ("Calc") + Call hNewCloseDocument ("CALC") '///file/new/presentation => file/close - Call hNewCloseDocument ("Impress") + Call hNewCloseDocument ("IMPRESS") '///file/new/drawing => file/close - Call hNewCloseDocument ("Draw") + Call hNewCloseDocument ("DRAW") '///file/new/formular => file/close - Call hNewCloseDocument ("Math") + Call hNewCloseDocument ("MATH") '///file/new/HTML document => file/close - Call hNewCloseDocument ("HTMLDokument") + Call hNewCloseDocument ("HTML") '///file/new/master document => file/close - Call hNewCloseDocument ("MASTERDOC") + Call hNewCloseDocument ("MASTERDOCUMENT") endcase testcase NewDok @@ -67,13 +67,13 @@ testcase NewDok '///+a new HTML-doc '///+a new Master-doc '///+a new Math-doc - Call NewDocument ("Writer") - Call NewDocument ("Calc") - Call NewDocument ("Impress") - Call NewDocument ("Draw") - Call NewDocument ("Math") - Call NewDocument ("HTMLDokument") - Call NewDocument ("MASTERDOC") + Call NewDocument ("WRITER") + Call NewDocument ("CALC") + Call NewDocument ("IMPRESS") + Call NewDocument ("DRAW") + Call NewDocument ("MATH") + Call NewDocument ("HTML") + Call NewDocument ("MASTERDOCUMENT") '///close one by one with file/close PrintLog " Close all documents ( file/close )" diff --git a/testautomation/framework/optional/includes/menuentries.inc b/testautomation/framework/optional/includes/menuentries.inc index ed6350b56028..a26ee0cade32 100755 --- a/testautomation/framework/optional/includes/menuentries.inc +++ b/testautomation/framework/optional/includes/menuentries.inc @@ -41,7 +41,7 @@ sub t_getMenuText dim k,c as integer dim sApplication() as string - sApplication = array("WRITER","MASTERDOC","HTMLDOKUMENT","CALC","IMPRESS","DRAW","MATH","BASIC","INSIGHT") + sApplication = array("WRITER","MASTERDOCUMENT","HTML","CALC","IMPRESS","DRAW","MATH","BASIC","DATABASE") ' for every application c = uBound(sApplication()) @@ -50,7 +50,7 @@ sub t_getMenuText printlog "********** " + gApplication call s_getMenuText next k - gApplication = "Writer" + gApplication = "WRITER" end sub testcase s_getMenuText diff --git a/testautomation/framework/optional/includes/ole_2.inc b/testautomation/framework/optional/includes/ole_2.inc index 49f210b05b7e..742a3322bf4e 100755 --- a/testautomation/framework/optional/includes/ole_2.inc +++ b/testautomation/framework/optional/includes/ole_2.inc @@ -57,7 +57,7 @@ testcase tCheckTheOLEObjectDialog case 2 : gApplication = "CALC" case 3 : gApplication = "IMPRESS" case 4 : gApplication = "DRAW" - case 5 : gApplication = "GLOBALDOC" + case 5 : gApplication = "MASTERDOCUMENT" end select lListe ( 0 ) = 0 : lListSoll ( 0 ) = 0 @@ -108,7 +108,7 @@ testcase tCheckTheOLEObjectDialog ListAppend ( lListSoll (), gOLEWriter ) ListAppend ( lListSoll (), gOLEChart ) ListAppend ( lListSoll (), gOLEMath ) - case "GLOBALDOC" : ListAppend ( lListSoll (), gOLECalc ) + case "MASTERDOCUMENT" : ListAppend ( lListSoll (), gOLECalc ) ListAppend ( lListSoll (), gOLEImpress ) ListAppend ( lListSoll (), gOLEDraw ) ListAppend ( lListSoll (), gOLEChart ) diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc index 7fd9bbf34b08..b047c57a3f9a 100755 --- a/testautomation/framework/optional/includes/ole_3.inc +++ b/testautomation/framework/optional/includes/ole_3.inc @@ -145,7 +145,7 @@ sub hInsertOLEObject( bRemoveFocus as boolean, cOLEObject as string, cOleType as goto testend endif - if ( gApplication = "MASTERDOC" and cOleType = "WRITER" ) then + if ( gApplication = "MASTERDOCUMENT" and cOleType = "WRITER" ) then printlog( "Skipping " & cOleType & " as OLE object" ) goto testend endif diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc index 1217c412fd14..aa5537efa3e9 100755 --- a/testautomation/framework/optional/includes/ole_tools.inc +++ b/testautomation/framework/optional/includes/ole_tools.inc @@ -71,7 +71,7 @@ sub hOleSelektieren ( xStart%, yStart%, xEnde%, yEnde% ) DocumentMath.MouseDown xStart%, yStart% DocumentMath.MouseMove xEnde%, yEnde% DocumentMath.MouseUp xEnde%, yEnde% - case "GLOBALDOC":Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT":Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% DocumentMasterDoc.MouseMove xEnde%, yEnde% DocumentMasterDoc.MouseUp xEnde%, yEnde% @@ -82,10 +82,12 @@ end sub sub hSetToStandardView ( DieApp$ ) select case DieApp$ - case "WRITER" : gApplication = "WRITER" + case "WRITER" + gApplication = "WRITER" Call hNewDocument Kontext "DocumentWriter" - case "GLOBALDOC" : gApplication = "GLOBALDOC" + case "MASTERDOCUMENT" + gApplication = "MASTERDOCUMENT" Call hNewDocument Kontext "DocumentMasterDoc" end select @@ -108,31 +110,38 @@ sub SendEscape(optional iTimes as Integer) '///+press [ESCAPE] printlog( " - send keystroke to document" ) select case gApplication - case "WRITER" : Kontext "DocumentWriter" + case "WRITER" + Kontext "DocumentWriter" for i = 1 to iTimes sleep( ICWAIT ) DocumentWriter.TypeKeys( "" , 1 , TRUE ) next i - case "CALC" : Kontext "DocumentCalc" + case "CALC" + Kontext "DocumentCalc" for i = 1 to iTimes sleep( ICWAIT ) DocumentCalc.TypeKeys( "" , 1 , TRUE ) next i - case "GLOBALDOC" : Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" for i = 1 to iTimes sleep( ICWAIT ) DocumentMasterDoc.TypeKeys( "" , 1 , TRUE ) next i - case "DRAW" : Kontext "DocumentDraw" + case "DRAW" + Kontext "DocumentDraw" for i = 1 to iTimes sleep( ICWAIT ) DocumentDraw.TypeKeys( "" , 1 , TRUE ) next i - case "IMPRESS" : Kontext "DocumentImpress" + case "IMPRESS" + Kontext "DocumentImpress" for i = 1 to iTimes sleep( ICWAIT ) DocumentImpress.TypeKeys( "" , 1 , TRUE ) next i + case else + warnlog( "Invalid gApplication: " & gApplication ) end select end sub @@ -141,7 +150,7 @@ end sub sub DisableNavigator() printlog( " - disable the navigator in globaldoc/writer" ) select case gApplication - case "GLOBALDOC" : Kontext "NavigatorGlobalDoc" + case "MASTERDOCUMENT" : Kontext "NavigatorGlobalDoc" if NavigatorGlobalDoc.Exists() then ViewNavigator endif @@ -178,12 +187,20 @@ function getExtension( optional sExtension as string ) as string qaerrorlog( "getExtension is outdated. Use hGetSuffix( ... ) instead" ) printlog("l1_ole_ttols::getExtension:: - define the expected file extension" ) select case gApplication - case "WRITER" : sExtension = ".sxw" - case "DRAW" : sExtension = ".sxd" - case "IMPRESS" : sExtension = ".sxi" - case "CALC" : sExtension = ".sxc" - case "MATH" : sExtension = ".sxm" - case "GLOBALDOC" : sExtension = ".sgl" + case "WRITER" + sExtension = ".sxw" + case "DRAW" + sExtension = ".sxd" + case "IMPRESS" + sExtension = ".sxi" + case "CALC" + sExtension = ".sxc" + case "MATH" + sExtension = ".sxm" + case "MASTERDOCUMENT" + sExtension = ".sgl" + case else + warnlog( "Invalid gApplication: " & gApplication ) end select getExtension = sExtension end function @@ -195,7 +212,8 @@ sub OLESetFocus() const ICWAIT as Integer = 10 PrintLog " - set focus to OLE object (edit mode)" select case gApplication - case "WRITER" : printlog " Select and deselect " + gApplication + case "WRITER" + printlog " Select and deselect " + gApplication Kontext "DocumentWriter" DocumentWriter.TypeKeys("" , 4 , TRUE ) DocumentWriter.TypeKeys("" , 3 , TRUE ) @@ -206,11 +224,13 @@ sub OLESetFocus() 'DocumentWriter.MouseDoubleClick ( 50, 50 ) sleep( ICWAIT ) call SendEscape( 3 ) '(to close the float as well) - case "IMPRESS" : printlog " Select and deselect " + gApplication + case "IMPRESS" + printlog " Select and deselect " + gApplication Kontext "DocumentImpress" DocumentImpress.MouseDoubleClick ( 50, 50 ) sleep( ICWAIT ) - case "CALC" : printlog " Select and deselect " + gApplication + case "CALC" + printlog " Select and deselect " + gApplication Kontext "DocumentCalc" DocumentCalc.TypeKeys( "" , 5 , TRUE ) DocumentCalc.TypeKeys( "" , 3 , TRUE ) @@ -220,12 +240,16 @@ sub OLESetFocus() 'DocumentCalc.MouseDoubleClick ( 20, 20 ) sleep( ICWAIT ) call SendEscape( 3 ) '(to close the float as well) - case "GLOBALDOC" : printlog " Select and deselect " + gApplication + case "MASTERDOCUMENT" + printlog " Select and deselect " + gApplication Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown( 50 , 50 , 1 ) DocumentMasterDoc.MouseUp( 50 , 50 , 1 ) EditObjectEdit sleep( ICWAIT ) + case else + warnlog( "Invalid gApplication: " & gApplication ) + end select end sub @@ -237,7 +261,8 @@ sub OLESetFocus2() const ICWAIT as Integer = 1 PrintLog " - set focus to OLE object (edit mode)" select case gApplication - case "WRITER" : Kontext "DocumentWriter" + case "WRITER" + Kontext "DocumentWriter" try FormatObject Kontext ' This is by intention, do not change! @@ -252,7 +277,8 @@ sub OLESetFocus2() sleep( ICWAIT * 2 ) gMouseClick ( 5 , 5 ) 'out of edit mode gMouseClick ( 5 , 5 ) 'remove focus - case "DRAW" : Kontext "DocumentDraw" + case "DRAW" + Kontext "DocumentDraw" if OLEApp = "MATH" then DocumentDraw.MouseDoubleClick ( 45, 46 ) else @@ -260,14 +286,16 @@ sub OLESetFocus2() end if sleep( ICWAIT * 5 ) gMouseClick ( 1 , 1 ) - case "IMPRESS" : Kontext "DocumentImpress" + case "IMPRESS" + Kontext "DocumentImpress" printlog( " - using accessibility shortcuts for objecthandling" ) printlog( " (select, activate and release object)" ) DocumentImpress.TypeKeys( "" , 5 , TRUE ) DocumentImpress.TypeKeys( "" ) sleep( ICWAIT * 2 ) call SendEscape() - case "CALC" : Kontext "DocumentCalc" + case "CALC" + Kontext "DocumentCalc" printlog( " - using accessibility shortcuts for objecthandling" ) printlog( " (select, activate and release object)" ) DocumentCalc.TypeKeys( "" , 5 , TRUE ) @@ -277,7 +305,8 @@ sub OLESetFocus2() DocumentCalc.TypeKeys( "" , 1 , TRUE ) sleep( ICWAIT * 2 ) call sendEscape() - case "GLOBALDOC": Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" try FormatObject sleep( ICWAIT ) @@ -293,6 +322,9 @@ sub OLESetFocus2() Sleep( ICWAIT ) Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDoubleClick ( 1 , 1 ) + case else + warnlog( "Invalid gApplication: " & gApplication ) + end select end sub @@ -304,7 +336,8 @@ sub OLESetFocus3() const ICWAIT as Integer = 1 printlog( " - set focus to OLE object (edit mode)" ) select case gApplication - case "WRITER" : Kontext "DocumentWriter" + case "WRITER" + Kontext "DocumentWriter" try FormatObject sleep( ICWAIT ) @@ -319,18 +352,21 @@ sub OLESetFocus3() endcatch sleep( ICWAIT * 5 ) gMouseClick ( 1, 1 ) - case "DRAW" : Kontext "DocumentDraw" + case "DRAW" + Kontext "DocumentDraw" DocumentDraw.TypeKeys ("") DocumentDraw.MouseDoubleClick ( 50, 50 ) sleep( ICWAIT * 5 ) gMouseClick ( 1, 1 ) - case "IMPRESS" : Kontext "DocumentImpress" + case "IMPRESS" + Kontext "DocumentImpress" printlog( " - Using accessibility-shortcuts to manipulate object") DocumentImpress.TypeKeys( "" ) sleep( ICWAIT ) DocumentImpress.TypeKeys( "" ) call SendEscape( 3 ) - case "GLOBALDOC" : Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" try FormatObject sleep( ICWAIT ) @@ -345,6 +381,9 @@ sub OLESetFocus3() endcatch sleep( ICWAIT * 5 ) call SendEscape( 2 ) + case else + warnlog( "Invalid gApplication: " & gApplication ) + end select end sub @@ -355,7 +394,7 @@ sub OLERemoveFocus printlog( "Remove focus from OLE object for " & gApplication ) select case gApplication case "WRITER" : call SendEscape( 2 ) - case "GLOBALDOC" : Kontext "DocumentMasterDoc" + case "MASTERDOCUMENT" : Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDoubleClick ( 1, 1 ) case "IMPRESS" : gMouseClick ( 5, 99 ) case "CALC" : Kontext "DocumentCalc" diff --git a/testautomation/framework/optional/includes/options_ls_2.inc b/testautomation/framework/optional/includes/options_ls_2.inc index f6860d979a32..de87d22d2997 100755 --- a/testautomation/framework/optional/includes/options_ls_2.inc +++ b/testautomation/framework/optional/includes/options_ls_2.inc @@ -47,7 +47,7 @@ testcase func_LoadSaveGeneral_1 Dim sFilename, sFilebak as String Dim i as Integer - gApplication = "Writer" + gApplication = "WRITER" '///load&save/general : functionality test of all settings in 'Save'-group diff --git a/testautomation/framework/optional/includes/options_so_4.inc b/testautomation/framework/optional/includes/options_so_4.inc index ae5881585258..bbb2a5aea86a 100755 --- a/testautomation/framework/optional/includes/options_so_4.inc +++ b/testautomation/framework/optional/includes/options_so_4.inc @@ -142,7 +142,7 @@ testcase func_StarOfficeGeneral_2 printlog "- working with activated HelpAgent" printlog " - check display duration of 10sec" printlog " new writer-doc" - gApplication = "Writer" + gApplication = "WRITER" hNewDocument '///+tools / options / staroffice / general -> help agent diff --git a/testautomation/framework/optional/includes/options_so_5.inc b/testautomation/framework/optional/includes/options_so_5.inc index ff2afde5ef6d..897dd6de0abe 100755 --- a/testautomation/framework/optional/includes/options_so_5.inc +++ b/testautomation/framework/optional/includes/options_so_5.inc @@ -452,7 +452,7 @@ testcase func_StarOfficeView_6 '///open a new writer-document printlog "open a new writer-document" - gApplication = "Writer" + gApplication = "WRITER" hNewDocument printlog " - view" diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc index 65df7c8f4d58..53c318566797 100755 --- a/testautomation/framework/optional/includes/security_certification_dialogs.inc +++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc @@ -63,7 +63,7 @@ testcase tCertificationDialogs active.yes() printlog( CFN & "Allow to save the document" ) else - if ( gApplication <> "MASTERDOC" ) then + if ( gApplication <> "MASTERDOCUMENT" ) then warnlog( CFN & "No message that the file must be saved to be signed" ) else printlog( CFN & "OK - No save-message for Masterdoc." ) @@ -78,7 +78,7 @@ testcase tCertificationDialogs endif Speichern.click() else - if ( gApplication <> "MASTERDOC" ) then + if ( gApplication <> "MASTERDOCUMENT" ) then warnlog( CFN & "Save As Dialog is not open" ) else printlog( CFN & "OK - No filesave for Masterdoc." ) @@ -90,7 +90,7 @@ testcase tCertificationDialogs printlog( CFN & "Digital signatures is open" ) DigitalSignature.cancel() else - if ( gApplication <> "MASTERDOC" ) then + if ( gApplication <> "MASTERDOCUMENT" ) then warnlog( CFN & "Digital Signatures Dialog is not open" ) else printlog( CFN & "OK - No signature dialog for Masterdoc." ) diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas index a996c2b0d064..aaeff2f2543e 100755 --- a/testautomation/framework/required/f_first.bas +++ b/testautomation/framework/required/f_first.bas @@ -46,12 +46,12 @@ sub main call hStatusIn ("framework", "f_first.bas") call tAllNew - gApplication = "Draw" + gApplication = "DRAW" call tInFilterCountCompare call tQuickInsertGraphNotAsLink call tJava - gApplication = "Writer" + gApplication = "WRITER" call tToolsOptionsTest call tDatabaseCheck call tHelpRegistration diff --git a/testautomation/framework/required/f_topten.bas b/testautomation/framework/required/f_topten.bas index 60b2ae765f96..a3d4d9519b57 100755 --- a/testautomation/framework/required/f_topten.bas +++ b/testautomation/framework/required/f_topten.bas @@ -67,7 +67,7 @@ sub LoadIncludeFiles use "global\tools\includes\optional\t_docfuncs.inc" - gApplication = "DESKTOP" + gApplication = "BACKGROUND" Call GetUseFiles end sub diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc index 146238feb073..eac71a14bec5 100755 --- a/testautomation/framework/required/includes/first.inc +++ b/testautomation/framework/required/includes/first.inc @@ -52,7 +52,7 @@ testcase tAllNew '///+
  • Close the document window without saving it
printlog "" try - gApplication = "Writer" + gApplication = "WRITER" printlog " - " + gApplication Call hNewDocument (TRUE) @@ -76,7 +76,7 @@ testcase tAllNew '///+
  • Check the default filter name (fDocumentCheck)
    • '///+
  • Close the document window without saving it
    • try - gApplication = "Calc" + gApplication = "CALC" printlog " - " + gApplication Call hNewDocument (TRUE) @@ -100,7 +100,7 @@ testcase tAllNew '///+
  • Check the default filter name (fDocumentCheck)
    • '///+
  • Close the document window without saving it
    • try - gApplication = "Impress" + gApplication = "IMPRESS" printlog " - " + gApplication Call hNewDocument (TRUE) @@ -124,7 +124,7 @@ testcase tAllNew '///+
  • Check the default filter name (fDocumentCheck)
    • '///+
  • Close the document window without saving it
    • try - gApplication = "Draw" + gApplication = "DRAW" printlog " - " + gApplication Call hNewDocument (TRUE) InsertSlide @@ -164,7 +164,7 @@ testcase tAllNew '///+
  • Check the default filter name (fDocumentCheck)
    • '///+
  • Close the document window without saving it
    • try - gApplication = "Math" + gApplication = "MATH" printlog " - " + gApplication Call hNewDocument (TRUE) Call SchreibenInMathDok("a over b") @@ -185,7 +185,7 @@ testcase tAllNew '///+
  • Close the document window without saving it
    • try - gApplication = "GlobalDokument" + gApplication = "MASTERDOCUMENT" printlog " - " + gApplication Call hNewDocument (TRUE) Kontext "DocumentWriter" @@ -285,15 +285,15 @@ endcase '------------------------------------------------------------------------- testcase tDatabaseCheck - '/// Open bibliography database. + '/// Open bibliography Database. printlog "" try - gApplication = "Writer" + gApplication = "WRITER" hFileOpen( ConvertPath(gOfficePath & "user\database\biblio.odb" ) '/// Check if database is open printlog "check if database is open" - Kontext "Insight" - if (Insight.exists()) then + Kontext "DATABASE" + if (Database.exists()) then printlog "Database open" '/// Click on the table icon and check if tables are displayed printlog "click on the table icon and check if tables are displayed" @@ -310,7 +310,7 @@ testcase tDatabaseCheck end if Call hCloseDocument catch - warnlog "error while open database." + warnlog "error while open Database." endcatch endcase diff --git a/testautomation/framework/required/includes/standard_toolbar_1.inc b/testautomation/framework/required/includes/standard_toolbar_1.inc index 28b70168f3c6..bea6034a1d44 100755 --- a/testautomation/framework/required/includes/standard_toolbar_1.inc +++ b/testautomation/framework/required/includes/standard_toolbar_1.inc @@ -84,7 +84,7 @@ testcase tStandardBar_1 '///+
  • Open a master-doc and check if the Standardbar does exist
    • Printlog " - GLOBALDOC: check if Standardbar exists" - gApplication = "GLOBALDOC" + gApplication = "MASTERDOCUMENT" hAccessStandardBar() '///+
  • Go back to a writer document
    • diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc index 1670cde6fc9c..c2a4bb581c06 100755 --- a/testautomation/framework/required/includes/standard_toolbar_3.inc +++ b/testautomation/framework/required/includes/standard_toolbar_3.inc @@ -66,7 +66,7 @@ testcase tStandardBar_3 '///
      printlog "Save File" - gApplication = "Calc" + gApplication = "CALC" '///+
    • New Spreadsheet document, ensure that the navigator is closed
      • printlog( "New Spreadsheet document" ) diff --git a/testautomation/framework/required/includes/standard_toolbar_6.inc b/testautomation/framework/required/includes/standard_toolbar_6.inc index cb50f948b765..0329ba8f1bbf 100755 --- a/testautomation/framework/required/includes/standard_toolbar_6.inc +++ b/testautomation/framework/required/includes/standard_toolbar_6.inc @@ -53,7 +53,7 @@ testcase tStandardBar_6 '///+
    • Open a new writer doc
      • printlog " - Writer" - gApplication = "Writer" + gApplication = "WRITER" hCreateDocument() '///+click on 'new' @@ -70,7 +70,7 @@ testcase tStandardBar_6 '///+
    • Open a new calc doc
      • printlog " - Calc" - gApplication = "Calc" + gApplication = "CALC" hCreateDocument() '///+
    • Click on 'new'
      • @@ -87,7 +87,7 @@ testcase tStandardBar_6 '///+
    • Open a new draw doc
      • printlog " - Draw" - gApplication = "Draw" + gApplication = "DRAW" hCreateDocument() kontext "standardbar" @@ -103,7 +103,7 @@ testcase tStandardBar_6 '///+
    • Open a new impress doc
      • printlog " - Impress" - gApplication = "Impress" + gApplication = "IMPRESS" hCreateDocument() kontext "standardbar" @@ -136,7 +136,7 @@ testcase tStandardBar_6 '///+
    • Open a new master document
      • printlog " - Master-document" - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" hCreateDocument() '///+
    • Click on "new"
      • @@ -159,7 +159,7 @@ testcase tStandardBar_6 '///+
    • Open a new math document
      • printlog " - Math" - gApplication = "Math" + gApplication = "MATH" hCreateDocument() '///+
    • Click on 'new'
      • diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc index 291864d42245..a633fe609075 100755 --- a/testautomation/framework/required/includes/topten.inc +++ b/testautomation/framework/required/includes/topten.inc @@ -56,7 +56,7 @@ sub topten gApplication = "HTML" printlog( "** " + gApplication ) call Top_ten_test - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" printlog( "** " + gApplication ) call Top_ten_test @@ -107,7 +107,7 @@ testcase Top_ten_test case "DRAW" : sFilter1 = "draw8" case "IMPRESS" : sFilter1 = "impress8" case "MATH" : sFilter1 = "math8" - case "MASTERDOC" : sFilter1 = "writerglobal8" + case "MASTERDOCUMENT" : sFilter1 = "writerglobal8" case "HTML" : sFilter1 = "HTML" : bExport = FALSE case else : warnlog "Invalid gApplication: " & gApplication end select @@ -129,7 +129,7 @@ testcase Top_ten_test case "DRAW" : sFilter2 = "StarDraw 5.0" case "IMPRESS" : sFilter2 = "StarImpress 5.0" case "MATH" : sFilter2 = "StarMath 5.0" - case "MASTERDOC" : sFilter2 = "StarWriter 5.0/GlobalDocument" + case "MASTERDOCUMENT" : sFilter2 = "StarWriter 5.0/GlobalDocument" case else : warnlog "Invalid gApplication: " & gApplication end select @@ -243,7 +243,7 @@ sub CutCopyPaste endif select case gApplication - case "WRITER", "HTMLDOKUMENT", "MASTERDOC" + case "WRITER", "HTML", "MASTERDOCUMENT" kontext "documentwriter" DocumentWriter.TypeKeys "This is a test." printlog( " cut" ) diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc index 69a649f95a7d..c4fae870c1b7 100755 --- a/testautomation/framework/required/includes/window_functions.inc +++ b/testautomation/framework/required/includes/window_functions.inc @@ -226,36 +226,36 @@ sub sAllWindowTitle '///+
    • writer
      • gApplication = "WRITER" - call tCheckWindowTitle("swriter","Writer") + call tCheckWindowTitle("swriter","WRITER") '///+
    • MasterDoc
      • - gApplication = "MASTERDOC" - call tCheckWindowTitle("sglobal","Writer") + gApplication = "MASTERDOCUMENT" + call tCheckWindowTitle("sglobal","WRITER") '///+
    • HTML document
      • - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" call tCheckWindowTitle("sweb","Writer/Web") '///+
    • Calc
      • gApplication = "CALC" - call tCheckWindowTitle("scalc","Calc") + call tCheckWindowTitle("scalc","CALC") '///+
    • Impress
      • gApplication = "IMPRESS" - call tCheckWindowTitle("simpress","Impress") + call tCheckWindowTitle("simpress","IMPRESS") '///+
    • Draw
      • gApplication = "DRAW" - call tCheckWindowTitle("sdraw","Draw") + call tCheckWindowTitle("sdraw","DRAW") '///+
    • Math
      • gApplication = "MATH" - call tCheckWindowTitle("smath","Math") + call tCheckWindowTitle("smath","MATH") qaerrorlog( "Excluded BASE and BACKINGWINDOW" ) - 'gApplication = "INSIGHT" - 'call tCheckWindowTitle("insight","Base") + 'gApplication = "DATABASE" + 'call tCheckWindowTitle("DATABASE","Base") 'fileclose 'call tCheckWindowTitle("soffice","") @@ -365,7 +365,7 @@ testcase tCheckWindowTitle(sApplication as string, sReference as string) endif case"chart": - case"insight": + case"DATABASE": case"soffice": brc = hDestroyDocument() end select @@ -404,7 +404,7 @@ testcase tCheckWindowTitle(sApplication as string, sReference as string) case"basic": brc = hDestroyDocument() case"chart": - case"insight": + case"DATABASE": case"soffice": hCreateDocument() hCreateDocument() diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index fa75d62b2f4d..dec3b6ca1177 100755 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc @@ -202,7 +202,7 @@ function hStandardbarItemGetCount() as integer const CFN = "hStandardbarItemGetCount::" - gApplication = "Writer" + gApplication = "WRITER" printlog( CFN & "Enter" ) '///+
    • Look for additional icons on the standardbar (through extensions)
      • diff --git a/testautomation/framework/tools/includes/window_tools.inc b/testautomation/framework/tools/includes/window_tools.inc index cd5e113c450e..b9e441de250f 100755 --- a/testautomation/framework/tools/includes/window_tools.inc +++ b/testautomation/framework/tools/includes/window_tools.inc @@ -75,7 +75,7 @@ function hMaximizeDocument() as boolean case "MATH" : Kontext "DocumentMath" DocumentMath.maximize() brc = DocumentMath.isMaximized() - case "MASTERDOC" : Kontext "DocumentWriter" + case "MASTERDOCUMENT" : Kontext "DocumentWriter" DocumentWriter.maximize() brc = DocumentWriter.isMaximized() case "HTML" : Kontext "DocumentWriter" diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc index a80e43f00a97..dc0a85a50bb1 100755 --- a/testautomation/framework/tools/includes/wizards.inc +++ b/testautomation/framework/tools/includes/wizards.inc @@ -422,7 +422,7 @@ function hWaitForWizard() as integer Kontext "AutopilotPraesentation1" if ( AutopilotPraesentation1.exists() ) then printlog( CFN & "Presentation Wizard is open" ) - iOpen = hGetWizardParams( "PRESENTATION" , "ID" ) + iOpen = hGetWizardParams( "IMPRESS" , "ID" ) exit for endif diff --git a/testautomation/global/input/applications.txt b/testautomation/global/input/applications.txt index 67ae5ab0838f..8812b895b4f0 100755 --- a/testautomation/global/input/applications.txt +++ b/testautomation/global/input/applications.txt @@ -8,7 +8,7 @@ 3=IMPRESS 4=DRAW 5=MATH -6=MASTERDOC +6=MASTERDOCUMENT 7=HTML 8=INSIGHT @@ -20,7 +20,7 @@ CALC=Spreadsheet document IMPRESS=Presentation document DRAW=Drawing document MATH=Formula document -MASTERDOC=Master document +MASTERDOCUMENT=Master document HTML=HTML document INSIGHT=Database @@ -32,7 +32,7 @@ CALC=DocumentCalc IMPRESS=DocumentImpress DRAW=DocumentDraw MATH=DocumentMath -MASTERDOC=DocumentWriter +MASTERDOCUMENT=DocumentWriter HTML=DocumentWriter INSIGHT= diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc index 5535e5245c1a..c26c7d4aed9a 100755 --- a/testautomation/global/required/includes/g_numberformatter1.inc +++ b/testautomation/global/required/includes/g_numberformatter1.inc @@ -697,7 +697,7 @@ testcase tButtonsNumberformatter else warnlog "Format Box shows wrong value, " & sFormatText endif - if gApplication ="Calc" then 'checking Application for using Reset button + if gApplication ="CALC" then 'checking Application for using Reset button Zurueck.Click if Category.GetSelIndex = 7.then printlog "Reset to Time." @@ -724,7 +724,7 @@ testcase tButtonsNumberformatter warnlog "Format Box shows wrong value: " & sFormatText endif - if gApplication = "Calc" then + if gApplication = "CALC" then TabChartAxisNumbers.TypeKeys "", true 'using ALT+R to reset back from percent to time if Category.GetSelIndex = 7 then printlog "ALT-R changed back to Time." diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 88d6bb89a055..a9f5a2b72550 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -57,7 +57,7 @@ sub tToolsOptionsTest ' The test will exist with warnlog, if iSectionNumber is 0 sErrMes = "" select case uCase(gApplication) - case "WRITER","MASTERDOC","HTMLDOKUMENT": iSectionNumber = 8 + case "WRITER","MASTERDOCUMENT","HTML": iSectionNumber = 8 case "IMPRESS","DRAW","MATH","CALC" : iSectionNumber = 7 end select ' common testcases are placed in this library @@ -75,7 +75,7 @@ sub tToolsOptionsTest iSectionNumber = 8 Call tToolsOptionsTextdocument - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tToolsOptionsHTMLDocument gApplication = "CALC" @@ -108,7 +108,7 @@ testcase tToolsOptionsStarOffice warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest" goto endsub endif - if gApplication <> "DESKTOP" then Call hNewDocument + if gApplication <> "BACKGROUND" then Call hNewDocument ToolsOptions ToPosInOptionlist ( 1 ) Kontext "ExtrasOptionenDlg" @@ -238,8 +238,8 @@ testcase tToolsOptionsStarOffice PasswordDLG.cancel() else select case uCase(gApplication) - case "WRITER","MASTERDOC" :WarnLog "Protect-Button is disabled." - case "MATH","IMPRESS","DRAW","HTMLDOKUMENT","CALC" :PrintLog "Protect-Button is disabled." + case "WRITER","MASTERDOCUMENT" :WarnLog "Protect-Button is disabled." + case "MATH","IMPRESS","DRAW","HTML","CALC" :PrintLog "Protect-Button is disabled." end select endif sleep(1) @@ -318,7 +318,7 @@ testcase tToolsOptionsStarOffice Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -333,7 +333,7 @@ testcase tToolsOptionsLoadSave warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest" goto endsub endif - if gApplication <> "DESKTOP" then Call hNewDocument + if gApplication <> "BACKGROUND" then Call hNewDocument '/// Tools / Options / Load/Save ToolsOptions ToPosInOptionlist (2) @@ -386,7 +386,7 @@ testcase tToolsOptionsLoadSave Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -403,7 +403,7 @@ testcase tToolsOptionsLanguageSettings warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest" goto endsub endif - if gApplication <> "DESKTOP" then Call hNewDocument + if gApplication <> "BACKGROUND" then Call hNewDocument '/// Tools / Options / Language settings ToolsOptions ToPosInOptionlist ( 3 ) @@ -549,7 +549,7 @@ testcase tToolsOptionsLanguageSettings Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -565,7 +565,7 @@ testcase tToolsOptionsInternet warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest" goto endsub endif - if gApplication <> "DESKTOP" then Call hNewDocument + if gApplication <> "BACKGROUND" then Call hNewDocument '/// Tools / Options / Internet ToolsOptions '/// (The last section in Tools / Options is Internet) @@ -666,7 +666,7 @@ testcase tToolsOptionsInternet Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase diff --git a/testautomation/global/required/includes/g_option2.inc b/testautomation/global/required/includes/g_option2.inc index e86817db8852..83d666e1adfd 100644 --- a/testautomation/global/required/includes/g_option2.inc +++ b/testautomation/global/required/includes/g_option2.inc @@ -58,7 +58,7 @@ testcase tToolsOptionsTextdocument goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / Options / Text document @@ -221,7 +221,7 @@ testcase tToolsOptionsTextdocument Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -238,7 +238,7 @@ testcase tToolsOptionsHTMLDocument goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / options / HTML Document @@ -311,7 +311,7 @@ testcase tToolsOptionsHTMLDocument Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -328,7 +328,7 @@ testcase tToolsOptionsSpreadsheet goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / Options / Spreadsheet @@ -404,7 +404,7 @@ testcase tToolsOptionsSpreadsheet Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -422,7 +422,7 @@ testcase tToolsOptionsPresentation goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if kontext "DocumentImpress" @@ -497,7 +497,7 @@ testcase tToolsOptionsPresentation Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -514,7 +514,7 @@ testcase tToolsOptionsDrawing goto endsub end if '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if Kontext "DocumentDraw" @@ -594,7 +594,7 @@ testcase tToolsOptionsDrawing Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -610,7 +610,7 @@ testcase tToolsOptionsFormula goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / Options / Formula @@ -627,7 +627,7 @@ testcase tToolsOptionsFormula Kontext "OptionenDlg" OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase @@ -641,7 +641,7 @@ testcase tToolsOptionsChart goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / Options / Chart @@ -657,7 +657,7 @@ testcase tToolsOptionsChart '/// Close the options dialog Kontext "OptionenDlg" OptionenDlg.Cancel - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then '/// Close bthe document Call hCloseDocument end if @@ -674,7 +674,7 @@ testcase tToolsOptionsDataSources goto endsub endif '/// Create a new document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hNewDocument end if '/// Tools / Options / Data source @@ -705,7 +705,7 @@ testcase tToolsOptionsDataSources '/// Close the options dialog OptionenDlg.Cancel '/// Close the document - if gApplication <> "DESKTOP" then + if gApplication <> "BACKGROUND" then Call hCloseDocument end if endcase diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index ccd78d04016c..956f8633df24 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -192,21 +192,21 @@ sub GetOfficeInformation else if gNetzInst = TRUE then ' wenn es sich um eine Netzwerkinstallation handelt select case UCase(gApplication) - case "WRITER", "TEXTDOKUMENT" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "WRITER" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-writer" - case "CALC", "TABELLENDOKUMENT" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "CALC" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-calc" - case "IMPRESS", "PRAESENTATION" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "IMPRESS" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "private:factory/simpress" - case "DRAW", "ZEICHNUNG" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "DRAW" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-draw" - case "GLOBALDOC", "GLOBALDOKUMENT": sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "MASTERDOCUMENT": sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-global" - case "MATH", "FORMEL" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "MATH" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-math" - case "HTML", "HTMLDOKUMENT" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "HTML" : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-web" - case else : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case else : sAppExe = gNetzOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt end select 'If it's a normal (FAT) office else @@ -219,21 +219,21 @@ sub GetOfficeInformation end if else select case UCase(gApplication) - case "WRITER", "TEXTDOKUMENT" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "WRITER" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-writer" - case "CALC", "TABELLENDOKUMENT" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "CALC" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-calc" - case "IMPRESS", "PRAESENTATION" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "IMPRESS" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "private:factory/simpress" - case "DRAW", "ZEICHNUNG" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "DRAW" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-draw" - case "GLOBALDOC", "GLOBALDOKUMENT": sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "MASTERDOCUMENT": sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-global" - case "MATH", "FORMEL" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "MATH" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-math" - case "HTML", "HTMLDOKUMENT" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case "HTML" : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt sFactory = "-web" - case else : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt + case else : sAppExe = gOfficePath & sPlatformProgramPath & gPathSigne & "soffice" & sPlatformBinExt end select end if end if diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index 79ffad4aab11..32899a4d39bb 100755 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc @@ -73,7 +73,7 @@ sub hStatusIn ( sTestAppArea as String, sTestname as String, optional sName as S gWarningSum = getWarningCount() gQaErrorSum = getQaErrorCount() - ' make sure we have everything to update the status-database. + ' make sure we have everything to update the status-Database. gDatabasePath = getDatabasePath(privateDatabasePath) if ("" = gDatabasePath) then 'Disable statusfeature, because the public filespace is not available. diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc index e630c9602bcd..eb3007a528b9 100755 --- a/testautomation/global/tools/includes/optional/t_docfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc @@ -54,7 +54,7 @@ function hUseImpressAutopilot( bEnable as boolean ) as boolean '///+
    • Open Tools/Options, go to Presentataion/General page
      • ToolsOptions - hToolsOptions( "Presentation" , "General" ) + hToolsOptions( "IMPRESS" , "General" ) '///+
    • Check or uncheck to start with autopilot
      • Kontext "TabSonstigesDraw" @@ -191,7 +191,7 @@ function hChangeDoc() as string select case gApplication '///+
    • WRITER: Type some text
      • - case "WRITER", "HTML", "MASTERDOC" + case "WRITER", "HTML", "MASTERDOCUMENT" Kontext "DocumentWriter" DocumentWriter.TypeKeys "This doc is changed!" hChangeDoc() = "Changed WRITER/HTML/MASTERDOC" @@ -404,7 +404,7 @@ function hDocumentTypeKeys( cString as string ) as boolean DocumentDraw.typeKeys( cString ) case "MATH" : kontext "DocumentMath" DocumentMath.typeKeys( cString ) - case "MASTERDOC": kontext "DocumentWriter" + case "MASTERDOCUMENT": kontext "DocumentWriter" DocumentWriter.typeKeys( cString ) case "HTML" : kontext "DocumentWriter" DocumentWriter.typeKeys( cString ) diff --git a/testautomation/global/tools/includes/optional/t_toolbar_impress.inc b/testautomation/global/tools/includes/optional/t_toolbar_impress.inc index 52ea929311df..436f33adffa8 100644 --- a/testautomation/global/tools/includes/optional/t_toolbar_impress.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_impress.inc @@ -250,7 +250,7 @@ function fGetObjectImpress(sToolbar as String , sObject as String) as Integer case "Can't Restore" : fGetObjectImpress = 23 '----------------- 24 case "Chart" : fGetObjectImpress = 25 - case "Spreadsheet" : fGetObjectImpress = 26 + case "CALC" : fGetObjectImpress = 26 case "Hyperlink" : fGetObjectImpress = 27 '----------------- 28 case "Display Grid" : fGetObjectImpress = 29 diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc index f41600eafefa..e6f5c88e40e7 100644 --- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc @@ -393,8 +393,8 @@ function fGetObject(sToolbar as String , sObject as String) as Integer select case gApplication case "WRITER" : fGetObject = fGetObjectWriter(sToolbar , sObject) - case "HTMLDOKUMENT" : fGetObject = fGetObjectWriter(sToolbar , sObject) - case "MASTERDOC" : fGetObject = fGetObjectWriter(sToolbar , sObject) + case "HTML" : fGetObject = fGetObjectWriter(sToolbar , sObject) + case "MASTERDOCUMENT" : fGetObject = fGetObjectWriter(sToolbar , sObject) case "CALC" : fGetObject = fGetObjectCalc(sToolbar , sObject) diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc index 1e6cdd511fae..9fd5531921a9 100644 --- a/testautomation/global/tools/includes/optional/t_ui_filters.inc +++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc @@ -67,7 +67,7 @@ sub GetDefaultFilterNames() cAPIFilters( 1 ) = hGetValueForKeyAsString( sFilterArray(), "WRITER" ) cAPIFilters( 2 ) = hGetValueForKeyAsString( sFilterArray(), "CALC" ) cAPIFilters( 3 ) = hGetValueForKeyAsString( sFilterArray(), "IMPRESS" ) - cAPIFilters( 4 ) = hGetValueForKeyAsString( sFilterArray(), "MASTERDOC" ) + cAPIFilters( 4 ) = hGetValueForKeyAsString( sFilterArray(), "MASTERDOCUMENT" ) cAPIFilters( 5 ) = hGetValueForKeyAsString( sFilterArray(), "MATH" ) cAPIFilters( 6 ) = hGetValueForKeyAsString( sFilterArray(), "DRAW" ) cAPIFilters( 7 ) = hGetValueForKeyAsString( sFilterArray(), "HTML" ) diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc index 3737ac2b3656..f15cdef0a360 100644 --- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc +++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc @@ -60,7 +60,7 @@ testcase tToolsXMLFilterSettings Dim bJavaBroken as boolean 'Not being used for Writer/WEB - if lcase(gApplication) = "htmldokument" then + if gApplication = "HTML" then goto endsub endif @@ -739,9 +739,9 @@ sub sRemoveXSLTFilter Dim ia as integer Dim sTempReadFilterName as string Kontext "XMLFilterSettings" - select case lcase(gApplication) - case "calc" : sXMLFilterType = "excel" - case "writer" : sXMLFilterType = "word" + select case gApplication + case "CALC" : sXMLFilterType = "excel" + case "WRITER" : sXMLFilterType = "word" case else : sXMLFilterType = "docbook" end select iCountOfDefaultXSLTStyles = FilterList.GetItemCount diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc index 14b7d498511c..ca88c6eda974 100755 --- a/testautomation/global/tools/includes/required/t_dir.inc +++ b/testautomation/global/tools/includes/required/t_dir.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -35,79 +35,62 @@ '* '* short description : functions for directories and files; execution happens in the office '* -'****************************************************************** -' #1 hFileExists -' #1 hDirectoryExists -' #1 hKillFile -' #1 DirNameList -' #1 GetFileNameList -' #1 GetFileList -' #1 GetDirList -' #1 GetAllDirList -' #1 GetAllFileList -' #1 KillFileList -' #1 KillDirList -' #1 PfadExtract -' #1 hPfadname -' #1 DateiExtract -' #1 DateiOhneExt -' #1 GetExtention '\************************************************************************ function hFileExists ( Dat as String ) as Boolean -'/// Checks if a file exists -'/// Input: Filename with complete path -'/// Return: TRUE or FALSE if the file exists. + '/// Checks if a file exists + '/// Input: Filename with complete path + '/// Return: TRUE or FALSE if the file exists. if app.Dir ( Dat ) = "" then - hFileExists = FALSE + hFileExists = FALSE else - hFileExists = TRUE + hFileExists = TRUE end if end function ' '------------------------------------------------------------------------------- ' function hDirectoryExists ( Verz as String ) as Boolean -'/// Checks if a directory exists -'/// Input: Directory with complete path -'/// Return: TRUE or FALSE if the directory exists. - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work - if right ( Verz, 1 ) <> gPathSigne then Verz = Verz + gPathsigne - if app.Dir ( Verz, 16 ) = "" then - hDirectoryExists = FALSE - else - hDirectoryExists = TRUE - end if + '/// Checks if a directory exists + '/// Input: Directory with complete path + '/// Return: TRUE or FALSE if the directory exists. + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + if right ( Verz, 1 ) <> gPathSigne then Verz = Verz + gPathsigne + if app.Dir ( Verz, 16 ) = "" then + hDirectoryExists = FALSE + else + hDirectoryExists = TRUE + end if end function ' '------------------------------------------------------------------------------- ' function hKillFile ( Dat as String ) as Boolean -'/// Delete a file -'/// Input: File with complete path -'/// Return: TRUE or FALSE success on deleting? + '/// Delete a file + '/// Input: File with complete path + '/// Return: TRUE or FALSE success on deleting? if app.Dir ( Dat ) <> "" then - try - app.kill ( Dat ) - catch - endcatch - if app.Dir ( Dat ) <> "" then - hKillFile = FALSE - else - hKillFile = TRUE - end if + try + app.kill ( Dat ) + catch + endcatch + if app.Dir ( Dat ) <> "" then + hKillFile = FALSE + else + hKillFile = TRUE + end if else - hKillFile = TRUE + hKillFile = TRUE end if end function ' '------------------------------------------------------------------------------- ' function DirNameList (ByVal sPfad$ , lsDirName() as String ) as Integer -'/// seperate a path in its parts -'/// Input: Path to seperate; Empty list, because it get's reset in this function!; -'/// Return: Number on entries in the list; list with entries - Dim i% : Dim Pos% + '/// seperate a path in its parts + '/// Input: Path to seperate; Empty list, because it get's reset in this function!; + '/// Return: Number on entries in the list; list with entries + Dim i% : Dim Pos% lsDirName(0) = 0 do Pos% = InStr(1, sPfad$, gPathsigne ) ' got a part of teh path @@ -123,21 +106,21 @@ end function '------------------------------------------------------------------------------- ' function GetFileNameList ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get files from a directory that match the pattern and append them to a list (without path) -'/// Input: Directory with complete path; Search Pattern, e.g *.*; List -'/// Return: count of appended entries; updated list - Dim Count% : Dim Datname as String - Dim i as Integer + '/// Get files from a directory that match the pattern and append them to a list (without path) + '/// Input: Directory with complete path; Search Pattern, e.g *.*; List + '/// Return: count of appended entries; updated list + Dim Count% : Dim Datname as String + Dim i as Integer Count% = 0 - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne Datname = app.Dir( sPath$ + sMatch$ , 0) ' 0: normal files for i=1 to 5 - if Right ( Datname, 1 ) = "." then - Datname = app.Dir - else - i=10 - end if + if Right ( Datname, 1 ) = "." then + Datname = app.Dir + else + i=10 + end if next i do until Len(Datname) = 0 @@ -153,39 +136,39 @@ end function '------------------------------------------------------------------------------- ' function GetFileList ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get files from a directory that match the pattern and append them to a list (with path) -'/// Input: Directory with complete path; Search Pattern, e.g *.*; List -'/// Return: count of appended entries; updated list - Dim Count% : Dim Datname as String - Dim i as Integer + '/// Get files from a directory that match the pattern and append them to a list (with path) + '/// Input: Directory with complete path; Search Pattern, e.g *.*; List + '/// Return: count of appended entries; updated list + Dim Count% : Dim Datname as String + Dim i as Integer Count% = 0 - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne Datname = app.Dir( sPath$ + sMatch$ , 0) for i=1 to 5 - if Right ( Datname, 1 ) = "." then - Datname = app.Dir - else - i=10 - end if + if Right ( Datname, 1 ) = "." then + Datname = app.Dir + else + i=10 + end if next i do until Len(Datname) = 0 lsFile(0) = Val(lsFile(0)) + 1 lsFile( lsFile(0) ) =sPath$ + Datname Count% = Count% + 1 - + ' if the number of files in the directory exceeds the arraysize do not ' crash but try to handle the situation gracefully. Of course this ' makes the testresults worthless... if ( Count% = ubound( lsFile() ) ) then - warnlog ( "List of files exceeds bounds of array." ) - printlog( "Processing of this directory will be discontinued." ) - printlog( "Last processed file was: " & Datname ) - printlog( "Arraysize is: " & ubound( lsFile() ) ) - Datname = "" + warnlog ( "List of files exceeds bounds of array." ) + printlog( "Processing of this directory will be discontinued." ) + printlog( "Last processed file was: " & Datname ) + printlog( "Arraysize is: " & ubound( lsFile() ) ) + Datname = "" else - Datname = app.Dir + Datname = app.Dir endif loop GetFileList = Count% @@ -194,35 +177,35 @@ end function '------------------------------------------------------------------------------- ' function GetDirList ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get Subdirectories from a directory and append them to a list (with path) -'/// Input: Directory with complete path; Search Pattern, e.g *; List -'/// Return: count of appended entries; updated list - Dim Count% - Dim i as Integer - Dim Verzeichnis as String - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work - if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne - Verzeichnis = app.Dir( sPath$ + sMatch$ , 16) - Count% = 0 - - do until Len(Verzeichnis) = 0 - if Verzeichnis <> "." AND Verzeichnis <> ".." AND Lcase(Verzeichnis) <> ".svn" then - lsFile(0) = Val(lsFile(0)) + 1 - lsFile( lsFile(0) ) = sPath$ + Verzeichnis + gPathSigne - Count% = Count% + 1 - end if - Verzeichnis = app.Dir - loop - GetDirList = Count% + '/// Get Subdirectories from a directory and append them to a list (with path) + '/// Input: Directory with complete path; Search Pattern, e.g *; List + '/// Return: count of appended entries; updated list + Dim Count% + Dim i as Integer + Dim Verzeichnis as String + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne + Verzeichnis = app.Dir( sPath$ + sMatch$ , 16) + Count% = 0 + + do until Len(Verzeichnis) = 0 + if Verzeichnis <> "." AND Verzeichnis <> ".." AND Lcase(Verzeichnis) <> ".svn" then + lsFile(0) = Val(lsFile(0)) + 1 + lsFile( lsFile(0) ) = sPath$ + Verzeichnis + gPathSigne + Count% = Count% + 1 + end if + Verzeichnis = app.Dir + loop + GetDirList = Count% end function ' '------------------------------------------------------------------------------- ' function GetAllDirList ( byVal sPath$, byVal sMatch$ ,lsFile() as String ) as integer -'/// Get all directorys recursiv that match the pattern and append them to a list -'/// Input: Directory with complete path; Search Pattern, e.g *; Empty list, because it get's reset in this function!; -'/// Return: Count of appended entries (1. entry is the whole path); updated list - Dim Count% : Dim DirCount% + '/// Get all directorys recursiv that match the pattern and append them to a list + '/// Input: Directory with complete path; Search Pattern, e.g *; Empty list, because it get's reset in this function!; + '/// Return: Count of appended entries (1. entry is the whole path); updated list + Dim Count% : Dim DirCount% DirCount% = 1 ' dummy Count% = 1 @@ -240,10 +223,10 @@ end function '------------------------------------------------------------------------------- ' function GetAllFileList ( byVal sPath$, byVal sMatch$ ,lsFile() as String ) as integer -'/// Get all Files recursiv (including in subdirectories) that match the pattern and append them to a list -'/// Input: Directory with complete path; Search Pattern, e.g *.*; Empty list, because it get's reset in this function!; -'/// Return: Count of appended entries (1. entry is the whole path); updated list - Dim DirCount% : Dim FileCount% : Dim Count% + '/// Get all Files recursiv (including in subdirectories) that match the pattern and append them to a list + '/// Input: Directory with complete path; Search Pattern, e.g *.*; Empty list, because it get's reset in this function!; + '/// Return: Count of appended entries (1. entry is the whole path); updated list + Dim DirCount% : Dim FileCount% : Dim Count% Dim lsDir(1000) as String DirCount% = GetAllDirList( sPath$, "*", lsDir() ) ' erstmal _alle_ Verzeichnisse @@ -261,63 +244,63 @@ end function '------------------------------------------------------------------------------- ' function KillFileList ( lsList() as String ) as Boolean -'/// Delete all files in the list -'/// Input: List with files -'/// Return: TRUE or FALSE if files are killed; modified list with not deleted files. - Dim i as Integer - Dim FehlerListe ( 1000 ) as String + '/// Delete all files in the list + '/// Input: List with files + '/// Return: TRUE or FALSE if files are killed; modified list with not deleted files. + Dim i as Integer + Dim FehlerListe ( 1000 ) as String - FehlerListe ( 0 ) = 0 - for i=1 to ListCount ( lsList() ) - try - app.kill ( lsList(i) ) - catch - ListAppend ( FehlerListe (), lsList(i) ) - endcatch - next i + FehlerListe ( 0 ) = 0 + for i=1 to ListCount ( lsList() ) + try + app.kill ( lsList(i) ) + catch + ListAppend ( FehlerListe (), lsList(i) ) + endcatch + next i - lsList(0) = 0 ' delete old list - KillFileList = TRUE - for i=1 to ListCount ( FehlerListe () ) - KillFileList = FALSE - ListAppend ( lsList(), FehlerListe (i) ) - next i + lsList(0) = 0 ' delete old list + KillFileList = TRUE + for i=1 to ListCount ( FehlerListe () ) + KillFileList = FALSE + ListAppend ( lsList(), FehlerListe (i) ) + next i end function ' '------------------------------------------------------------------------------- ' function KillDirList ( lsList() as String ) as Boolean -'/// Delete all directories in the list -'/// Input: List with directories -'/// Return: TRUE or FALSE if directories are killed; modified list with not deleted directories. - Dim i as Integer - Dim FehlerListe ( 1000 ) as String + '/// Delete all directories in the list + '/// Input: List with directories + '/// Return: TRUE or FALSE if directories are killed; modified list with not deleted directories. + Dim i as Integer + Dim FehlerListe ( 1000 ) as String - FehlerListe ( 0 ) = 0 - for i=1 to ListCount ( lsList() ) - try - app.rmDir ( lsList(i) ) - catch - ListAppend ( FehlerListe (), lsList(i) ) - endcatch - next i + FehlerListe ( 0 ) = 0 + for i=1 to ListCount ( lsList() ) + try + app.rmDir ( lsList(i) ) + catch + ListAppend ( FehlerListe (), lsList(i) ) + endcatch + next i - lsList(0) = 0 ' delete old list - KillDirList = TRUE - for i=1 to ListCount ( FehlerListe () ) - KillDirList = FALSE - ListAppend ( lsList(), FehlerListe (i) ) - next i + lsList(0) = 0 ' delete old list + KillDirList = TRUE + for i=1 to ListCount ( FehlerListe () ) + KillDirList = FALSE + ListAppend ( lsList(), FehlerListe (i) ) + next i end function ' '------------------------------------------------------------------------------- ' function PfadExtract ( sFiledat$ ) as string -'/// Get the path from a file -'/// Input: file with path -'/// Return: path without the filename - Dim s$ : Dim i% : Dim k% - dim ls(25) as String + '/// Get the path from a file + '/// Input: file with path + '/// Return: path without the filename + Dim s$ : Dim i% : Dim k% + dim ls(25) as String s$ = "" i% = DirNameList( sFileDat$, ls() ) @@ -332,65 +315,65 @@ end function '------------------------------------------------------------------------------- ' function hPfadname (Dateipfad$) as string -'/// Get the path from a file -'/// Input: file with path -'/// Return: path without the filename - dim wh as integer + '/// Get the path from a file + '/// Input: file with path + '/// Return: path without the filename + dim wh as integer - for wh = len(Dateipfad$) to 1 step -1 - if mid(Dateipfad$,wh,1) = gPathSigne then - hpfadname = left(Dateipfad$,wh) - exit for - else - hpfadname = Dateipfad$ - end if - next wh + for wh = len(Dateipfad$) to 1 step -1 + if mid(Dateipfad$,wh,1) = gPathSigne then + hpfadname = left(Dateipfad$,wh) + exit for + else + hpfadname = Dateipfad$ + end if + next wh end function ' '------------------------------------------------------------------------------- ' function DateiExtract ( sFileDat$ ) -'/// Get the filename from a path -'/// Input: path with file -'/// Return: filename without the path - Dim i% - dim ls(20) as String + '/// Get the filename from a path + '/// Input: path with file + '/// Return: filename without the path + Dim i% + dim ls(20) as String - i% = DirNameList( sFileDat$, ls() ) - DateiExtract = ls(i%) + i% = DirNameList( sFileDat$, ls() ) + DateiExtract = ls(i%) end function ' '------------------------------------------------------------------------------- ' function DateiOhneExt (Datei$) as String -'/// Get the filename without the extension -'/// Input: filename -'/// Return: filename without the extension - Dim wh as Integer - Dim dummy as String + '/// Get the filename without the extension + '/// Input: filename + '/// Return: filename without the extension + Dim wh as Integer + Dim dummy as String - dummy = Datei$ - for wh = 1 to len(dummy) - if mid(dummy,wh,1) = "." then - dummy = left(dummy,wh - 1) - wh = len(dummy) + 1 - else - dummy = dummy - end if - next wh - DateiOhneExt = dummy + dummy = Datei$ + for wh = 1 to len(dummy) + if mid(dummy,wh,1) = "." then + dummy = left(dummy,wh - 1) + wh = len(dummy) + 1 + else + dummy = dummy + end if + next wh + DateiOhneExt = dummy end function ' '------------------------------------------------------------------------------- ' function GetExtention ( Datei as String ) as string -'/// Get the extension from a file -'/// Input: filename -'/// Return: extension of the file - Dim i% - for i% = 1 to len ( Datei ) - if mid(Datei,i%,1) = "." then Datei = right( Datei, len(Datei)-i%) - next i% - GetExtention = Datei + '/// Get the extension from a file + '/// Input: filename + '/// Return: extension of the file + Dim i% + for i% = 1 to len ( Datei ) + if mid(Datei,i%,1) = "." then Datei = right( Datei, len(Datei)-i%) + next i% + GetExtention = Datei end function diff --git a/testautomation/global/tools/includes/required/t_dirloc.inc b/testautomation/global/tools/includes/required/t_dirloc.inc index 79a17525615e..6f64df945e64 100755 --- a/testautomation/global/tools/includes/required/t_dirloc.inc +++ b/testautomation/global/tools/includes/required/t_dirloc.inc @@ -1,6 +1,6 @@ '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -34,76 +34,63 @@ '* '* short description : functions for directories and files; execution happens in the testtool '* -'************************************************************************* -' #1 hFileExistsLocal -' #1 hDirectoryExistsLocal -' #1 hKillFileLocal -' #1 DirNameListLocal -' #1 GetFileNameListLocal -' #1 GetFileListLocal -' #1 GetDirListLocal -' #1 GetAllDirListLocal -' #1 GetAllFileListLocal -' #1 KillFileListLocal -' #1 KillDirListLocal -' #1 GetFileSizesLocal '\************************************************************************ function hFileExistsLocal ( Dat as String ) as Boolean -'/// Checks if a file exists -'/// Input: Filename with complete path -'/// Return: TRUE or FALSE if the file exists. + '/// Checks if a file exists + '/// Input: Filename with complete path + '/// Return: TRUE or FALSE if the file exists. if Dir ( Dat ) = "" then - hFileExistsLocal = FALSE + hFileExistsLocal = FALSE else - hFileExistsLocal = TRUE + hFileExistsLocal = TRUE end if end function ' '------------------------------------------------------------------------------- ' function hDirectoryExistsLocal ( Verz as String ) as Boolean -'/// Checks if a directory exists -'/// Input: Directory with complete path -'/// Return: TRUE or FALSE if the directory exists. - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + '/// Checks if a directory exists + '/// Input: Directory with complete path + '/// Return: TRUE or FALSE if the directory exists. + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work if right ( Verz, 1 ) <> gPathSigne then Verz = Verz + gPathSigne if Dir ( Verz, 16 ) = "" then - hDirectoryExistsLocal = FALSE + hDirectoryExistsLocal = FALSE else - hDirectoryExistsLocal = TRUE + hDirectoryExistsLocal = TRUE end if end function ' '------------------------------------------------------------------------------- ' function hKillFileLocal ( Dat as String ) as Boolean -'/// Delete a file -'/// Input: File with complete path -'/// Return: TRUE or FALSE success on deleting? + '/// Delete a file + '/// Input: File with complete path + '/// Return: TRUE or FALSE success on deleting? if Dir ( Dat ) <> "" then - try - kill ( Dat ) - catch - endcatch - if Dir ( Dat ) <> "" then - hKillFileLocal = FALSE - else - hKillFileLocal = TRUE - end if + try + kill ( Dat ) + catch + endcatch + if Dir ( Dat ) <> "" then + hKillFileLocal = FALSE + else + hKillFileLocal = TRUE + end if else - hKillFileLocal = TRUE + hKillFileLocal = TRUE end if end function ' '------------------------------------------------------------------------------- ' function DirNameListLocal (ByVal sPfad$ , lsDirName() as String ) as Integer -'/// seperate a path in its parts -'/// Input: Path to seperate; Empty list, because it get's reset in this function!; -'/// Return: Number on entries in the list; list with entries - Dim i% - Dim Pos% + '/// seperate a path in its parts + '/// Input: Path to seperate; Empty list, because it get's reset in this function!; + '/// Return: Number on entries in the list; list with entries + Dim i% + Dim Pos% lsDirName(0) = 0 do @@ -120,16 +107,16 @@ end function '------------------------------------------------------------------------------- ' function GetFileNameListLocal ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get files from a directory that match the pattern and append them to a list (without path) -'/// Input: Directory with complete path; Search Pattern, e.g *.*; List -'/// Return: count of appended entries; updated list - Dim Count% - Dim Datname as String + '/// Get files from a directory that match the pattern and append them to a list (without path) + '/// Input: Directory with complete path; Search Pattern, e.g *.*; List + '/// Return: count of appended entries; updated list + Dim Count% + Dim Datname as String Count% = 0 if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work Datname = Dir( sPath$ + sMatch$ , 0) do until Len(Datname) = 0 @@ -145,16 +132,16 @@ end function '------------------------------------------------------------------------------- ' function GetFileListLocal ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get files from a directory that match the pattern and append them to a list (with path) -'/// Input: Directory with complete path; Search Pattern, e.g *.*; List -'/// Return: count of appended entries; updated list - Dim Count% - Dim Datname as String + '/// Get files from a directory that match the pattern and append them to a list (with path) + '/// Input: Directory with complete path; Search Pattern, e.g *.*; List + '/// Return: count of appended entries; updated list + Dim Count% + Dim Datname as String Count% = 0 if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work Datname = Dir( sPath$ + sMatch$ , 0) do until Len(Datname) = 0 @@ -169,36 +156,36 @@ end function '------------------------------------------------------------------------------- ' function GetDirListLocal ( sPath$, sMatch$ ,lsFile() as String ) as integer -'/// Get Subdirectories from a directory and append them to a list (with path) -'/// Input: Directory with complete path; Search Pattern, e.g *; List -'/// Return: count of appended entries; updated list - Dim Count% - Dim Verzeichnis as String + '/// Get Subdirectories from a directory and append them to a list (with path) + '/// Input: Directory with complete path; Search Pattern, e.g *; List + '/// Return: count of appended entries; updated list + Dim Count% + Dim Verzeichnis as String - if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne - ' at the end of the string has to be teh path seperator, else the dir-command doesn't work - Verzeichnis = Dir( sPath$ + sMatch$ , 16) - Count% = 0 + if right ( sPath$, 1 ) <> gPathSigne then sPath$ = sPath$ + gPathSigne + ' at the end of the string has to be teh path seperator, else the dir-command doesn't work + Verzeichnis = Dir( sPath$ + sMatch$ , 16) + Count% = 0 - do until Len(Verzeichnis) = 0 - if Verzeichnis <>"." AND Verzeichnis <> ".." then - lsFile(0) = Val(lsFile(0)) + 1 - lsFile( lsFile(0) ) = sPath$ + Verzeichnis + gPathSigne - Count% = Count% + 1 - end if - Verzeichnis = Dir - loop + do until Len(Verzeichnis) = 0 + if Verzeichnis <>"." AND Verzeichnis <> ".." then + lsFile(0) = Val(lsFile(0)) + 1 + lsFile( lsFile(0) ) = sPath$ + Verzeichnis + gPathSigne + Count% = Count% + 1 + end if + Verzeichnis = Dir + loop - GetDirListLocal = Count% + GetDirListLocal = Count% end function ' '------------------------------------------------------------------------------- ' function GetAllDirListLocal ( byVal sPath$, byVal sMatch$ ,lsFile() as String ) as integer -'/// Get all directorys recursiv that match the pattern and append them to a list -'/// Input: Directory with complete path; Search Pattern, e.g *; Empty list, because it get's reset in this function!; -'/// Return: Count of appended entries (1. entry is the whole path); updated list - Dim Count% : Dim DirCount% + '/// Get all directorys recursiv that match the pattern and append them to a list + '/// Input: Directory with complete path; Search Pattern, e.g *; Empty list, because it get's reset in this function!; + '/// Return: Count of appended entries (1. entry is the whole path); updated list + Dim Count% : Dim DirCount% DirCount% = 1 ' dummy Count% = 1 @@ -216,11 +203,11 @@ end function '------------------------------------------------------------------------------- ' function GetAllFileListLocal ( byVal sPath$, byVal sMatch$ ,lsFile() as String ) as integer -'/// Get all Files recursiv (including in subdirectories) that match the pattern and append them to a list -'/// Input: Directory with complete path; Search Pattern, e.g *.*; Empty list, because it get's reset in this function!; -'/// Return: Count of appended entries (1. entry is the whole path); updated list - Dim DirCount% : Dim FileCount% : Dim Count% - Dim lsDir(1000) as String + '/// Get all Files recursiv (including in subdirectories) that match the pattern and append them to a list + '/// Input: Directory with complete path; Search Pattern, e.g *.*; Empty list, because it get's reset in this function!; + '/// Return: Count of appended entries (1. entry is the whole path); updated list + Dim DirCount% : Dim FileCount% : Dim Count% + Dim lsDir(1000) as String DirCount% = GetAllDirListLocal ( sPath$, "*", lsDir() ) ' just all directories FileCount% = 0 @@ -237,71 +224,71 @@ end function '------------------------------------------------------------------------------- ' function KillFileListLocal ( lsList() as String ) as Boolean -'/// Delete all files in the list -'/// Input: List with files -'/// Return: TRUE or FALSE if files are killed; modified list with not deleted files. - Dim i as Integer - Dim FehlerListe ( 1000 ) as String + '/// Delete all files in the list + '/// Input: List with files + '/// Return: TRUE or FALSE if files are killed; modified list with not deleted files. + Dim i as Integer + Dim FehlerListe ( 1000 ) as String - FehlerListe ( 0 ) = 0 - for i=1 to ListCount ( lsList() ) - try - kill ( lsList(i) ) - catch - ListAppend ( FehlerListe (), lsList(i) ) - endcatch - next i + FehlerListe ( 0 ) = 0 + for i=1 to ListCount ( lsList() ) + try + kill ( lsList(i) ) + catch + ListAppend ( FehlerListe (), lsList(i) ) + endcatch + next i - lsList(0) = 0 ' delete old list - KillFileListLocal = TRUE - for i=1 to ListCount ( FehlerListe () ) - KillFileListLocal = FALSE - ListAppend ( lsList(), FehlerListe (i) ) - next i + lsList(0) = 0 ' delete old list + KillFileListLocal = TRUE + for i=1 to ListCount ( FehlerListe () ) + KillFileListLocal = FALSE + ListAppend ( lsList(), FehlerListe (i) ) + next i end function ' '------------------------------------------------------------------------------- ' function KillDirListLocal ( lsList() as String ) as Boolean -'/// Delete all directories in the list -'/// Input: List with directories -'/// Return: TRUE or FALSE if directories are killed; modified list with not deleted directories. - Dim i as Integer - Dim FehlerListe ( 1000 ) as String + '/// Delete all directories in the list + '/// Input: List with directories + '/// Return: TRUE or FALSE if directories are killed; modified list with not deleted directories. + Dim i as Integer + Dim FehlerListe ( 1000 ) as String - FehlerListe ( 0 ) = 0 - for i=1 to ListCount ( lsList() ) - try - rmDir ( lsList(i) ) - catch - ListAppend ( FehlerListe (), lsList(i) ) - endcatch - next i + FehlerListe ( 0 ) = 0 + for i=1 to ListCount ( lsList() ) + try + rmDir ( lsList(i) ) + catch + ListAppend ( FehlerListe (), lsList(i) ) + endcatch + next i - lsList(0) = 0 ' delete old list - KillDirListLocal = TRUE - for i=1 to ListCount ( FehlerListe () ) - KillDirListLocal = FALSE - ListAppend ( lsList(), FehlerListe (i) ) - next i + lsList(0) = 0 ' delete old list + KillDirListLocal = TRUE + for i=1 to ListCount ( FehlerListe () ) + KillDirListLocal = FALSE + ListAppend ( lsList(), FehlerListe (i) ) + next i end function ' '------------------------------------------------------------------------------- ' function GetFileSizesLocal ( lsList() as String ) as long -'/// Computes the total Filesize of the files in the list -'/// Input: List with files -'/// Return: Filesize in bytes - Dim iSum - Dim i as Integer + '/// Computes the total Filesize of the files in the list + '/// Input: List with files + '/// Return: Filesize in bytes + Dim iSum + Dim i as Integer - iSum = 0 - for i=1 to ListCount ( lsList() ) - try - iSum = iSum + FileLen ( lsList(i) ) - catch - endcatch - next i + iSum = 0 + for i=1 to ListCount ( lsList() ) + try + iSum = iSum + FileLen ( lsList(i) ) + catch + endcatch + next i - GetFileSizesLocal = iSum + GetFileSizesLocal = iSum end function diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index f21c28b520b9..ce7b7271dddf 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -35,236 +35,229 @@ '* '* short description : Global Routines for Document Handling '* -'*************************************************************************************** -' #1 hCloseAndLooseDocument 'wrn:0|err:0 'Closes a document and accepts the loose of content. -' #1 hOpenFileAndIgnoreMacroWarning -' #1 hCreateLabels -' #1 hCreateBusinessCards -' #1 hNewDocument -' #1 hCloseDocument -' #1 hCloseAndLooseDocument -' #1 gMouseClick -' #1 gMouseDoubleClick -' #1 gMouseMove -' #1 gMouseDown -' #1 gMouseMove2 -' #1 gMouseUp -' #1 hTypeKeys '\************************************************************************************* sub hNewDocument ( optional bANewDoc ) -'/// hNewDocument : open a new document dependent on 'gApplication' ///' - dim sTemp as string - gApplication = Ucase ( gApplication ) + '/// hNewDocument : open a new document dependent on 'gApplication' ///' + dim sTemp as string + gApplication = gApplication - if IsMissing ( bANewDoc ) <> TRUE then - if bANewDoc = TRUE then - gNoNewDoc = FALSE - else - gNoNewDoc = TRUE - end if - end if + if IsMissing ( bANewDoc ) <> TRUE then + if bANewDoc = TRUE then + gNoNewDoc = FALSE + else + gNoNewDoc = TRUE + end if + end if - select case gApplication - case "WRITER", "TEXTDOKUMENT" : Kontext "DocumentWriter" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/swriter", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/swriter", "FrameName", "_default", "SynchronMode", TRUE - end if - case "CALC", "TABELLENDOKUMENT" : Kontext "DocumentCalc" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/scalc", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/scalc", "FrameName", "_default", "SynchronMode", TRUE - end if - case "IMPRESS", "PRAESENTATION" : Kontext "DocumentImpress" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/simpress", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/simpress", "FrameName", "_default", "SynchronMode", TRUE - Kontext "AutoPilotPraesentation1" - if AutoPilotPraesentation1.Exists (2) then - Printlog "------------------------------The Impress-Autopilot was active------------------" - Startwithwizard.Check ' opposite of the checkboxs' title - AutoPilotPraesentation1.OK - Sleep 2 - Kontext "SeitenLayout" - SeitenLayout.Cancel - end if - Kontext "DocumentImpress" - Sleep 2 - end if - case "DRAW", "ZEICHNUNG" : Kontext "DocumentDraw" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/sdraw", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/sdraw", "FrameName", "_default", "SynchronMode", TRUE - end if - case "MASTERDOC", "GLOBALDOKUMENT", "GLOBALDOC" : - Kontext "DocumentMasterDoc" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/swriter/GlobalDocument", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/swriter/GlobalDocument", "FrameName", "_default", "SynchronMode", TRUE - end if - Kontext "Navigator" - sleep (1) - if Navigator.Exists(5) then Navigator.Close - Kontext "DocumentMasterDoc" - case "MATH", "FORMEL" : Kontext "DocumentMath" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/smath", "SynchronMode", TRUE - else -' FileOpen "FileName", "private:factory/smath", "FrameName", "_blank" - FileOpen "FileName", "private:factory/smath", "FrameName", "_default", "SynchronMode", TRUE - end if - Kontext "DocumentMath" - case "HTML", "HTMLDOKUMENT" : Kontext "DocumentWriterWeb" - if gNoNewDoc = TRUE then - FileOpen "FileName", "private:factory/swriter/web", "SynchronMode", TRUE - else - FileOpen "FileName", "private:factory/swriter/web", "FrameName", "_default", "SynchronMode", TRUE - end if - Kontext "DocumentWriterWeb" - case "BASE", "INSIGHT" : FileOpen "FileName", "private:factory/sdatabase?Interactive", "FrameName", "_default", "SynchronMode", TRUE - Kontext "DatabaseWizard" - if DatabaseWizard.exists(5) then - FinishBtn.click - kontext "SpeichernDlg" - if SpeichernDlg.exists(5) then - if (Dateiname.getSelText = "") then - sTemp = convertPath(gOfficePath + "user/work/hNewDocument.odb") - if fileExists(sTemp) then - app.kill(sTemp) - endif - qaErrorlog "## lost default filename" - Dateiname.setText "hNewDocument" - endif - Speichern.click - Kontext "Insight" - else - warnlog "t_doc1.inc::hNewDocument():: Can't create Database Document 2" - endif - else - warnlog "t_doc1.inc::hNewDocument():: Can't create Database Document 1" - endif - case "BASIC" : ToolsMacroMacro - kontext "makro" - if makro.exists(5) then - MakroAus.typeKeys "" - sTemp = "" - while (NOT bearbeiten.isEnabled) AND (sTemp <> MakroAus.getSelText) - sTemp = MakroAus.getSelText - MakroAus.typeKeys "+" - wend - if (bearbeiten.isEnabled) then - bearbeiten.click - else - qaErrorlog "Can't edit document." - endif - else - warnlog "Can't open Basic IDE." - endif - case else : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!" - end select - Sleep 2 + select case gApplication + case "WRITER" + Kontext "DocumentWriter" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/swriter", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/swriter", "FrameName", "_default", "SynchronMode", TRUE + end if + case "CALC" + Kontext "DocumentCalc" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/scalc", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/scalc", "FrameName", "_default", "SynchronMode", TRUE + end if + case "IMPRESS" + Kontext "DocumentImpress" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/simpress", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/simpress", "FrameName", "_default", "SynchronMode", TRUE + Kontext "AutoPilotPraesentation1" + if AutoPilotPraesentation1.Exists (2) then + Printlog "------------------------------The Impress-Autopilot was active------------------" + Startwithwizard.Check ' opposite of the checkboxs' title + AutoPilotPraesentation1.OK + Sleep 2 + Kontext "SeitenLayout" + SeitenLayout.Cancel + end if + Kontext "DocumentImpress" + Sleep 2 + end if + case "DRAW" + Kontext "DocumentDraw" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/sdraw", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/sdraw", "FrameName", "_default", "SynchronMode", TRUE + end if + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/swriter/GlobalDocument", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/swriter/GlobalDocument", "FrameName", "_default", "SynchronMode", TRUE + end if + Kontext "Navigator" + sleep (1) + if Navigator.Exists(5) then Navigator.Close + Kontext "DocumentMasterDoc" + case "MATH" + Kontext "DocumentMath" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/smath", "SynchronMode", TRUE + else + ' FileOpen "FileName", "private:factory/smath", "FrameName", "_blank" + FileOpen "FileName", "private:factory/smath", "FrameName", "_default", "SynchronMode", TRUE + end if + Kontext "DocumentMath" + case "HTML" + Kontext "DocumentWriterWeb" + if gNoNewDoc = TRUE then + FileOpen "FileName", "private:factory/swriter/web", "SynchronMode", TRUE + else + FileOpen "FileName", "private:factory/swriter/web", "FrameName", "_default", "SynchronMode", TRUE + end if + Kontext "DocumentWriterWeb" + case "DATABASE" + FileOpen "FileName", "private:factory/sdatabase?Interactive", "FrameName", "_default", "SynchronMode", TRUE + Kontext "DatabaseWizard" + if DatabaseWizard.exists(5) then + FinishBtn.click + kontext "SpeichernDlg" + if SpeichernDlg.exists(5) then + if (Dateiname.getSelText = "") then + sTemp = convertPath(gOfficePath + "user/work/hNewDocument.odb") + if fileExists(sTemp) then + app.kill(sTemp) + endif + qaErrorlog "## lost default filename" + Dateiname.setText "hNewDocument" + endif + Speichern.click + Kontext "DATABASE" + else + warnlog "t_doc1.inc::hNewDocument():: Can't create Database Document 2" + endif + else + warnlog "t_doc1.inc::hNewDocument():: Can't create Database Document 1" + endif + case "BASIC" + ToolsMacroMacro + kontext "makro" + if makro.exists(5) then + MakroAus.typeKeys "" + sTemp = "" + while (NOT bearbeiten.isEnabled) AND (sTemp <> MakroAus.getSelText) + sTemp = MakroAus.getSelText + MakroAus.typeKeys "+" + wend + if (bearbeiten.isEnabled) then + bearbeiten.click + else + qaErrorlog "Can't edit document." + endif + else + warnlog "Can't open Basic IDE." + endif + case else : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!" + end select + Sleep 2 end sub ' '------------------------------------------------------------------------------- ' function hCreateLabels() as Boolean -'/// hCreateLabels : open the tab-dialog for making a new lable (file/new/lable) ///' + '/// hCreateLabels : open the tab-dialog for making a new lable (file/new/lable) ///' FileOpen "FileName", "private:factory/swriter?slot=21051", "FrameName", "_default", "SynchronMode", TRUE Sleep (2) - Kontext + Kontext Active.Setpage TabEtiketten Kontext "TabEtiketten" - if Not TabEtiketten.Exists then - Warnlog "Dialog for Labels is not up!" - hCreateLabels = False - else - hCreateLabels = True - endif - Sleep (2) + if Not TabEtiketten.Exists then + Warnlog "Dialog for Labels is not up!" + hCreateLabels = False + else + hCreateLabels = True + endif + Sleep (2) end function ' '------------------------------------------------------------------------------- ' function hCreateBusinessCards() as Boolean -'/// hCreateBusinessCards : open the tab-dialog for making a new business card (file/new/business cards) ///' - FileOpen "FileName", "private:factory/swriter?slot=21052", "FrameName", "_default", "SynchronMode", TRUE - Sleep (2) - Kontext + '/// hCreateBusinessCards : open the tab-dialog for making a new business card (file/new/business cards) ///' + FileOpen "FileName", "private:factory/swriter?slot=21052", "FrameName", "_default", "SynchronMode", TRUE + Sleep (2) + Kontext Active.Setpage TabEtikettenMedium Kontext "TabEtikettenMedium" - if Not TabEtikettenMedium.Exists then - Warnlog "Dialog for BusinessCards is not up!" - hCreateBusinessCards = False - else - hCreateBusinessCards = True - endif - Sleep (2) + if Not TabEtikettenMedium.Exists then + Warnlog "Dialog for BusinessCards is not up!" + hCreateBusinessCards = False + else + hCreateBusinessCards = True + endif + Sleep (2) end function ' '------------------------------------------------------------------------------- ' sub hCloseDocument ( optional bANewDoc ) -'/// hCloseDocument : close a document without saving ///' -'///+ all documents will be closed without saving ///' - Dim sFehler$ + '/// hCloseDocument : close a document without saving ///' + '///+ all documents will be closed without saving ///' + Dim sFehler$ - if IsMissing ( bANewDoc ) <> TRUE then - if bANewDoc = TRUE then - gNoNewDoc = FALSE - else - gNoNewDoc = TRUE - end if - end if + if IsMissing ( bANewDoc ) <> TRUE then + if bANewDoc = TRUE then + gNoNewDoc = FALSE + else + gNoNewDoc = TRUE + end if + end if - ' if no new document was created, it isn't closed - if gNoNewDoc = TRUE then - exit sub - end if + ' if no new document was created, it isn't closed + if gNoNewDoc = TRUE then + exit sub + end if - Sleep 3 - try - FileClose - catch - Exceptlog - exit sub - endcatch + Sleep 3 + try + FileClose + catch + Exceptlog + exit sub + endcatch - Sleep 1 - Kontext "Active" - if Active.Exists(2) then - try - Active.No - catch - Active.Click ( 202 ) - endcatch - end if - Sleep (2) + Sleep 1 + Kontext "Active" + if Active.Exists(2) then + try + Active.No + catch + Active.Click ( 202 ) + endcatch + end if + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub hCloseAndLooseDocument -'/// hCloseAndLooseDocument -'///+ Closes a (modified) document and the verify dialog will be answered -'///+ with yes. That means you want to loose format information or you want -'///+ to loose the document! - Dim sFehler$ + '/// hCloseAndLooseDocument + '///+ Closes a (modified) document and the verify dialog will be answered + '///+ with yes. That means you want to loose format information or you want + '///+ to loose the document! + Dim sFehler$ - try - FileClose + try + FileClose catch - Exceptlog - exit sub - endcatch - sleep (2) - Kontext - if Active.Exists(2) then Active.Yes + Exceptlog + exit sub + endcatch + sleep (2) + Kontext + if Active.Exists(2) then Active.Yes end sub ' '------------------------------------------------------------------------------- @@ -276,297 +269,297 @@ sub gMouseClick ( X%, Y%, optional mb% ) '/// 2 = left mouse button '/// 3 = left mouse button - gApplication = UCase ( gApplication ) + gApplication = gApplication if IsMissing(mb%) then mb% = 1 - - select case gApplication - case "DESKTOP" : - Kontext "Desktop" - autoexecute = false - Desktop.MouseDown ( X%, Y%, mb% ) - Desktop.MouseUp ( X%, Y%, mb% ) - autoexecute = true - case "CALC" : - Kontext "DocumentCalc" - autoexecute = false - DocumentCalc.MouseDown ( X%, Y%, mb% ) - DocumentCalc.MouseUp ( X%, Y%, mb% ) - autoexecute = true - case "DRAW" : - Kontext "DocumentDraw" - autoexecute=false - DocumentDraw.MouseDown ( X%, Y%, mb% ) - DocumentDraw.MouseUp ( X%, Y%, mb% ) - autoexecute=true - case "WRITER" : - Kontext "DocumentWriter" - autoexecute=false - DocumentWriter.MouseDown ( X%, Y%, mb% ) - DocumentWriter.MouseUp ( X%, Y%, mb% ) - autoexecute=true - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - autoexecute=false - DocumentWriterWeb.MouseDown ( X%, Y%, mb% ) - DocumentWriterWeb.MouseUp ( X%, Y%, mb% ) - autoexecute=true - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - autoexecute=false - DocumentMasterDoc.MouseDown ( X%, Y%, mb% ) - DocumentMasterDoc.MouseUp ( X%, Y%, mb% ) - autoexecute=true - case "IMPRESS" : - Kontext "DocumentImpress" - autoexecute=false - DocumentImpress.MouseDown ( X%, Y%, mb% ) - DocumentImpress.MouseUp ( X%, Y%, mb% ) - autoexecute=true - case "MATH" : - Kontext "DocumentMath" - autoexecute=false - DocumentMath.MouseDown ( X%, Y%, mb% ) - DocumentMath.MouseDown ( X%, Y%, mb% ) - autoexecute=true - case "CHART" : - Kontext "DocumentChart" - autoexecute=false - DocumentChart.MouseDown ( X%, Y%, mb% ) - DocumentChart.MouseUp ( X%, Y%, mb% ) - autoexecute=true - end select - sleep (2) + + select case gApplication + case "BACKGROUND" + Kontext "BACKGROUND" + autoexecute = false + Desktop.MouseDown ( X%, Y%, mb% ) + Desktop.MouseUp ( X%, Y%, mb% ) + autoexecute = true + case "CALC" + Kontext "DocumentCalc" + autoexecute = false + DocumentCalc.MouseDown ( X%, Y%, mb% ) + DocumentCalc.MouseUp ( X%, Y%, mb% ) + autoexecute = true + case "DRAW" + Kontext "DocumentDraw" + autoexecute=false + DocumentDraw.MouseDown ( X%, Y%, mb% ) + DocumentDraw.MouseUp ( X%, Y%, mb% ) + autoexecute=true + case "WRITER" + Kontext "DocumentWriter" + autoexecute=false + DocumentWriter.MouseDown ( X%, Y%, mb% ) + DocumentWriter.MouseUp ( X%, Y%, mb% ) + autoexecute=true + case "HTML" + Kontext "DocumentWriterWeb" + autoexecute=false + DocumentWriterWeb.MouseDown ( X%, Y%, mb% ) + DocumentWriterWeb.MouseUp ( X%, Y%, mb% ) + autoexecute=true + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + autoexecute=false + DocumentMasterDoc.MouseDown ( X%, Y%, mb% ) + DocumentMasterDoc.MouseUp ( X%, Y%, mb% ) + autoexecute=true + case "IMPRESS" + Kontext "DocumentImpress" + autoexecute=false + DocumentImpress.MouseDown ( X%, Y%, mb% ) + DocumentImpress.MouseUp ( X%, Y%, mb% ) + autoexecute=true + case "MATH" + Kontext "DocumentMath" + autoexecute=false + DocumentMath.MouseDown ( X%, Y%, mb% ) + DocumentMath.MouseDown ( X%, Y%, mb% ) + autoexecute=true + case "CHART" + Kontext "DocumentChart" + autoexecute=false + DocumentChart.MouseDown ( X%, Y%, mb% ) + DocumentChart.MouseUp ( X%, Y%, mb% ) + autoexecute=true + end select + sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub gMouseDoubleClick ( X%, Y% ) -'/// gMouseDoubleClick ( x_Position, y-Position ) : make a mouse-doubleclick on the document ( dependent on 'gApplication' ) ///' - gApplication = UCase ( gApplication ) + '/// gMouseDoubleClick ( x_Position, y-Position ) : make a mouse-doubleclick on the document ( dependent on 'gApplication' ) ///' + gApplication = gApplication - select case gApplication - case "CALC" : - Kontext "DocumentCalc" - DocumentCalc.MouseDoubleClick ( X%, Y% ) - case "DRAW" : - Kontext "DocumentDraw" - DocumentDraw.MouseDoubleClick ( X%, Y% ) - case "DESKTOP" : - Kontext "Desktop" - Desktop.MouseDoubleClick ( X%, Y% ) - case "WRITER" : - Kontext "DocumentWriter" - DocumentWriter.MouseDoubleClick ( X%, Y% ) - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - DocumentWriterWeb.MouseDoubleClick ( X%, Y% ) - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - DocumentMasterDoc.MouseDoubleClick ( X%, Y% ) - case "IMPRESS" : - Kontext "DocumentImpress" - DocumentImpress.MouseDoubleClick ( X%, Y% ) - case "MATH" : - Kontext "DocumentMath" - DocumentMath.MouseDoubleClick ( X%, Y% ) - end select - Sleep (2) + select case gApplication + case "CALC" + Kontext "DocumentCalc" + DocumentCalc.MouseDoubleClick ( X%, Y% ) + case "DRAW" + Kontext "DocumentDraw" + DocumentDraw.MouseDoubleClick ( X%, Y% ) + case "BACKGROUND" + Kontext "BACKGROUND" + Desktop.MouseDoubleClick ( X%, Y% ) + case "WRITER" + Kontext "DocumentWriter" + DocumentWriter.MouseDoubleClick ( X%, Y% ) + case "HTML" + Kontext "DocumentWriterWeb" + DocumentWriterWeb.MouseDoubleClick ( X%, Y% ) + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + DocumentMasterDoc.MouseDoubleClick ( X%, Y% ) + case "IMPRESS" + Kontext "DocumentImpress" + DocumentImpress.MouseDoubleClick ( X%, Y% ) + case "MATH" + Kontext "DocumentMath" + DocumentMath.MouseDoubleClick ( X%, Y% ) + end select + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub gMouseMove ( BeginX%, BeginY%, EndX%, EndY% ) -'/// gMouseMove ( BeginX, BeginY, EndX, EndY ) : make a mousemove trom Bx,By to Ex,Ey on the document ( dependent on 'gApplication' ) ///' - gApplication = UCase ( gApplication ) + '/// gMouseMove ( BeginX, BeginY, EndX, EndY ) : make a mousemove trom Bx,By to Ex,Ey on the document ( dependent on 'gApplication' ) ///' + gApplication = gApplication - select case gApplication - case "CALC" : - Kontext "DocumentCalc" - DocumentCalc.MouseDown ( BeginX%, BeginY% ) - DocumentCalc.MouseMove ( EndX%, EndY%) - DocumentCalc.MouseUp ( EndX%, EndY% ) - case "DRAW" : - Kontext "DocumentDraw" - DocumentDraw.MouseDown ( BeginX%, BeginY% ) - DocumentDraw.MouseMove ( EndX%, EndY% ) - DocumentDraw.MouseUp ( EndX%, EndY% ) - case "WRITER" : - Kontext "DocumentWriter" - DocumentWriter.MouseDown ( BeginX%, BeginY% ) - DocumentWriter.MouseMove ( EndX%, EndY%) - DocumentWriter.MouseUp ( EndX%, EndY% ) - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - DocumentWriterWeb.MouseDown ( BeginX%, BeginY% ) - DocumentWriterWeb.MouseMove ( EndX%, EndY%) - DocumentWriterWeb.MouseUp ( EndX%, EndY% ) - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - DocumentMasterDoc.MouseDown ( BeginX%, BeginY% ) - DocumentMasterDoc.MouseMove ( EndX%, EndY%) - DocumentMasterDoc.MouseUp ( EndX%, EndY% ) - case "IMPRESS" : - Kontext "DocumentImpress" - DocumentImpress.MouseDown ( BeginX%, BeginY% ) - DocumentImpress.MouseMove ( EndX%, EndY%) - DocumentImpress.MouseUp ( EndX%, EndY% ) - case "MATH" : - Kontext "DocumentMath" - DocumentMath.MouseDown ( BeginX%, BeginY% ) - DocumentMath.MouseMove ( EndX%, EndY%) - DocumentMath.MouseDown ( EndX%, EndY% ) - end select - Sleep (2) + select case gApplication + case "CALC" + Kontext "DocumentCalc" + DocumentCalc.MouseDown ( BeginX%, BeginY% ) + DocumentCalc.MouseMove ( EndX%, EndY%) + DocumentCalc.MouseUp ( EndX%, EndY% ) + case "DRAW" + Kontext "DocumentDraw" + DocumentDraw.MouseDown ( BeginX%, BeginY% ) + DocumentDraw.MouseMove ( EndX%, EndY% ) + DocumentDraw.MouseUp ( EndX%, EndY% ) + case "WRITER" + Kontext "DocumentWriter" + DocumentWriter.MouseDown ( BeginX%, BeginY% ) + DocumentWriter.MouseMove ( EndX%, EndY%) + DocumentWriter.MouseUp ( EndX%, EndY% ) + case "HTML" + Kontext "DocumentWriterWeb" + DocumentWriterWeb.MouseDown ( BeginX%, BeginY% ) + DocumentWriterWeb.MouseMove ( EndX%, EndY%) + DocumentWriterWeb.MouseUp ( EndX%, EndY% ) + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + DocumentMasterDoc.MouseDown ( BeginX%, BeginY% ) + DocumentMasterDoc.MouseMove ( EndX%, EndY%) + DocumentMasterDoc.MouseUp ( EndX%, EndY% ) + case "IMPRESS" + Kontext "DocumentImpress" + DocumentImpress.MouseDown ( BeginX%, BeginY% ) + DocumentImpress.MouseMove ( EndX%, EndY%) + DocumentImpress.MouseUp ( EndX%, EndY% ) + case "MATH" + Kontext "DocumentMath" + DocumentMath.MouseDown ( BeginX%, BeginY% ) + DocumentMath.MouseMove ( EndX%, EndY%) + DocumentMath.MouseDown ( EndX%, EndY% ) + end select + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub gMouseDown ( BeginX%, BeginY% ) -'/// gMouseDown ( x_Position, y-Position ) : make a mousedown on the document (dependent on 'gApplication') ///' -'///+ DON'T FORGETT to call gMouseUp ! ///' - gApplication = UCase ( gApplication ) + '/// gMouseDown ( x_Position, y-Position ) : make a mousedown on the document (dependent on 'gApplication') ///' + '///+ DON'T FORGETT to call gMouseUp ! ///' + gApplication = gApplication - select case gApplication - case "CALC" : - Kontext "DocumentCalc" - DocumentCalc.MouseDown ( BeginX%, BeginY% ) - case "DRAW" : - Kontext "DocumentDraw" - DocumentDraw.MouseDown ( BeginX%, BeginY% ) - case "WRITER" : - Kontext "DocumentWriter" - DocumentWriter.MouseDown ( BeginX%, BeginY% ) - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - DocumentWriterWeb.MouseDown ( BeginX%, BeginY% ) - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - DocumentMasterDoc.MouseDown ( BeginX%, BeginY% ) - case "IMPRESS" : - Kontext "DocumentImpress" - DocumentImpress.MouseDown ( BeginX%, BeginY% ) - case "MATH" : - Kontext "DocumentMath" - DocumentMath.MouseDown ( BeginX%, BeginY% ) - end select - Sleep (2) + select case gApplication + case "CALC" + Kontext "DocumentCalc" + DocumentCalc.MouseDown ( BeginX%, BeginY% ) + case "DRAW" + Kontext "DocumentDraw" + DocumentDraw.MouseDown ( BeginX%, BeginY% ) + case "WRITER" + Kontext "DocumentWriter" + DocumentWriter.MouseDown ( BeginX%, BeginY% ) + case "HTML" + Kontext "DocumentWriterWeb" + DocumentWriterWeb.MouseDown ( BeginX%, BeginY% ) + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + DocumentMasterDoc.MouseDown ( BeginX%, BeginY% ) + case "IMPRESS" + Kontext "DocumentImpress" + DocumentImpress.MouseDown ( BeginX%, BeginY% ) + case "MATH" + Kontext "DocumentMath" + DocumentMath.MouseDown ( BeginX%, BeginY% ) + end select + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub gMouseMove2 ( EndX%, EndY% ) -'/// gMouseMove2 ( x_Position, y-Position ) : move the pointer to position on the document (dependent on 'gApplication') ///' - gApplication = UCase ( gApplication ) + '/// gMouseMove2 ( x_Position, y-Position ) : move the pointer to position on the document (dependent on 'gApplication') ///' + gApplication = gApplication - select case gApplication - case "CALC" : - Kontext "DocumentCalc" - DocumentCalc.MouseMove ( EndX%, EndY%) - case "DRAW" : - Kontext "DocumentDraw" - DocumentDraw.MouseMove ( EndX%, EndY% ) - case "WRITER" : - Kontext "DocumentWriter" - DocumentWriter.MouseMove ( EndX%, EndY%) - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - DocumentWriterWeb.MouseMove ( EndX%, EndY%) - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - DocumentMasterDoc.MouseMove ( EndX%, EndY%) - case "IMPRESS" : - Kontext "DocumentImpress" - DocumentImpress.MouseMove ( EndX%, EndY%) - case "MATH" : - Kontext "DocumentMath" - DocumentMath.MouseMove ( EndX%, EndY%) - end select - Sleep (2) + select case gApplication + case "CALC" + Kontext "DocumentCalc" + DocumentCalc.MouseMove ( EndX%, EndY%) + case "DRAW" + Kontext "DocumentDraw" + DocumentDraw.MouseMove ( EndX%, EndY% ) + case "WRITER" + Kontext "DocumentWriter" + DocumentWriter.MouseMove ( EndX%, EndY%) + case "HTML" + Kontext "DocumentWriterWeb" + DocumentWriterWeb.MouseMove ( EndX%, EndY%) + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + DocumentMasterDoc.MouseMove ( EndX%, EndY%) + case "IMPRESS" + Kontext "DocumentImpress" + DocumentImpress.MouseMove ( EndX%, EndY%) + case "MATH" + Kontext "DocumentMath" + DocumentMath.MouseMove ( EndX%, EndY%) + end select + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub gMouseUp ( EndX%, EndY% ) -'/// gMouseUp ( x_Position, y-Position ) : make a release button on the document (dependent on 'gApplication') ///' - gApplication = UCase ( gApplication ) + '/// gMouseUp ( x_Position, y-Position ) : make a release button on the document (dependent on 'gApplication') ///' + gApplication = gApplication - select case gApplication - case "CALC" : - Kontext "DocumentCalc" - DocumentCalc.MouseUp ( EndX%, EndY% ) - case "DRAW" : - Kontext "DocumentDraw" - DocumentDraw.MouseUp ( EndX%, EndY% ) - case "WRITER" : - Kontext "DocumentWriter" - DocumentWriter.MouseUp ( EndX%, EndY% ) - case "HTMLDOKUMENT" : - Kontext "DocumentWriterWeb" - DocumentWriterWeb.MouseUp ( EndX%, EndY% ) - case "MASTERDOC" : - Kontext "DocumentMasterDoc" - DocumentMasterDoc.MouseUp ( EndX%, EndY% ) - case "IMPRESS" : - Kontext "DocumentImpress" - DocumentImpress.MouseUp ( EndX%, EndY% ) - case "MATH" : - Kontext "DocumentMath" - DocumentMath.MouseUp ( EndX%, EndY% ) - end select - Sleep (2) + select case gApplication + case "CALC" + Kontext "DocumentCalc" + DocumentCalc.MouseUp ( EndX%, EndY% ) + case "DRAW" + Kontext "DocumentDraw" + DocumentDraw.MouseUp ( EndX%, EndY% ) + case "WRITER" + Kontext "DocumentWriter" + DocumentWriter.MouseUp ( EndX%, EndY% ) + case "HTML" + Kontext "DocumentWriterWeb" + DocumentWriterWeb.MouseUp ( EndX%, EndY% ) + case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + DocumentMasterDoc.MouseUp ( EndX%, EndY% ) + case "IMPRESS" + Kontext "DocumentImpress" + DocumentImpress.MouseUp ( EndX%, EndY% ) + case "MATH" + Kontext "DocumentMath" + DocumentMath.MouseUp ( EndX%, EndY% ) + end select + Sleep (2) end sub ' '------------------------------------------------------------------------------- ' sub hTypeKeys ( OutputText , optional iLoop as Integer ) -'/// hTypeKeys ( OutputText , optional iLoop as Integer ): type the keys in 'outputtext' 'iLoop' times ///' - Dim i as integer - - If IsMissing(iLoop) = True then iLoop = 1 - For i = 1 to iLoop - Select Case Ucase(gApplication) - Case "WRITER" + '/// hTypeKeys ( OutputText , optional iLoop as Integer ): type the keys in 'outputtext' 'iLoop' times ///' + Dim i as integer + + If IsMissing(iLoop) = True then iLoop = 1 + For i = 1 to iLoop + Select Case Ucase(gApplication) + Case "WRITER" Kontext "DocumentWriter" DocumentWriter.TypeKeys OutputText - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.TypeKeys OutputText - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.TypeKeys OutputText - case "CALC" : + case "CALC" Kontext "DocumentCalc" DocumentCalc.TypeKeys OutputText - case "DRAW" + case "DRAW" Kontext "DocumentDraw" DocumentDraw.TypeKeys OutputText - case "IMPRESS" + case "IMPRESS" Kontext "DocumentImpress" DocumentImpress.TypeKeys OutputText - case "MATH" : + case "MATH" Kontext "DocumentMath" DocumentMath.TypeKeys OutputText - end select - wait 500 - next i + end select + wait 500 + next i end sub ' '------------------------------------------------------------------------------- ' function hOpenFileAndIgnoreMacroWarning (sDocName as string, optional IgnoreW) as Boolean -'/// Loading a (known) document with macro security warning. -'/// If the OPTIONAL parameter is used a PRINTLOG will be written into the result file otherwise a wrning. + '/// Loading a (known) document with macro security warning. + '/// If the OPTIONAL parameter is used a PRINTLOG will be written into the result file otherwise a wrning. Dim i as integer 'ConvertPath: Be sure that the path seperators has been set correctly (/ or \). sDocName = ConvertPath(sDocName) - + hOpenFileAndIgnoreMacroWarning = FALSE - + if hFileExists(sDocName) = FALSE then warnlog "global::tools::inc::t_doc1.inc::hOpenFileAndIgnoreMacroWarning: '" & sDocName & "' does not exists!" - 'Setting the function to FALSE because file has not been found. + 'Setting the function to FALSE because file has not been found. exit function else FileOpen diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc index ea3a25de354b..973082f6ea73 100755 --- a/testautomation/global/tools/includes/required/t_doc2.inc +++ b/testautomation/global/tools/includes/required/t_doc2.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -35,121 +35,113 @@ '* '* short description : Global Routines for Document Handling; Part two '* -'************************************************************************ -' #1 hTabelleEinfuegen -' #1 ZellenMarkieren -' #1 hRechteckErstellen -' #1 hTextrahmenErstellen -' #1 SchreibenInMathdok -' #1 sMakeReadOnlyDocumentEditable -' #1 fSelectFirstOLE 'Selecting the first OLE object '\*********************************************************************** sub hTabelleEinfuegen -'/// WRITER only ///' -'/// hTabelleEinfuegen hInsertTable ///' -'/// insert a dummy table in writer/writerweb/masterdocument ///' - TableInsertTable - sleep(2) - Kontext "TabelleEinfuegenWriter" - wait 500 - TabelleEinfuegenWriter.OK - sleep(1) + '/// WRITER only ///' + '/// hTabelleEinfuegen hInsertTable ///' + '/// insert a dummy table in writer/writerweb/masterdocument ///' + TableInsertTable + sleep(2) + Kontext "TabelleEinfuegenWriter" + wait 500 + TabelleEinfuegenWriter.OK + sleep(1) - Kontext "TableObjectbar" - sleep(1) - if TableObjectbar.NotExists then - Kontext "TextObjectbar" - TextObjectbar.SetNextToolBox - end if + Kontext "TableObjectbar" + sleep(1) + if TableObjectbar.NotExists then + Kontext "TextObjectbar" + TextObjectbar.SetNextToolBox + end if - Select Case gApplication - Case "WRITER" - Kontext "DocumentWriter" - Case "MASTERDOC" - Kontext "DocumentMasterDoc" - Case "HTMLDOKUMENT" - Kontext "DocumentWriterWeb" - end select - sleep(1) + Select Case gApplication + Case "WRITER" + Kontext "DocumentWriter" + Case "MASTERDOCUMENT" + Kontext "DocumentMasterDoc" + Case "HTML" + Kontext "DocumentWriterWeb" + end select + sleep(1) end sub ' '------------------------------------------------------------------------------- ' sub ZellenMarkieren ( Down%, Right% ) -'/// CALC only ///' -'/// ZellenMarkieren ( Down%, Right% ) : mark the cells ///' - Dim Anzahl as Integer + '/// CALC only ///' + '/// ZellenMarkieren ( Down%, Right% ) : mark the cells ///' + Dim Anzahl as Integer - Kontext "DocumentCalc" - Anzahl = Right% - 1 - DocumentCalc.TypeKeys "", Anzahl - Anzahl = Down% - 1 - DocumentCalc.TypeKeys "", Anzahl + Kontext "DocumentCalc" + Anzahl = Right% - 1 + DocumentCalc.TypeKeys "", Anzahl + Anzahl = Down% - 1 + DocumentCalc.TypeKeys "", Anzahl end sub ' '------------------------------------------------------------------------------- ' sub hRechteckErstellen ( BeginX%, BeginY%, EndX%, EndY% ) -'/// IMPRESS/DRAW only ///' -'/// hRechteckErstellen ( BeginX, BeginY, EndX, EndY ) : create a rectangle ///' - WL_DRAW_Rechteck - gMouseMove ( BeginX%, BeginY%, EndX%, EndY% ) + '/// IMPRESS/DRAW only ///' + '/// hRechteckErstellen ( BeginX, BeginY, EndX, EndY ) : create a rectangle ///' + WL_DRAW_Rechteck + gMouseMove ( BeginX%, BeginY%, EndX%, EndY% ) end sub ' '------------------------------------------------------------------------------- ' sub hTextrahmenErstellen ( TextEingabe$, BeginX%, BeginY%, EndX%, EndY% ) -'/// IMPRESS/DRAW only ///' -'/// hTextrahmenErstellen ( String, BeginX, BeginY, EndX, EndY ) : create a textbox with a textstring ///' - WL_SD_TextEinfuegenDraw - gMouseMove ( BeginX%, BeginY%, EndX%, EndY% ) - hTypeKeys TextEingabe$ + '/// IMPRESS/DRAW only ///' + '/// hTextrahmenErstellen ( String, BeginX, BeginY, EndX, EndY ) : create a textbox with a textstring ///' + WL_SD_TextEinfuegenDraw + gMouseMove ( BeginX%, BeginY%, EndX%, EndY% ) + hTypeKeys TextEingabe$ end sub ' '------------------------------------------------------------------------------- ' sub SchreibenInMathdok ( Eingabe as String ) -'/// MATH only ///' -'/// SchreibenInMathDok ( String ) : write text in a mathdocument ( with clipboard ) ///' - if Eingabe <> "Unsinn" then - SetClipboard Eingabe - else - SetClipboard "NROOT " - endif - if (GetClipboard() <> Eingabe) then - warnlog "--No Clipboard available :-(--" - printlog "---ClipTest--- should: "+Eingabe +", is: "+GetClipboard - endif - EditPaste - sleep(3) + '/// MATH only ///' + '/// SchreibenInMathDok ( String ) : write text in a mathdocument ( with clipboard ) ///' + if Eingabe <> "Unsinn" then + SetClipboard Eingabe + else + SetClipboard "NROOT " + endif + if (GetClipboard() <> Eingabe) then + warnlog "--No Clipboard available :-(--" + printlog "---ClipTest--- should: "+Eingabe +", is: "+GetClipboard + endif + EditPaste + sleep(3) end sub ' '------------------------------------------------------------------------------- ' -sub sMakeReadOnlyDocumentEditable - If IsItLoaded() then +sub sMakeReadOnlyDocumentEditable + If IsItLoaded() then Kontext "Standardbar" if Bearbeiten.IsEnabled then - 'Check if the button is enabled. - if Bearbeiten.getState(2) = 0 then + 'Check if the button is enabled. + if Bearbeiten.getState(2) = 0 then 'Check if the document has been loaded read-only and if yes 'click on the 'Edit'-button - Bearbeiten.Click() + Bearbeiten.Click() sleep (2) Kontext if Active.Exists(5) then 'If there is a messagebox coming up, click on Yes/OK printlog "Document was read-only. A copy will be used." Active.Yes - end if + end if Kontext if Active.Exists(2) then ' Sometimes an messagebox will be opened that the file does - ' not exists. + ' not exists. QAErrorLog Active.GetText Active.OK - end if + end if end if end if else @@ -160,128 +152,128 @@ end sub '------------------------------------------------------------------------------- ' function fSelectFirstOLE() as integer -'Select first visible OLE object using Navigator -'Returns error-code: -'+ 0 := Sucess -'- 1 := unknown application + 'Select first visible OLE object using Navigator + 'Returns error-code: + '+ 0 := Sucess + '- 1 := unknown application dim bNavigatorWasVisible as boolean - bNavigatorWasVisible = FALSE + bNavigatorWasVisible = FALSE dim iIndex fSelectFirstOLE = -1 - - select case lcase(gApplication) - case "calc" : Kontext "NavigatorCalc" - 'First check if Navigator is visible and remember result - if NavigatorCalc.exists (10) then - bNavigatorWasVisible = TRUE - else - try - 'Invoke Navigator if not visible - ViewNavigator - catch - 'If inside chart or elsewhere the call - 'will fail. Again trying the slot after - 'switching to the document. - Kontext "DocumentCalc" - DocumentCalc.TypeKeys "" - ViewNavigator - endcatch - end if - Kontext "NavigatorCalc" - if NavigatorCalc.exists (10) then - 'Select first OLE in list - Liste.TypeKeys "" - for iIndex = 1 to 8 - Liste.TypeKeys "-" - wait 500 - Liste.TypeKeys "" - wait 500 - next iIndex - Liste.select(6) - Liste.TypeKeys "+" - Liste.TypeKeys "" - fSelectFirstOLE = 0 - else - QAErrorLog "Navigator couldn't be opened!" - end if - case "draw" , "impress" : Kontext "NavigatorDraw" - if NavigatorDraw.Exists(10) then - bNavigatorWasVisible = TRUE - else - try - 'Invoke Navigator if not visible - ViewNavigator - catch - 'If inside chart or elsewhere the call - 'will fail. Again trying the slot after - 'switching to the document. - Kontext "DocumentDraw" - DocumentDraw.TypeKeys "" - ViewNavigator - endcatch - Kontext "NavigatorDraw" - if NavigatorDraw.exists(10) then - 'Select first OLE in list - Liste.TypeKeys "" - Liste.select(1) - Liste.TypeKeys "+" - fSelectFirstOLE = 0 - else - QAErrorLog "Navigator did not occoured!" - end if - end if - - case "writer" , "htmldokument" , "masterdoc" : - select case lcase(gApplication) - case "masterdoc" : Kontext "NavigatorGlobalDoc" - if NavigatorGlobalDoc.Exists(10) then - bNavigatorWasVisible = TRUE - else - ViewNavigator - end if - wait 500 - Kontext "NavigatorGlobalDoc" - if Liste.IsVisible then - Kontext "GlobaldokumentToolbox" - Umschalten.Click - endif - case else : Kontext "NavigatorWriter" - 'First check if Navigator is visible and remember result - if NavigatorWriter.Exists (10) then - bNavigatorWasVisible = TRUE - else - try - 'Invoke Navigator if not visible - ViewNavigator - catch - 'If inside chart or elsewhere the call - 'will fail. Again trying the slot after - 'switching to the document. - Kontext "DocumentWriter" - call gMouseclick (99,99) - call gMouseclick (50,50) - ViewNavigator - endcatch - end if - end select - Kontext "NavigatorWriter" - if NavigatorWriter.Exists(10) then - 'Select first OLE in list - Auswahlliste.TypeKeys "" - for iIndex = 1 to 13 - Auswahlliste.TypeKeys "-" - next iIndex - Auswahlliste.select(5) - Auswahlliste.TypeKeys "+" - fSelectFirstOLE = 0 - else - QAErrorLog "Navigator did not occoured!" - end if - case else : QAErrorLog "Application not supported" - end select - + + select case gApplication + case "CALC" : Kontext "NavigatorCalc" + 'First check if Navigator is visible and remember result + if NavigatorCalc.exists (10) then + bNavigatorWasVisible = TRUE + else + try + 'Invoke Navigator if not visible + ViewNavigator + catch + 'If inside chart or elsewhere the call + 'will fail. Again trying the slot after + 'switching to the document. + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "" + ViewNavigator + endcatch + end if + Kontext "NavigatorCalc" + if NavigatorCalc.exists (10) then + 'Select first OLE in list + Liste.TypeKeys "" + for iIndex = 1 to 8 + Liste.TypeKeys "-" + wait 500 + Liste.TypeKeys "" + wait 500 + next iIndex + Liste.select(6) + Liste.TypeKeys "+" + Liste.TypeKeys "" + fSelectFirstOLE = 0 + else + QAErrorLog "Navigator couldn't be opened!" + end if + case "DRAW" , "IMPRESS" : Kontext "NavigatorDraw" + if NavigatorDraw.Exists(10) then + bNavigatorWasVisible = TRUE + else + try + 'Invoke Navigator if not visible + ViewNavigator + catch + 'If inside chart or elsewhere the call + 'will fail. Again trying the slot after + 'switching to the document. + Kontext "DocumentDraw" + DocumentDraw.TypeKeys "" + ViewNavigator + endcatch + Kontext "NavigatorDraw" + if NavigatorDraw.exists(10) then + 'Select first OLE in list + Liste.TypeKeys "" + Liste.select(1) + Liste.TypeKeys "+" + fSelectFirstOLE = 0 + else + QAErrorLog "Navigator did not occoured!" + end if + end if + + case "WRITER" , "HTML" , "MASTERDOCUMENT" : + select case gApplication + case "MASTERDOCUMENT" : Kontext "NavigatorGlobalDoc" + if NavigatorGlobalDoc.Exists(10) then + bNavigatorWasVisible = TRUE + else + ViewNavigator + end if + wait 500 + Kontext "NavigatorGlobalDoc" + if Liste.IsVisible then + Kontext "GlobaldokumentToolbox" + Umschalten.Click + endif + case else : Kontext "NavigatorWriter" + 'First check if Navigator is visible and remember result + if NavigatorWriter.Exists (10) then + bNavigatorWasVisible = TRUE + else + try + 'Invoke Navigator if not visible + ViewNavigator + catch + 'If inside chart or elsewhere the call + 'will fail. Again trying the slot after + 'switching to the document. + Kontext "DocumentWriter" + call gMouseclick (99,99) + call gMouseclick (50,50) + ViewNavigator + endcatch + end if + end select + Kontext "NavigatorWriter" + if NavigatorWriter.Exists(10) then + 'Select first OLE in list + Auswahlliste.TypeKeys "" + for iIndex = 1 to 13 + Auswahlliste.TypeKeys "-" + next iIndex + Auswahlliste.select(5) + Auswahlliste.TypeKeys "+" + fSelectFirstOLE = 0 + else + QAErrorLog "Navigator did not occoured!" + end if + case else : QAErrorLog "Application not supported" + end select + 'Close navigator if it was invisible by entering the routine if bNavigatorWasVisible = TRUE then printlog "Leaving navigator open as initially found" @@ -292,5 +284,5 @@ function fSelectFirstOLE() as integer else printlog "Closing navigator not needed. It was not possible to open it." end if - end if + end if end function diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index cc20a48fe1c7..0edae832b7ff 100755 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '******************************************************************************* '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -44,34 +44,34 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean '/// A graphic will be inserted (not linked). '/// Input: Filename with complete path '/// Return: TRUE or FALSE if the graphic could be inserted or not. - + Dim DieDatei as String Dim IsActive as Boolean - + DieDatei = ConvertPath ( Grafik$ ) - + InsertGraphicsFromFile WaitSlot() - + Kontext If Active.Exists(1) then warnlog " Hinweis: " & Active.GetText Active.Ok End If - - + + Kontext "GrafikEinfuegenDlg" if ( GrafikEinfuegenDlg.exists( 2 ) ) then - + Vorschau.Uncheck - if gApplication <> "HTMLDOKUMENT" AND gApplication <> "HTML" then + if gApplication <> "HTML" AND gApplication <> "HTML" then Verknuepfen.UnCheck end if - + Dateiname.SetText DieDatei DateiTyp.Select 1 ' set the filter to 'all formats' Oeffnen.Click - + Kontext "Active" if Active.Exists(2) then Warnlog " Hinweis: " & Active.GetText @@ -92,7 +92,7 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean hGrafikEinfuegen = IsImageLoaded end if else - 'GrafikEinfuegeDlg not open + 'GrafikEinfuegeDlg not open endif end function ' @@ -105,12 +105,12 @@ function hGrafikVerknuepftEinfuegen ( Grafik$ ) as Boolean '/// Return: TRUE or FALSE if the graphic could be inserted or not. Dim DieDatei as String Dim IsActive as Boolean - + DieDatei = ConvertPath ( Grafik$ ) - + InsertGraphicsFromFile WaitSlot() - + Kontext If Active.Exists(1) then warnlog " Hinweis: " & Active.GetText @@ -118,16 +118,16 @@ function hGrafikVerknuepftEinfuegen ( Grafik$ ) as Boolean End If Kontext "GrafikEinfuegenDlg" if ( GrafikEinfuegenDlg.exists( 1 ) ) then - + Vorschau.UnCheck - if gApplication <> "HTMLDOKUMENT" AND gApplication <> "HTML" then + if gApplication <> "HTML" AND gApplication <> "HTML" then Verknuepfen.Check end if - + Dateiname.SetText DieDatei DateiTyp.Select 1 ' set the filter to 'all formats' Oeffnen.Click - + Kontext "Active" if Active.Exists(2) then Warnlog " Hinweis: " + Active.GetText @@ -154,7 +154,7 @@ function IsItSaved as boolean '/// IsItSaved '/// Wait until document is saved. Dim iLoop as integer - + IsItSaved = FALSE sleep(3) for iLoop =1 to 20 @@ -164,7 +164,7 @@ function IsItSaved as boolean catch IsItSaved = FALSE endcatch - + if IsItSaved = TRUE then exit for end if @@ -179,7 +179,7 @@ function IsItLoaded as boolean '/// IsItLoaded '/// Wait until document is loaded Dim iLoop as integer - + IsItLoaded = FALSE sleep(3) for iLoop =1 to 20 @@ -189,7 +189,7 @@ function IsItLoaded as boolean catch IsItLoaded = FALSE endcatch - + if IsItLoaded = TRUE then exit for end if @@ -207,11 +207,11 @@ function hIsNamedDocLoaded (ShouldFile as String, optional bSilent as boolean) a '/// Input: name of loaded file; Output: True/False ///' '///+' if a doc got loaded, the filename in a 'SaveAs' Dlg is different from "" /// '///+' usually the file name of the loaded document with an changed extension chosen from SO /// - + if (isMissing(bSilent)) then bSilent = False endif - + hIsNamedDocLoaded = FALSE ' Let's start WorstCase :-( FileSaveAs Kontext "SpeichernDlg" @@ -236,7 +236,7 @@ function IsImageLoaded '/// IsImageLoaded '/// Wait until images in document are loaded Dim i% : Dim Herbert as Boolean - + Sleep 3 for i%=1 to 20 try @@ -380,11 +380,11 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa dim iTemp as integer dim sTFileName as string dim iCount as integer - + sPDF = "PDF - Portable Document Format (.pdf)" hExportAsPDFmulti = TRUE ' optimistic iTemp = 0 - + select case (iTypeOfCall) case 1 : '/// click the button 'Export Directly as PDF' on the Functionbar ///' kontext "Standardbar" @@ -412,7 +412,7 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa exit function endcatch end select - + ' only if the type is 1 OR 3 then the File Save dialog appear ' just kept here for compatibility reasons - has to get removed around july 2007 if (iTypeOfCall = 1 OR iTypeOfCall = 3) then @@ -426,19 +426,19 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa hExportAsPDFmulti = FALSE exit function endcatch - + sTemp = Dateityp.GetSelText if (sTemp <> sPDF) then Warnlog "filter for PDF export is missing :-( '" + sPDF + "'" end if '/// set Textbox 'File name' ///' Dateiname.SetText sFileName - 'if the file has no pdf extension then add the extension - if (lCase(right(sFileName, 4))=".pdf") then - sTFileName = sFileName - else - sTFileName = sFileName + ".pdf" - endif + 'if the file has no pdf extension then add the extension + if (lCase(right(sFileName, 4))=".pdf") then + sTFileName = sFileName + else + sTFileName = sFileName + ".pdf" + endif '/// click on the button 'Export...' ///' if (bExecute) then Export.Click @@ -460,7 +460,7 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa else 'ExportAsPDFDlg.Cancel end if - + ' if file exists, there is a message... kontext "PDFOptions" if NOT PDFOptions.exists then @@ -477,8 +477,8 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa end if end if end if - - + + ' only if the type is 2 OR 3 then the PDF option dialog appear if (iTypeOfCall = 2 OR iTypeOfCall = 3) then kontext "PDFOptions" @@ -522,7 +522,7 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa exit function endcatch end select - + select case (iConpression) case 1 : '/// JpegCompression check and ReduceImageResolution check///' try @@ -577,19 +577,19 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa hExportAsPDFmulti = FALSE exit function endcatch - + sTemp = Dateityp.GetSelText if (sTemp <> sPDF) then Warnlog "filter for PDF export is missing :-( '" + sPDF + "'" end if '/// set Textbox 'File name' ///' Dateiname.SetText sFileName - 'if the file has no pdf extension then add the extension - if (lCase(right(sFileName, 4))=".pdf") then - sTFileName = sFileName - else - sTFileName = sFileName + ".pdf" - endif + 'if the file has no pdf extension then add the extension + if (lCase(right(sFileName, 4))=".pdf") then + sTFileName = sFileName + else + sTFileName = sFileName + ".pdf" + endif '/// click on the button 'Export...' ///' if (bExecute) then Speichern.Click @@ -611,7 +611,7 @@ function hExportAsPDFmulti (iTypeOfCall as integer, bExecute as boolean, sFileNa else ExportierenDLG.Cancel end if - + ' if file exists, there is a message... kontext "PDFOptions" if NOT PDFOptions.exists then @@ -637,10 +637,10 @@ function hDeleteFile( cFileOrig as string ) as boolean const CFN = "global::tools::includes::required::t_files.inc::hDeleteFile():" dim cHome as string - cHome = gOfficePath & "user" - cHome = convertpath( cHome ) + cHome = gOfficePath & "user" + cHome = convertpath( cHome ) dim cFile as string - cFile = convertpath( cFileOrig ) + cFile = convertpath( cFileOrig ) '///

      Delete a file

      '///In many cases it is a good idea to use this function outside the testcase.
      @@ -671,7 +671,7 @@ function hDeleteFile( cFileOrig as string ) as boolean ' i introduced this function due to a number of cases where deleting files ' actually failed because of weird code or situations where the user lacks ' accessrights to files are not handled at all. - + '///+
    • We may never delete a file outside gOfficePath/user/work
      • if ( instr( cFile , cHome ) = 0 ) then qaerrorlog( CFN & "Trying to delete file outside (default)homedir -> forbidden" ) @@ -680,7 +680,7 @@ function hDeleteFile( cFileOrig as string ) as boolean hDeleteFile() = false exit function endif - + cFile = convertpath( cFile ) '///+
    • Check that the file exists
      • @@ -715,7 +715,7 @@ function hDeleteFile( cFileOrig as string ) as boolean hDeleteFile() = true endif - + '///
    end function @@ -730,7 +730,7 @@ function hFileOpen( cFile as string ) as boolean if ( C_INFO ) then printlog( CFN & "Load: " & sFile ) FileOpen( "URL", sFile, "FrameName", "_default" ) if ( hFileWait( FALSE ) >= 0 ) then hFileOpen() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -741,14 +741,14 @@ function hFileOpenSpecial( cFile as string, cFlag as string ) as boolean ' cFlag = "ReadOnly" opens file read-onlx ' cFlag = "AsTemplate" opens file as templat ' cFlag = treats string as password - + dim sFile as string : sFile = convertToURL( convertpath( cFile ) ) const CFN = "global::tools::inc::t_files.inc::hFileOpenSpecial():" hFileOpenSpecial() = FALSE if ( C_INFO ) then printlog( "Load (Flag): " & sFile & " (" & cFlag & ")" ) - + select case( lcase( cFlag ) ) - case "readonly" + case "readonly" printlog( CFN & "Load file read-only: " & sFile ) FileOpen( "URL", sFile, "FrameName", "_default", "ReadOnly", TRUE) case "astemplate" @@ -758,11 +758,11 @@ function hFileOpenSpecial( cFile as string, cFlag as string ) as boolean printlog( CFN & "Load file with password: " & sFile ) FileOpen( "URL", sFile, "FrameName", "_default", "Password" , cFlag ) end select - + if ( hFileWait( FALSE ) >= 0 ) then hFileOpenSpecial() = TRUE - + '/// - + end function ' '------------------------------------------------------------------------------- @@ -787,7 +787,7 @@ function hFileSave() as boolean if ( C_INFO ) then printlog( CFN & "Save file." ) FileSave if ( hFileWait( TRUE ) >= 0 ) then hFileSave() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -800,7 +800,7 @@ function hFileSaveAs( cFile as string ) as boolean if ( C_INFO ) then printlog( CFN & "Save: " & sFile ) FileSaveAs( "URL", sFile, "Overwrite", FALSE ) if ( hFileWait( TRUE ) >= 0 ) then hFileSaveAs() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -813,7 +813,7 @@ function hFileSaveAsKill( cFile as string ) as boolean if ( C_INFO ) then printlog( CFN & "Save, replacing: " & sFile ) FileSaveAs( "URL", sFile, "Overwrite", TRUE ) if ( hFileWait( TRUE ) >= 0 ) then hFileSaveAsKill() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -826,7 +826,7 @@ function hFileSaveAsKillWithPassword( cFile as string, cPassword as string ) as if ( C_INFO ) then printlog( CFN & "Save with password, replacing: " & sFile & "::" & cPassword ) FileSaveAs( "URL", sFile, "Overwrite", TRUE, "Password", cPassword ) if ( hFileWait( TRUE ) >= 0 ) then hFileSaveAsKillWithPassword() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -839,7 +839,7 @@ function hFileSaveAsWithFilter( cFile as string, cFilter as string ) as boolean if ( C_INFO ) then printlog( CFN & "Save with filter: " & sFile & "::" & cFilter ) FileSaveAs( "URL", sFile, "FilterName", cFilter, "Overwrite", FALSE ) if ( hFileWait( TRUE ) >= 0 ) then hFileSaveAsWithFilter() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -852,7 +852,7 @@ function hFileSaveAsWithFilterKill( cFile as string, cFilter as string ) as bool if ( C_INFO ) then printlog( CFN & "Save with filter, replacing: " & sFile & "::" & cFilter ) FileSaveAs( "URL", sFile, "FilterName", cFilter, "Overwrite", TRUE ) if ( hFileWait( TRUE ) >= 0 ) then hFileSaveAsWithFilterKill() = TRUE - + end function ' '------------------------------------------------------------------------------- @@ -867,85 +867,85 @@ function hFileWait( optional bWarn as boolean ) as integer const MAX_WAIT = 10 dim iWait as integer : iWait = 0 dim bWarnlog as boolean - + if ( IsMissing( bWarn ) ) then bWarnlog = TRUE else bWarnlog = bWarn endif - + do while( WaitSlot() <> WSFinished ) - + iWait = iWait + 1 - + ' This is the timeout if ( iWait = MAX_WAIT ) then iWait = -1 exit do endif - + ' LOAD: Security warning prevents slot from finishing kontext "SecurityWarning" if ( SecurityWarning.exists() ) then iWait = -2 exit do endif - + ' LOAD: Password dialog kontext "PasswordFileOpen" if ( PasswordFileOpen.exists() ) then iWait = -3 exit do endif - + ' SAVE: Password dialog kontext "PasswordDlg" if ( PasswordDlg.exists() ) then iWait = -4 exit do endif - + ' LOAD: Filter selection dialog Kontext "Filterauswahl" if ( FilterAuswahl.exists() ) then iWait = -5 exit do endif - + ' LOAD: ASCII Filter Options dialog kontext "ASCIIFilterOptionen" if AsciiFilterOptionen.Exists() then iWait = -6 exit do end if - + ' LOAD/SAVE: Some other dialogs that may interrupt file I/O kontext "Active" if ( Active.exists() ) then printlog( Active.getText() ) - + ' This is most likely a warning if ( Active.getButtonCount() = 1 ) then iWait = -7 exit do endif - + ' This is probably the update links dialog if ( Active.getButtonCount() = 2 ) then iWait = -8 exit do endif - + ' This is probably the styles not matching dialog if ( Active.getButtonCount() = 3 ) then iWait = -9 exit do endif - + endif - + loop - + if ( C_INFO ) then select case iWait case -1 : printlog( CFN & "Timeout reached, rc = " & iWait ) @@ -960,12 +960,12 @@ function hFileWait( optional bWarn as boolean ) as integer case else : printlog( CFN & "File I/O completed in " & iWait & " seconds" ) end select endif - + if ( bWarnlog and ( iWait < 0 ) ) then warnlog( CFN & "The messagebox was not expected at this point" ) endif - + hFileWait() = iWait - + end function diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc index 52cc27e29d3a..43afe55a5253 100755 --- a/testautomation/global/tools/includes/required/t_filters.inc +++ b/testautomation/global/tools/includes/required/t_filters.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -35,22 +35,6 @@ '* '* short description : Retrieve and set filternames and suffixes '* -'******************************************************************************* -'** -' #1 hGetSuffix ' get the suffix for a specified build-id -' #1 hGetFilter ' get the filtername for a specified build-id -' #0 hSelectUIFilter ' Select a filter in the UI by API filter name -' #0 hFindFilterPosition ' Find the index of the filter in the file open dialog -' #1 CreateFilterNamesList ' write the default filternames to the reference list -' #1 hGetValueForKeyAsString ' find key in list, return value as string -' #1 hGetValueForPairAsString ' find value in list, return key and value as string -' #1 hGetKeyForPairAsString ' get key from a key=value string as string -' #1 hGetDataFileSection ' read a section from a datafile into a list -' #1 hGetFileData ' return value for key from file directly (ignores sections) -' #1 hGetStartOfSection ' identify beginning of new section in datafile -' #1 hGetEndOfSection ' identify end of section in datafile -' #1 hGetSection ' retrieve list of strings from section -'** '\****************************************************************************** private const LENGTH_OF_FILTERFILE = 100 @@ -60,7 +44,7 @@ function hGetSuffix( optional cBuildId as string ) as string ' This function retrieves the suffix depending on the build id (e.g. 680) ' for a known gApplication from the program configuration. - + ' Currently known Build-IDs are: ' No parameter = current ' "" (empty string) = current @@ -74,14 +58,14 @@ function hGetSuffix( optional cBuildId as string ) as string dim sFilterArray( 100 ) as string dim sFilterConfigName as string dim sSuffix( 10 ) as string - + if ( IsMissing( cBuildId ) ) then cBuildId = "current" if ( cBuildId = "" ) then cBuildId = "current" sMatchingFile = gTesttoolPath & "global\input\filters\" sMatchingFile = sMatchingFile & "build_to_suffix.txt" sMatchingFile = convertpath( sMatchingFile ) - + 'printlog( "DEBUG: SUFFIX: Build-ID: " & cBuildId ) hGetDataFileSection( sMatchingFile, sFilterArray(), cBuildId, "", "" ) sFilterConfigName = hGetValueForKeyAsString( sFilterArray(), gApplication ) @@ -108,19 +92,19 @@ function hGetFilter( optional cBuildId as string ) as string ' 569 = StarOffice 5 (Binary format) dim clTemp( LENGTH_OF_FILTERFILE ) as string ' cFilterFile is stored here - + dim sMatchingFile as string dim sFilterArray( 100 ) as string dim sFilterConfigName as string dim sFilter as string - + if ( IsMissing( cBuildId ) ) then cBuildId = "current" if ( cBuildId = "" ) then cBuildId = "current" - + sMatchingFile = gTesttoolPath & "global\input\filters\" sMatchingFile = sMatchingFile & "build_to_filter.txt" sMatchingFile = convertpath( sMatchingFile ) - + 'printlog( "DEBUG: FILTER: Filter-ID: " & cBuildId ) hGetDataFileSection( sMatchingFile, sFilterArray(), cBuildId, "", "" ) sFilterConfigName = hGetValueForKeyAsString( sFilterArray(), gApplication ) @@ -128,7 +112,7 @@ function hGetFilter( optional cBuildId as string ) as string sFilter = hGetUIFilterName( sFilterConfigName ) 'printlog( "DEBUG: FILTER: " & sFilter ) hGetFilter() = sFilter - + end function '******************************************************************************* @@ -136,8 +120,8 @@ end function function hSelectUIfilter( cAPIFilter as string ) as boolean ' Wrapper for hFindFilterPosition() which also selects the filter - dim irc as integer - + dim irc as integer + irc = hFindFilterPosition( cAPIFilter ) if ( irc > 0 ) then DateiTyp.select( irc ) @@ -145,7 +129,7 @@ function hSelectUIfilter( cAPIFilter as string ) as boolean else hSelectUIfilter() = false endif - + end function '******************************************************************************* @@ -157,40 +141,40 @@ function hFindFilterPosition( cFilter as string ) as integer ' The file types have a suffix appended like " (.odt)" which is not present ' in the API's filter name so it is not possible to select the file ' type directly and we do not have an exact match either. - ' To ensure that we not accidentially select the template a bracket is + ' To ensure that we not accidentially select the template a bracket is ' appended to the string. dim iCurrentFilter as integer dim cCurrentFilter as string dim cUniqueFilter as string - cUniqueFilter = cFilter & " (" - + cUniqueFilter = cFilter & " (" + const CFN = "global::tools::inc::hFindFilterPosition::" - + for iCurrentFilter = 1 to DateiTyp.getItemCount() - + cCurrentFilter = DateiTyp.getItemText( iCurrentFilter ) - + if ( cFilter = cCurrentFilter ) then 'printlog( CFN & "Exact match - this is a UI filter name, not API" ) 'printlog( CFN & "The filter is at pos. " & iCurrentFilter ) hFindFilterPosition() = iCurrentFilter exit function endif - + if ( instr( cCurrentFilter, cUniqueFilter ) > 0 ) then 'printlog( CFN & "Filter found at pos. " & iCurrentFilter ) hFindFilterPosition() = iCurrentFilter exit function endif - + next iCurrentFilter - + warnlog( CFN & "Filter not found: " & cFilter ) warnlog( CFN & "Refer to global::input:.filters::api_filters.txt for a complete list of available filters" ) - + hFindFilterPosition() = 0 - + end function '******************************************************************************* @@ -201,19 +185,19 @@ function hGetUIFiltername( vFiltername as string ) as string '///+ INPUT: 'internal', language independent filter name from FilterFactory. '///+ Examples:
    • hGetUIFiltername("StarOffice XML (Draw)") - Draw OOo 1.x/SO6.0/SO7 UI Filtername
      • '///+
    • sUIFiltername = hGetUIFiltername("StarOffice XML (Impress)") - Impress OOo 1.x/SO6.0/SO7 UI Filtername
    - '/// The 'internal' name can be found in the *.xcu in + '/// The 'internal' name can be found in the *.xcu in '///+ ..../share/registry/res/en-US/org/openoffice/TypeDetection/Filter.xcu. '/// See also: hGetFilternameExtension - - Dim iCurrentFilter as integer + + Dim iCurrentFilter as integer Dim oOpenUNOService as object Dim oFilterName as object Dim oUno as object - + const CFN = "global::tools:includes:required::t_filters.inc::hGetUIFiltername(): " oUno = hGetUNOService( TRUE ) - + oOpenUNOService = oUno.createInstance( "com.sun.star.document.FilterFactory" ) try oFilterName = oOpenUNOService.getByName( vFiltername ) @@ -221,23 +205,23 @@ function hGetUIFiltername( vFiltername as string ) as string for iCurrentFilter = 0 to ubound( oFilterName ) if ( oFilterName( iCurrentFilter ).Name = "UIName" ) then hGetUIFiltername = oFilterName( iCurrentFilter ).Value - end if + end if next iCurrentFilter catch warnlog ( CFN & vFiltername & "'): Filtername is not available." ) hGetUIFiltername() = "" endcatch - + end function '******************************************************************************* function hGetFilternameExtension ( vFilterName as string) - '/// Returns the in the UI used filter name extension(s) as an array. + '/// Returns the in the UI used filter name extension(s) as an array. '///+ Important: Also returns it as an array if there comes a string from the UNO API call. '/// Input: 'internal', language independent name - '/// The 'internal' name can be found in the *.xcu in + '/// The 'internal' name can be found in the *.xcu in '///+ ../share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_[Application_name]_types.xcu file(s). '/// List of some 'internal' filter names for OOo 2.0/SO8: '///+ @@ -253,55 +237,55 @@ function hGetFilternameExtension ( vFilterName as string) '///+ '///+
    Filterinternal nameNote
    StarCalc 5.0calc_StarCalc_50-

    ' (rewritten, compatible routine; July 2004) - - Dim iCurrentExtension as integer + + Dim iCurrentExtension as integer Dim oOpenUNOService as object Dim oFilterNameExtension as object - Dim oUno as object + Dim oUno as object dim aExtensionsSize as integer Dim aExtensions() as string - + const CFN = "global::tools:includes:required::t_filters.inc::hGetFilternameExtension(): " - + 'Initializize UNO comminication oUno = hGetUNOService( TRUE ) - + 'Using the TypeDetection service oOpenUNOService = oUno.createInstance("com.sun.star.document.TypeDetection") - - 'Getting the Extension by given (internal; language- and product + + 'Getting the Extension by given (internal; language- and product 'independent) filter name oFilterNameExtension = oOpenUNOService.getByName(vFiltername) 'using ubound to count the nodes for iCurrentExtension = 0 to ubound( oFilterNameExtension ) - + 'if the node name is 'Extensions'... if ( oFilterNameExtension( iCurrentExtension ).Name = "Extensions" ) then - + '...if it's an array... if ( IsArray( oFilterNameExtension( iCurrentExtension ).Value) ) then - - 'set the size of the aExtensions() array + + 'set the size of the aExtensions() array aExtensionsSize = 10 - - 're-dimension the array with the integer a + + 're-dimension the array with the integer a Redim aExtensions( aExtensionsSize ) as string - + 'return the array into an array - aExtensions() = oFilterNameExtension( iCurrentExtension ).Value() - else + aExtensions() = oFilterNameExtension( iCurrentExtension ).Value() + else '...otherwise 'build' an array with only 'one entry in (0) - Redim aExtensions( 0 ) as string - aExtensions( 0 ) = oFilterNameExtension( iCurrentExtension ).Value + Redim aExtensions( 0 ) as string + aExtensions( 0 ) = oFilterNameExtension( iCurrentExtension ).Value endif endif next iCurrentExtension - + 'put the results into the return value of this function into an array. hGetFilternameExtension = aExtensions() - + end function '******************************************************************************* @@ -336,7 +320,7 @@ function hGetValueForKeyAsString( lsList() as string, sKey as string ) as string next iItem end function - + '******************************************************************************* function hGetValueForPairAsString( cLine as string ) as string @@ -398,7 +382,7 @@ function hGetDataFileSection( cFile as string, lsList() as string, cSection as s ' verify that the sourcefile exists, otherwise warn and abort if ( dir( cFile ) = "" ) then warnlog( CFN & "File not found: " & cFile ) - hGetDataFileSection() = 0 + hGetDataFileSection() = 0 exit function end if @@ -468,7 +452,7 @@ function hGetStartOfSection( lsList() as string , _section as string ) as intege iListSize = listcount( lsList() ) do while ( iThisString <= iListSize ) - + iThisString = iThisString + 1 cThisString = lcase( lsList( iThisString ) ) diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc index 9947c93cd825..b13c6c0b786f 100755 --- a/testautomation/global/tools/includes/required/t_lists.inc +++ b/testautomation/global/tools/includes/required/t_lists.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -35,29 +35,6 @@ '* '* short description : general routines to work with lists (arrays) '* -'******************************************************************* -'* general information : -'* - entry 0 of the list is the counter -'* - you have to start loops everytime with 1 .. n -'* -' #1 ListCount ' Returns the number of list entries -' #1 ListCopy ' Copies one list to another (OrgList(), CopyList()) -' #1 ListAllDelete ' Deletes the complete list -' #1 ListInsert ' Inserts a string into a list at a special number -' #1 ListAppend ' Appends an entry to a list -' #1 ListDelete ' Deletes the n'th entry out of the list (lsList(), EntryNumber) -' #1 ListDeleteString ' Deletes a string out of the list (the first found string) -' #1 ListSort ' Sorts a list with quicksort method, if the 2. parameter is FALSE => downward, else => upward -' #1 ListRead ' Reads a file into a list (row for row) -' #1 ListReadAppend ' Reads a file into a list and append it onto another existed list -' #1 ListWrite ' Writes a list into a file (each entry is a row) => the file will be created new -' #1 ListWriteAppend ' Writes a list into a file, but append all entries to the file -' #1 gCompare2Lists ' Compare two lists with each other -' #1 hListPrint ' print a list to the log with comment -' #1 hListClearPattern ' find pattern in list and replace with blanks -' #1 hListClearBlank ' find and remove blank listentries, update list -' #1 hListIntegrityTest ' extensible function to test array integrity -'* '\****************************************************************** function ListCount ( lsList() as String ) as Integer @@ -75,14 +52,14 @@ function ListCopy ( lsList1() as String, lsList2() as String ) as Boolean '///Copies all entries out of one list into another list. '///+Input:
      list which should be copied
    1. An empty list
    After this function the 2nd list is a copy of the 1st list. '///+Return: If copy of the list is correct this function returns TRUE otherweise FALSE - + Dim ii as Integer - + ListAllDelete ( lsList2() ) for ii=1 to ListCount ( lsList1() ) ListAppend ( lsList2(), lsList1(ii) ) next ii - + if ListCount ( lsList1() ) = ListCount ( lsList2 () ) then ListCopy = TRUE else @@ -116,23 +93,23 @@ function ListDelete ( lsList() as String, iNr as Integer ) as Boolean '///Deletes an entry out of the list on a defined position (iNr). '///+Input:
    1. The list (only string lists are possible)
    2. The position of the entry
    '///+Return: TRUE if the entry was deleted otherweise FALSE - - + + Dim i%, ListenAnzahl as Integer - + ListenAnzahl = listcount( lsList() ) - + if iNr > ListenAnzahl then ListDelete = FALSE Exit Function end if - + for i% = iNr to ListenAnzahl lsList( i% ) = lsList( i% + 1 ) next i% - + lsList(0) = ListenAnzahl - 1 - + ListDelete = TRUE end function @@ -144,7 +121,7 @@ function ListDeleteString ( lsList() as String, sText as String ) as Boolean '///+Input:
    1. The list (only string lists are possible)
    2. The string
    '///+Return: TRUE if the entry was deleted otherwise FALSE Dim i as Integer : Dim EintragsNr as Integer : Dim ListenAnzahl as Integer - + ListenAnzahl = Val(lsList(0)) EintragsNr = 0 for i = 1 to ListenAnzahl @@ -168,23 +145,23 @@ function ListInsert ( lsList() as String, ZeileNr%, sWert$ ) as Boolean '///+Input:
    1. The list (only string lists are possible)
    2. The position
    3. The string
    '///+Return: TRUE if the entry was inserted otherwise FALSE Dim i% : Dim ListenAnzahl as Integer - + ListenAnzahl = Val(lsList(0)) if ZeileNr% > ListenAnzahl then ListInsert = FALSE Exit Function end if - + ' Nach hinten verschieben, hinten beginnend for i% = ListenAnzahl to ZeileNr% step -1 lsList( i%+1 ) = lsList( i% ) next i% - + ' Einfuegen lsList( ZeileNr% ) = sWert$ lsFile(0) = ListenAnzahl + 1 ListInsert = TRUE - + end function '------------------------------------------------------------------------- @@ -197,13 +174,13 @@ function ListRead ( lsList() as String, Datei$, optional sEncode as String ) as Dim bUTF8 as Boolean Dim i% Dim CompareList(15000) as String - + if Dir( Datei$ ) = "" then Warnlog "ListRead: " + Datei$ + " is missing!" ListRead = FALSE exit function end if - + if IsMissing ( sEncode ) = TRUE then bUTF8 = FALSE else @@ -214,26 +191,26 @@ function ListRead ( lsList() as String, Datei$, optional sEncode as String ) as bUTF8 = FALSE end if end if - + ListAllDelete ( lsList() ) ' clean up the list - + if bUTF8 = TRUE then Dim textin as object, sfa as object, xInput as object ' for UTF-8-input-routines Dim iC as Integer - + textin = createUnoService( "com.sun.star.io.TextInputStream" ) ' uno-handling to input an UFT-8-File textin.setEncoding("utf8") ' sfa = createUnoService( "com.sun.star.ucb.SimpleFileAccess" ) ' xInput = sfa.openFileRead( Datei$ ) ' textin.setInputStream( xInput ) ' - + do until textin.isEOF() ' i% = Val(lsList(0)) + 1 lsList(0) = i% lsList( i% ) = textin.readLine() ' loop xInput.closeInput ' uno-file-close - + 'INFO: (TZ) Only to workaround a problem with UNIX-Files... if Right ( lsList(i%), 1 ) = Chr(10) then lsList(i%) = Left ( lsList(i%), Len ( lsList(i%) ) - 1 ) @@ -244,10 +221,10 @@ function ListRead ( lsList() as String, Datei$, optional sEncode as String ) as end if else Dim FileNum% - + FileNum% = FreeFile Open Datei$ for input as #FileNum% - + do until EOF(#FileNum%) ' all from LIS-file i% = Val(lsList(0)) + 1 lsList(0) = i% @@ -265,14 +242,14 @@ function ListWrite ( lsList() as String, Datei$, optional sEncode as String) as '///+Writes a list into a file (an existing file will be deleted before) '///+Input:
    1. The list
    2. The file
    3. optional: The encoding "UTF8"
    '///+return: TRUE or FALSE if this routine can read the file. - + Dim bUTF8 as Boolean Dim i% - + if Dir (Datei$) <> "" then Kill(Datei$) ' the file must be deleted if you use 'UTF8' endif - + if IsMissing ( sEncode ) = TRUE then bUTF8 = FALSE else @@ -283,23 +260,23 @@ function ListWrite ( lsList() as String, Datei$, optional sEncode as String) as bUTF8 = FALSE end if end if - + if bUTF8 = TRUE then Dim textout as object, sfa as object, xOutput as object ' for UTF-8-output-routines - + textout = createUnoService( "com.sun.star.io.TextOutputStream" ) ' uno-handling to output an UFT-8-File textout.setEncoding("utf8") ' sfa = createUnoService( "com.sun.star.ucb.SimpleFileAccess" ) ' xOutput = sfa.openFileWrite( Datei$ ) ' textout.setOutputStream( xOutput ) ' - + for i%=1 to ListCount ( lsList() ) textout.writeString( lsList( i% ) + Chr(13) + Chr(10) ) ' next i% xOutput.closeOutput ' uno-file-close else Dim FileNum% : Dim iLast% - + FileNum% = FreeFile Open Datei$ for Output as #FileNum% iLast% = Val(lsList(0)) @@ -310,7 +287,7 @@ function ListWrite ( lsList() as String, Datei$, optional sEncode as String) as loop Close #FileNum% endif - + ListWrite = TRUE end function @@ -321,21 +298,21 @@ function ListReadAppend( lsList() as String , Datei$, optional sEncode as String '///+Appends a list into a file (If the file exists the file will be deleted before!). '///+Input:
    1. The list
    2. The file
    3. optional: The encoding "UTF8"
    '///+return: TRUE or FALSE if this routine can read the file. - + Dim bUTF8 as Boolean Dim i% Dim CompareList() as String Dim isCounter as Integer Dim FileNum% - + if Dir( Datei$ ) = "" then Warnlog "ListReadAppend : " + Datei$ + " is missing!" ListReadAppend = FALSE exit function end if - + isCounter = ListCount ( lsList() ) - + if IsMissing ( sEncode ) = TRUE then bUTF8 = FALSE else @@ -346,23 +323,23 @@ function ListReadAppend( lsList() as String , Datei$, optional sEncode as String bUTF8 = FALSE end if end if - + if bUTF8 = TRUE then Dim textin as object, sfa as object, xInput as object ' for UTF-8-input-routines - + textin = createUnoService( "com.sun.star.io.TextInputStream" ) ' uno-handling to input an UFT-8-File textin.setEncoding("utf8") ' sfa = createUnoService( "com.sun.star.ucb.SimpleFileAccess" ) ' xInput = sfa.openFileRead( Datei$ ) ' textin.setInputStream( xInput ) ' - + do until textin.isEOF() ' i% = Val(lsList(0)) + 1 lsList(0) = i% lsList( i% ) = textin.readLine() ' loop xInput.closeInput ' uno-file-close - + 'INFO: (TZ) Only to workaround a problem with UNIX-Files... if Right ( lsList(i%), 1 ) = Chr(10) then lsList(i%) = Left ( lsList(i%), Len ( lsList(i%) ) - 1 ) @@ -371,7 +348,7 @@ function ListReadAppend( lsList() as String , Datei$, optional sEncode as String else FileNum% = FreeFile Open Datei$ for input as #FileNum% - + do until EOF(FileNum%) ' All from LIST-file i% = Val(lsList(0)) + 1 lsList(0) = i% @@ -379,9 +356,9 @@ function ListReadAppend( lsList() as String , Datei$, optional sEncode as String loop Close #FileNum% end if - + ListReadAppend = TRUE - + end function '------------------------------------------------------------------------- @@ -391,11 +368,11 @@ function ListWriteAppend( lsList() as String, Datei$, optional sEncode as String '///+Writes a list into a file (If the files exist all entries will be appended). '///+Input:
    1. The list
    2. The file
    3. optional: The encoding "UTF8"
    '///+return: TRUE or FALSE if this routine can read the file. - + Dim bUTF8 as Boolean Dim i% Dim DummyList ( 15000 ) as String - + if IsMissing ( sEncode ) = TRUE then bUTF8 = FALSE else @@ -406,39 +383,39 @@ function ListWriteAppend( lsList() as String, Datei$, optional sEncode as String bUTF8 = FALSE end if end if - + if bUTF8 = TRUE then Dim sfa as object, xOutput as object, textout as object ' for UTF-8-output-routines - + ListRead ( DummyList(), Datei$, "utf8" ) ' read old file in another list for i% = 1 to ListCount ( lsList() ) ListAppend ( DummyList(), lsList(i%) ) ' add the new list at the old list next i% - + textout = createUnoService( "com.sun.star.io.TextOutputStream" ) ' uno-handling to output an UFT-8-File textout.setEncoding("utf8") ' sfa = createUnoService( "com.sun.star.ucb.SimpleFileAccess" ) ' xOutput = sfa.openFileWrite( Datei$ ) ' textout.setOutputStream( xOutput ) ' - + for i%=1 to ListCount (DummyList()) textout.writeString( DummyList( i% ) + Chr(13) + Chr(10 ) ' next i% xOutput.closeOutput ' uno-file-close else Dim FileNum% - + FileNum% = FreeFile Open Datei$ for Append as #FileNum% - + for i% = 1 to Val(lsList(0)) Print #FileNum%, lsList(i%) next i% - + Close #FileNum% end if ListWriteAppend = TRUE - + end function '------------------------------------------------------------------------- @@ -447,10 +424,10 @@ sub ListSort ( lsList() as String, optional UpDown as Boolean ) 'Author: tz '///+Sorts a list upward per default or downward if optional parameter is FALSE with quicksort method. '///+Input: Unsorted list - + Dim Listenanzahl as Integer, i as Integer, j as Integer Dim Zwischenspeicher as String - + ListenAnzahl = Val(lsList(0)) for i=ListenAnzahl-1 to 1 step -1 for j=1 to i @@ -476,169 +453,169 @@ end sub '******************************************************************************* function gCompare2Lists( aListOne() as String, aListTwo() as String ) as boolean - + const CFN = "global::tools::inc::t_list.inc::gCompare2Lists: " - + '///

    Compare two lists with each other, where list TWO is the reference

    '///
      - + dim aOneOnlyList( ubound( aListOne() ) ) as string dim aTwoOnlyList( ubound( aListTwo() ) ) as string - + dim iListOneIndex as integer dim iListTwoIndex as integer - + dim bFound as boolean dim brc as boolean ' returncode: true if lists are identical brc = true - + '///+
    • Create a copy of list two so we do not change the original list
      • ListCopy( aListTwo() , aTwoOnlyList() ) - + '///+
    • Step through each item in list one
      • for iListOneIndex = 1 to ListCount( aListOne() ) - + bFound = false - + '///+
    • Compare it to each item in list two
      • for iListTwoIndex = 1 to ListCount( aTwoOnlyList() ) - + '///+
    • If the entries match, delete it from the TwoOnly list
      • if ( aListOne( iListOneIndex ) = aTwoOnlyList( iListTwoIndex ) ) then - + bFound = true ListDelete( aTwoOnlyList() , iListTwoIndex ) exit for - + end if - + next iListTwoIndex - + '///+
    • If there is no match, the item exists in list one only -> copy
      • if ( not bFound ) then ListAppend( aOneOnlyList() , aListOne( iListOneIndex ) ) end if - + next iListOneIndex - + '///+
    • List all items that exist in List One only
      • if ( ListCount( aOneOnlyList() ) > 0 ) then warnlog( CFN & "Objects have been added to the list" ) hListPrint( aOneOnlyList() , "Items found in list ONE only (NEW)" ) brc = false end if - + '///+
    • List all items that exist in List Two only
      • if ( ListCount( aTwoOnlyList() ) > 0 ) then warnlog( CFN & "Objects have been removed from the list" ) hListPrint( aTwoOnlyList() , "Items found in list TWO only (MISSING)" ) brc = false end if - + gCompare2Lists() = brc '///
    - + end function '******************************************************************************* function hListPrint( lsList() as string , optional cComment as string ) as integer - + const CFN = "global::tools::inc::t_list.inc::hListPrint: " - + '///

    Print the content of a list to the log with a heading comment

    '///
      - + dim iListItem as integer - + '///+
    • If no comment is provided we print a qaerrorlog
      • if ( ismissing( cComment ) ) then qaerrorlog( CFN & "Please provide any string as second parameter." ) cComment = "" end if - + '///+
    • Print a comment if desired
      • if ( cComment <> "" ) then printlog( "" ) printlog( CFN & cComment ) printlog( "" ) end if - + '///+
    • Print all items in the list to the log
      • for iListItem = 1 to listcount( lsList() ) printlog( "(" & iListItem & ") : " & lsList( iListItem ) ) next iListItem - + '///+
    • Return the number of listitems to the calling function
      • hListPrint() = listcount( lsList() ) - + '///
    - + end function '******************************************************************************* function hListClearPattern( lsList() as string, cPattern as string ) as integer - + '///

    Search a list for the occurrence of a special pattern.

    '///+ If the pattern is found, the entries are deleted, the new size of the '///+ array is returned. - + dim iCurItem as integer iCurItem = 1 - + do while ( iCurItem <= listcount( lsList() ) ) - + if ( instr( lsList( iCurItem ) , cPattern ) <> 0 ) then listdelete( lsList() , iCurItem ) else iCurItem = iCurItem + 1 end if - + loop - + hListClearPattern() = listcount( lsList() ) - + end function '******************************************************************************* function hListClearBlank( lsList() as string ) as integer - + '///

    Search a list for blank lines and remove them.

    - + dim iCurItem as integer iCurItem = 1 - + do while ( iCurItem <= listcount( lsList() ) ) - + if ( len( lsList( iCurItem ) ) = 0 ) then listdelete( lsList() , iCurItem ) else iCurItem = iCurItem + 1 end if - + loop - + hListClearBlank() = listcount( lsList() ) - + end function '******************************************************************************* function hListIntegrityTest( sList() as string ) as boolean - + const CFN = "global::tools::inc::t_list.inc::hListIntegrityTest:" - + '///

    Verify that listcount( array ) < ubound( array )

    ' NOTE: some listfunctions fail if ubound = listcount - + dim iListCount as integer dim iUbound as integer - + iListCount = listcount( sList() ) iUbound = ubound( sList() ) - + if ( iListCount >= iUbound ) then warnlog( CFN & "ListCount points beyond array boundary" ) warnlog( CFN & "ListCount: " & iListCount ) @@ -646,9 +623,9 @@ function hListIntegrityTest( sList() as string ) as boolean hListIntegrityTest() = false exit function end if - + hListIntegrityTest() = true - + end function diff --git a/testautomation/global/tools/includes/required/t_menu.inc b/testautomation/global/tools/includes/required/t_menu.inc index 6bbf65ee4fa5..3b0833a51284 100755 --- a/testautomation/global/tools/includes/required/t_menu.inc +++ b/testautomation/global/tools/includes/required/t_menu.inc @@ -66,10 +66,10 @@ function hMenuSelectNr ( EintragsNr as Integer ) as String '///INPUT : number of entry from the bottom (<=-1) '///INPUT : 0 to close menu '///+ OUTPUT: text of the entry - + Dim i, j, RealEnd, Ende as Integer Dim nID as long - + sleep( 2 ) Ende = EintragsNr @@ -121,7 +121,7 @@ function hMenuItemCheck ( EintragsNr as Integer ) as String Ende = EintragsNr RealEnd = hMenuItemGetCount - + if Ende > RealEnd then Warnlog "hMenuItemCheck canceled: Entry number "+ Ende +" does not exists, because there are only " + RealEnd + " entries! " hMenuClose @@ -323,7 +323,7 @@ function hMenuItemIsChecked ( EintragsNr as Integer ) as Boolean endif j=0 for i=1 to Ende - if MenuIsSeperator ( i+j ) then + if MenuIsSeperator ( i+j ) then j = j+1 endif next i @@ -497,7 +497,7 @@ function hWindowGetIndex () as integer '/// function hWindowGetIndex () as integer ///' '///+ returns the number of the active window ///' - + dim iMenues as integer ' takes the number of entries in the windows menue dim iNotWindows as integer ' number of open windows dim iKandidate as integer @@ -551,7 +551,7 @@ function hWindowGetText (optional iWindow as integer) as string iMenues = hMenuItemGetCount hMenuSelectNr(iMenues-1) ' 'windows' ist usually the one before the last - + waitslot() 'wait 200 iMenues = hMenuItemGetCount hWindowGetText = hMenuItemGetTextMitTilde (iUseWindow + (iMenues - iNotWindows) + 1) @@ -597,12 +597,12 @@ function hUseMenu () Kontext "DocumentWriter" DocumentWriter.UseMenu - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.UseMenu - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.UseMenu @@ -627,10 +627,10 @@ function hUseMenu () Kontext "DocumentMath" DocumentMath.UseMenu - case "INSIGHT" : + case "DATABASE" : - Kontext "Insight" - Insight.UseMenu + Kontext "DATABASE" + Database.UseMenu case "BASIC" : @@ -658,12 +658,12 @@ function hOpenContextMenu() Kontext "DocumentWriter" DocumentWriter.openContextMenu - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.openContextMenu - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.openContextMenu diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc index 2de122dc747c..5e2322c27c44 100755 --- a/testautomation/global/tools/includes/required/t_option.inc +++ b/testautomation/global/tools/includes/required/t_option.inc @@ -1,7 +1,7 @@ 'encoding UTF-8 Do not remove or change this line! '************************************************************************** '* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* +'* '* Copyright 2008 by Sun Microsystems, Inc. '* '* OpenOffice.org - a multi-platform office productivity suite @@ -42,552 +42,562 @@ '\*********************************************************************** function hToolsOptions ( Applicationname as string, Tabpagename as string, OPTIONAL bSilent as Boolean ) as Boolean - Dim bCorPage as Boolean - Dim bFirst as Boolean - Dim AnzahlEintraegeZu as Integer - Dim AnzahlEintraege as Integer - Dim i as Integer - Dim startpos as integer - -'///hToolsOptions: Routine to select the correct option page -'///+input: The groupname as string, name of optionpage as string -'///+note: The options dialog has to be opened -'///+OPTIONAL: TRUE as an additional parameter if you want a printlog instead of a warning if a page has not been found. + Dim bCorPage as Boolean + Dim bFirst as Boolean + Dim AnzahlEintraegeZu as Integer + Dim AnzahlEintraege as Integer + Dim i as Integer + Dim startpos as integer + + '///hToolsOptions: Routine to select the correct option page + '///+input: The groupname as string, name of optionpage as string + '///+note: The options dialog has to be opened + '///+OPTIONAL: TRUE as an additional parameter if you want a printlog instead of a warning if a page has not been found. - if IsMissing(bSilent) then - bSilent = FALSE - end if + if IsMissing(bSilent) then + bSilent = FALSE + end if - Kontext "Active" - try - if Active.Exists(1) then Active.OK - catch - if Active.Exists(1) then Active.No - endcatch -'///Group names list: -'///+
    • "StarOffice"
      • -'///+
    • "LoadSave"
      • -'///+
    • "LanguageSettings"
      • -'///+
    • "Internet"
      • -'///+
    • "Textdocument"
      • -'///+
    • "HTMLDocument"
      • -'///+
    • "Spreadsheet"
      • -'///+
    • "Presentation"
      • -'///+
    • "Drawing"
      • -'///+
    • "Formula"
      • -'///+
    • "Chart"
      • -'///+
    • "Datasource"
    - Kontext "ExtrasOptionenDlg" + Kontext "Active" + try + if Active.Exists(1) then Active.OK + catch + if Active.Exists(1) then Active.No + endcatch + '///Group names list: + '///+
    • "StarOffice"
      • + '///+
    • "LoadSave"
      • + '///+
    • "LanguageSettings"
      • + '///+
    • "Internet"
      • + '///+
    • "Textdocument"
      • + '///+
    • "HTMLDocument"
      • + '///+
    • "Spreadsheet"
      • + '///+
    • "Presentation"
      • + '///+
    • "Drawing"
      • + '///+
    • "Formula"
      • + '///+
    • "Chart"
      • + '///+
    • "Datasource"
    + Kontext "ExtrasOptionenDlg" - if ExtrasOptionenDlg.Exists then - Optionsliste.TypeKeys "" - for i = 1 to 12+1 - Optionsliste.TypeKeys "-" - next i - 'Optionsliste.TypeKeys "" - AnzahlEintraegeZu = Optionsliste.GetItemCount - select case Ucase$(Applicationname) - case "STAROFFICE" : startpos = 1 - case "LOADSAVE" : startpos = 2 - case "LANGUAGESETTINGS" : startpos = 3 - case "TEXTDOCUMENT" : if ((lcase(gApplication) = "writer")OR(lcase(gApplication) = "masterdoc")OR(lcase(gApplication) = "htmldokument")) then - startpos = 4 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif - case "HTMLDOCUMENT" : if ((lcase(gApplication) = "writer")OR(lcase(gApplication) = "masterdoc")OR(lcase(gApplication) = "htmldokument")) then - startpos = 5 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif + if ExtrasOptionenDlg.Exists then + Optionsliste.TypeKeys "" + for i = 1 to 12+1 + Optionsliste.TypeKeys "-" + next i + 'Optionsliste.TypeKeys "" + AnzahlEintraegeZu = Optionsliste.GetItemCount + select case Ucase$(Applicationname) + case "STAROFFICE" : startpos = 1 + case "LOADSAVE" : startpos = 2 + case "LANGUAGESETTINGS" : startpos = 3 + case "WRITER" + if ((gApplication = "WRITER")OR(gApplication = "MASTERDOCUMENT")OR(gApplication = "HTML")) then + startpos = 4 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif + case "HTML" + if ((gApplication = "WRITER")OR(gApplication = "MASTERDOCUMENT")OR(gApplication = "HTML")) then + startpos = 5 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif - case "SPREADSHEET" : if (lcase(gApplication) = "calc") then - startpos = 4 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif + case "CALC" + if (gApplication = "CALC") then + startpos = 4 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif - case "PRESENTATION" : if ((lcase(gApplication) = "impress")OR(lcase(gApplication) = "draw")) then - startpos = 4 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif + case "IMPRESS" + if ((gApplication = "DRAW")OR(gApplication = "DRAW")) then + startpos = 4 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif - case "DRAWING" : if ((lcase(gApplication) = "draw")OR(lcase(gApplication) = "impress")) then - startpos = 4 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif + case "DRAWING" + if ((gApplication = "DRAW")OR(gApplication = "IMPRESS")) then + startpos = 4 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif - case "FORMULA" : if (lcase(gApplication) = "math") then - startpos = 4 - else - qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" - exit function - endif + case "MATH" + if (gApplication = "MATH") then + startpos = 4 + else + qaErrorLog "please review your test; the OptionsSet '" + Applicationname + "' is not available for application '" + gApplication + "'" + exit function + endif - case "DATASOURCES" : startpos = AnzahlEintraegeZu -2 - case "CHART" : startpos = AnzahlEintraegeZu -1 - case "INTERNET" : startpos = AnzahlEintraegeZu ' always the last one - case else : warnlog "hToolsOptions(): " + Applicationname + " / " + Tabpagename + " could not be found! Please review your testscript! '" + gApplication + "'" - exit function - end select + case "DATASOURCES" + startpos = AnzahlEintraegeZu -2 + case "CHART" + startpos = AnzahlEintraegeZu -1 + case "INTERNET" + startpos = AnzahlEintraegeZu ' always the last one + case else + warnlog "hToolsOptions(): " + Applicationname + " / " + Tabpagename + " could not be found! Please review your testscript! '" + gApplication + "'" + exit function + end select - Optionsliste.select Startpos - Optionsliste.typekeys "+" - AnzahlEintraege = Optionsliste.GetItemCount - bFirst = TRUE - for i = 1 to AnzahlEintraege - AnzahlEintraegeZu - bCorPage = FALSE - Kontext "ExtrasOptionenDlg" - Optionsliste.TypeKeys "" - sleep (1) - select case ucase$(Applicationname) + Optionsliste.select Startpos + Optionsliste.typekeys "+" + AnzahlEintraege = Optionsliste.GetItemCount + bFirst = TRUE + for i = 1 to AnzahlEintraege - AnzahlEintraegeZu + bCorPage = FALSE + Kontext "ExtrasOptionenDlg" + Optionsliste.TypeKeys "" + sleep (1) + select case ucase$(Applicationname) case "STAROFFICE" -'///Pages in group "StarOffice"are: -'///+
    • "UserData"
      • -'///+
    • "General"
      • -'///+
    • "Memory"
      • -'///+
    • "View"
      • -'///+
    • "Print"
      • -'///+
    • "Paths"
      • -'///+
    • "Colors"
      • -'///+
    • "FontReplacement"
      • -'///+
    • "Security"
      • -'///+
    • "Appearence"
      • -'///+
    • "Accessibility"
      • -'///+
    • "Java"
    - select case ucase$(Tabpagename) - case "USERDATA" - Kontext "TabBenutzerdaten" - if TabBenutzerdaten.exists then bCorPage = TRUE - case "GENERAL" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabSonstigesAllgemein" - If TabSonstigesAllgemein.exists(2) then bCorPage = TRUE - case "MEMORY" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabMemory" - If TabMemory.exists(2) then bCorPage = TRUE - case "VIEW" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabAnsichtAllgemein" - If TabAnsichtAllgemein.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) - bFirst = FALSE - Kontext "TabPrintStarOffice" - if TabPrintStarOffice.exists(2) then bCorPage = TRUE - case "PATHS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabPfade" - If TabPfade.exists(2) then bCorPage = TRUE - case "COLORS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) - bFirst = FALSE - Kontext "TabFarben" - If TabFarben.exists(4) then bCorPage = TRUE - case "FONTREPLACEMENT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 8 ) - bFirst = FALSE - Kontext "TabSchriftErsetzung" - If TabSchriftErsetzung.exists(2) then bCorPage = TRUE - case "SECURITY" - if bFirst = TRUE then Optionsliste.Select ( startpos + 9 ) - bFirst = FALSE - Kontext "TabSecurity" - If TabSecurity.exists(2) then bCorPage = TRUE - case "APPEARANCE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 10 ) - bFirst = FALSE - Kontext "TabAppearance" - If TabAppearance.exists(2) then bCorPage = TRUE - case "ACCESSIBILITY" - if bFirst = TRUE then Optionsliste.Select ( startpos + 11 ) - bFirst = FALSE - Kontext "TabAccessibility" - If TabAccessibility.exists(2) then bCorPage = TRUE - case "JAVA" - if bFirst = TRUE then Optionsliste.Select ( startpos + 12 ) - bFirst = FALSE - Kontext "TabJava" - If TabJava.exists(2) then bCorPage = TRUE - case "ONLINEUPDATE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 13 ) - bFirst = FALSE - Kontext "TabOnlineUpdate" - If TabOnlineUpdate.exists(2) then bCorPage = TRUE - case "IMPROVEMENT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 14 ) - bFirst = FALSE - Kontext "TabOOoImprovement" - If TabOOoImprovement.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE + '///Pages in group "StarOffice"are: + '///+
    • "UserData"
      • + '///+
    • "General"
      • + '///+
    • "Memory"
      • + '///+
    • "View"
      • + '///+
    • "Print"
      • + '///+
    • "Paths"
      • + '///+
    • "Colors"
      • + '///+
    • "FontReplacement"
      • + '///+
    • "Security"
      • + '///+
    • "Appearence"
      • + '///+
    • "Accessibility"
      • + '///+
    • "Java"
    + select case ucase$(Tabpagename) + case "USERDATA" + Kontext "TabBenutzerdaten" + if TabBenutzerdaten.exists then bCorPage = TRUE + case "GENERAL" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabSonstigesAllgemein" + If TabSonstigesAllgemein.exists(2) then bCorPage = TRUE + case "MEMORY" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabMemory" + If TabMemory.exists(2) then bCorPage = TRUE + case "VIEW" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabAnsichtAllgemein" + If TabAnsichtAllgemein.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) + bFirst = FALSE + Kontext "TabPrintStarOffice" + if TabPrintStarOffice.exists(2) then bCorPage = TRUE + case "PATHS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabPfade" + If TabPfade.exists(2) then bCorPage = TRUE + case "COLORS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) + bFirst = FALSE + Kontext "TabFarben" + If TabFarben.exists(4) then bCorPage = TRUE + case "FONTREPLACEMENT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 8 ) + bFirst = FALSE + Kontext "TabSchriftErsetzung" + If TabSchriftErsetzung.exists(2) then bCorPage = TRUE + case "SECURITY" + if bFirst = TRUE then Optionsliste.Select ( startpos + 9 ) + bFirst = FALSE + Kontext "TabSecurity" + If TabSecurity.exists(2) then bCorPage = TRUE + case "APPEARANCE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 10 ) + bFirst = FALSE + Kontext "TabAppearance" + If TabAppearance.exists(2) then bCorPage = TRUE + case "ACCESSIBILITY" + if bFirst = TRUE then Optionsliste.Select ( startpos + 11 ) + bFirst = FALSE + Kontext "TabAccessibility" + If TabAccessibility.exists(2) then bCorPage = TRUE + case "JAVA" + if bFirst = TRUE then Optionsliste.Select ( startpos + 12 ) + bFirst = FALSE + Kontext "TabJava" + If TabJava.exists(2) then bCorPage = TRUE + case "ONLINEUPDATE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 13 ) + bFirst = FALSE + Kontext "TabOnlineUpdate" + If TabOnlineUpdate.exists(2) then bCorPage = TRUE + case "IMPROVEMENT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 14 ) + bFirst = FALSE + Kontext "TabOOoImprovement" + If TabOOoImprovement.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE end select case "LOADSAVE" -'///Pages in group "LoadSave"are: -'///+
    • "General"
      • -'///+
    • "VBAProperties"
      • -'///+
    • "MicrosoftOffice"
      • -'///+
    • "HTMLCompatibility"
    - select case ucase$(Tabpagename) - case "GENERAL" - Kontext "TabSpeichern" - if TabSpeichern.exists then bCorPage = TRUE - case "VBAPROPERTIES" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabMicrosoftOffice97" - If WinwordBasicLaden.exists(4) then bCorPage = TRUE - case "MICROSOFTOFFICE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabMicrosoftOffice2" - If Auswahl.exists(4) then bCorPage = TRUE - case "HTMLCOMPATIBILITY" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabHtml" - If TabHtml.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE + '///Pages in group "LoadSave"are: + '///+
    • "General"
      • + '///+
    • "VBAProperties"
      • + '///+
    • "MicrosoftOffice"
      • + '///+
    • "HTMLCompatibility"
    + select case ucase$(Tabpagename) + case "GENERAL" + Kontext "TabSpeichern" + if TabSpeichern.exists then bCorPage = TRUE + case "VBAPROPERTIES" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabMicrosoftOffice97" + If WinwordBasicLaden.exists(4) then bCorPage = TRUE + case "MICROSOFTOFFICE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabMicrosoftOffice2" + If Auswahl.exists(4) then bCorPage = TRUE + case "HTMLCOMPATIBILITY" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabHtml" + If TabHtml.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE end select case "LANGUAGESETTINGS" -'///Pages in group "LanguageSettings"are: -'///+
    • "Language"
      • -'///+
    • "WritingAids"
      • -'///+
    • "SearchingJapanese"
      • -'///+
    • "AsianLayout"
    -'///+
  • "Complex Text Layout"
    • - Kontext "Active" - if Active.Exists then Active.OK - Kontext "ExtrasOptionenDlg" - select case ucase$(Tabpagename) - case "LANGUAGES" - Kontext "TabSprachen" - If TabSprachen.exists(2) then bCorPage = TRUE - case "WRITINGAIDS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabLinguistik" - If TabLinguistik.exists(2) then bCorPage = TRUE - case "SEARCHINGINJAPANESE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabJapaneseFind" - if TabJapaneseFind.exists(2) then bCorPage = TRUE - case "ASIANLAYOUT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabAsianLayoutOptions" - if TabAsianLayoutOptions.exists(2) then bCorPage = TRUE - case "COMPLEXTEXTLAYOUT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) - bFirst = FALSE - Kontext "TabComplexTextLayout" - if TabComplexTextLayout.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select + '///Pages in group "LanguageSettings"are: + '///+
    • "Language"
      • + '///+
    • "WritingAids"
      • + '///+
    • "SearchingJapanese"
      • + '///+
    • "AsianLayout"
    + '///+
  • "Complex Text Layout"
    • + Kontext "Active" + if Active.Exists then Active.OK + Kontext "ExtrasOptionenDlg" + select case ucase$(Tabpagename) + case "LANGUAGES" + Kontext "TabSprachen" + If TabSprachen.exists(2) then bCorPage = TRUE + case "WRITINGAIDS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabLinguistik" + If TabLinguistik.exists(2) then bCorPage = TRUE + case "SEARCHINGINJAPANESE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabJapaneseFind" + if TabJapaneseFind.exists(2) then bCorPage = TRUE + case "ASIANLAYOUT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabAsianLayoutOptions" + if TabAsianLayoutOptions.exists(2) then bCorPage = TRUE + case "COMPLEXTEXTLAYOUT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) + bFirst = FALSE + Kontext "TabComplexTextLayout" + if TabComplexTextLayout.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE + end select case "INTERNET" -'///Pages in group "Internet"are: -'///+
    • "Proxy"
      • -'///+
    • "Search"
    - Kontext "Active" - if Active.Exists then Active.OK - Kontext "ExtrasOptionenDlg" - select case ucase$(Tabpagename) - case "PROXY" - Kontext "ProxyWarnung" - if ProxyWarnung.Exists then - NichtMehrAnzeigen.Check - ProxyWarnung.OK - end if - Kontext "TabProxyServer" - if TabProxyServer.exists(2) then bCorPage = TRUE - case "SEARCH" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabSuche" - If TabSuche.exists(2) then bCorPage = TRUE - case "EMAIL" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabEmail" - If TabEmail.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "TEXTDOCUMENT" -'///Pages in group "TextDocument"are: -'///+
    • "General"
      • -'///+
    • "View"
      • -'///+
    • "FormattinAids"
      • -'///+
    • "Grid"
      • -'///+
    • "BasicFonts"
      • -'///+
    • "BasicFontsAsian"
      • -'///+
    • "BasicFontsCTL"
      • -'///+
    • "Print"
      • -'///+
    • "Table"
      • -'///+
    • "Changes"
    - select case ucase$(Tabpagename) - case "GENERAL" - Kontext "TabLaden" - If TabLaden.exists then bCorPage = TRUE - case "VIEW" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabInhalteWriter" - If TabInhalteWriter.exists(2) then bCorPage = TRUE - case "FORMATTINGAIDS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabDirektCursor" - If TabDirektCursor.exists(2) then bCorPage = TRUE - case "GRID" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabRaster" - If TabRaster.exists(2) then bCorPage = TRUE - case "BASICFONTS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) - bFirst = FALSE - Kontext "TabGrundschriften" - If TabGrundschriften.exists(2) then bCorPage = TRUE - case "BASICFONTSASIAN" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabGrundschriftenASIAN" - If TabGrundschriftenASIAN.exists(2) then bCorPage = TRUE - case "BASICFONTSCTL" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabGrundschriftenCTL" - If TabGrundschriftenCTL.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabDruckenWriter" - If TabDruckenWriter.exists(2) then bCorPage = TRUE - case "TABLE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) - bFirst = FALSE - Kontext "TabTabelleOptionen" - If TabTabelleOptionen.exists(2) then bCorPage = TRUE - case "CHANGES" - if bFirst = TRUE then Optionsliste.Select ( startpos + 8 ) - bFirst = FALSE - Kontext "TabAenderungenWriter" - If TabAenderungenWriter.exists(2) then bCorPage = TRUE - case "COMPATIBILITY" - if bFirst = TRUE then Optionsliste.Select ( startpos + 9 ) - bFirst = FALSE - Kontext "TabCompatibility" - If TabCompatibility.exists(2) then bCorPage = TRUE - case "AUTOCAPTION" - if bFirst = TRUE then Optionsliste.Select ( startpos + 10 ) - bFirst = FALSE - Kontext "TabAutoCaption" - If TabAutoCaption.exists(2) then bCorPage = TRUE - case "MAILMERGEEMAIL" - if bFirst = TRUE then Optionsliste.Select ( startpos + 11 ) - bFirst = FALSE - Kontext "TabMailMergeEMail" - If TabMailMergeEMail.exists(2) then bCorPage = TRUE + '///Pages in group "Internet"are: + '///+
    • "Proxy"
      • + '///+
    • "Search"
    + Kontext "Active" + if Active.Exists then Active.OK + Kontext "ExtrasOptionenDlg" + select case ucase$(Tabpagename) + case "PROXY" + Kontext "ProxyWarnung" + if ProxyWarnung.Exists then + NichtMehrAnzeigen.Check + ProxyWarnung.OK + end if + Kontext "TabProxyServer" + if TabProxyServer.exists(2) then bCorPage = TRUE + case "SEARCH" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabSuche" + If TabSuche.exists(2) then bCorPage = TRUE + case "EMAIL" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabEmail" + If TabEmail.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE + end select + case "WRITER" + '///Pages in group "TextDocument"are: + '///+
    • "General"
      • + '///+
    • "View"
      • + '///+
    • "FormattinAids"
      • + '///+
    • "Grid"
      • + '///+
    • "BasicFonts"
      • + '///+
    • "BasicFontsAsian"
      • + '///+
    • "BasicFontsCTL"
      • + '///+
    • "Print"
      • + '///+
    • "Table"
      • + '///+
    • "Changes"
    + select case ucase$(Tabpagename) + case "GENERAL" + Kontext "TabLaden" + If TabLaden.exists then bCorPage = TRUE + case "VIEW" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabInhalteWriter" + If TabInhalteWriter.exists(2) then bCorPage = TRUE + case "FORMATTINGAIDS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabDirektCursor" + If TabDirektCursor.exists(2) then bCorPage = TRUE + case "GRID" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabRaster" + If TabRaster.exists(2) then bCorPage = TRUE + case "BASICFONTS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) + bFirst = FALSE + Kontext "TabGrundschriften" + If TabGrundschriften.exists(2) then bCorPage = TRUE + case "BASICFONTSASIAN" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabGrundschriftenASIAN" + If TabGrundschriftenASIAN.exists(2) then bCorPage = TRUE + case "BASICFONTSCTL" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabGrundschriftenCTL" + If TabGrundschriftenCTL.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabDruckenWriter" + If TabDruckenWriter.exists(2) then bCorPage = TRUE + case "TABLE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) + bFirst = FALSE + Kontext "TabTabelleOptionen" + If TabTabelleOptionen.exists(2) then bCorPage = TRUE + case "CHANGES" + if bFirst = TRUE then Optionsliste.Select ( startpos + 8 ) + bFirst = FALSE + Kontext "TabAenderungenWriter" + If TabAenderungenWriter.exists(2) then bCorPage = TRUE + case "COMPATIBILITY" + if bFirst = TRUE then Optionsliste.Select ( startpos + 9 ) + bFirst = FALSE + Kontext "TabCompatibility" + If TabCompatibility.exists(2) then bCorPage = TRUE + case "AUTOCAPTION" + if bFirst = TRUE then Optionsliste.Select ( startpos + 10 ) + bFirst = FALSE + Kontext "TabAutoCaption" + If TabAutoCaption.exists(2) then bCorPage = TRUE + case "MAILMERGEEMAIL" + if bFirst = TRUE then Optionsliste.Select ( startpos + 11 ) + bFirst = FALSE + Kontext "TabMailMergeEMail" + If TabMailMergeEMail.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "HTMLDOCUMENT" -'///Pages in group "HTMLDocument"are: -'///+
    • "General"
      • -'///+
    • "View"
      • -'///+
    • "Grid"
      • -'///+
    • "Print"
      • -'///+
    • "Table"
      • -'///+
    • "Source"
      • -'///+
    • "Background"
    - select case ucase$(Tabpagename) - case "VIEW" - Kontext "TabInhalteHTML" - If TabInhalteHTML.exists then bCorPage = TRUE - case "FORMATTINGAIDS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabDirektCursor" - If TabDirektCursor.exists(2) then bCorPage = TRUE - case "GRID" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabRaster" - If TabRaster.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabDruckenHTML" - If TabDruckenHTML.exists(2) then bCorPage = TRUE - case "TABLE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) - bFirst = FALSE - Kontext "TabTabelleOptionen" - If TabTabelleOptionen.exists(2) then bCorPage = TRUE - case "BACKGROUND" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabHintergrund" - If TabHintergrund.exists then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "SPREADSHEET" -'///Pages in group "Spreadsheet"are: -'///+
    • "General"
      • -'///+
    • "View"
      • -'///+
    • "Calculate"
      • -'///+
    • "Sortlists"
      • -'///+
    • "Changes"
      • -'///+
    • "Grid"
      • -'///+
    • "Print"
    - select case ucase$(Tabpagename) - case "GENERAL" - Kontext "TabLayoutCalc" - If TabLayoutCalc.exists(2) then bCorPage = TRUE - case "VIEW" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabInhaltCalc" - If TabInhaltCalc.exists(2) then bCorPage = TRUE - case "CALCULATE" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabBerechnen" - If TabBerechnen.exists(2) then bCorPage = TRUE - case "SORTLISTS" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabSortierlisten" - If TabSortierlisten.exists(2) then bCorPage = TRUE - case "CHANGES" - if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) - bFirst = FALSE - Kontext "TabAenderungenCalc" - If TabAenderungenCalc.exists(2) then bCorPage = TRUE - case "GRID" - if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) - bFirst = FALSE - Kontext "TabRaster" - If TabRaster.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) - bFirst = FALSE - Kontext "TabPrintCalcOptions" - If TabPrintCalcOptions.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "PRESENTATION" -'///Pages in group "Presentation"are: -'///+
    • "General"
      • -'///+
    • "View"
      • -'///+
    • "Grid"
      • -'///+
    • "Print"
    - select case ucase$(Tabpagename) - case "GENERAL" - Kontext "TabSonstigesDraw" - If TabSonstigesDraw.exists then bCorPage = TRUE - case "VIEW" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabInhalteDraw" - If TabInhalteDraw.exists(2) then bCorPage = TRUE - case "GRID" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabRaster" - If TabRaster.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabDruckenDraw" - If TabDruckenDraw.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "DRAWING" -'///Pages in group "Drawing"are: -'///+
    • "General"
      • -'///+
    • "View"
      • -'///+
    • "Grid"
      • -'///+
    • "Print"
    - select case ucase$(Tabpagename) - case "GENERAL" - Kontext "TabSonstigesDraw" - If TabSonstigesDraw.exists then bCorPage = TRUE - case "VIEW" - if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) - bFirst = FALSE - Kontext "TabInhalteDraw" - If TabInhalteDraw.exists(2) then bCorPage = TRUE - case "GRID" - if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) - bFirst = FALSE - Kontext "TabRaster" - If TabRaster.exists(2) then bCorPage = TRUE - case "PRINT" - if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) - bFirst = FALSE - Kontext "TabDruckenDraw" - If TabDruckenDraw.exists(2) then bCorPage = TRUE - case else : bCorPage = FALSE - end select - case "FORMULA" -'///Page(s) in group "Formula"are: -'///+
    • "Settings"
    - select case ucase$(Tabpagename) - case "SETTINGS" - Kontext "TabDruckenMath" - If TabDruckenMath.exists then bCorPage = TRUE - case else : bCorPage = FALSE - end select + case else : bCorPage = FALSE + end select + case "HTML" + '///Pages in group "HTMLDocument"are: + '///+
    • "General"
      • + '///+
    • "View"
      • + '///+
    • "Grid"
      • + '///+
    • "Print"
      • + '///+
    • "Table"
      • + '///+
    • "Source"
      • + '///+
    • "Background"
    + select case ucase$(Tabpagename) + case "VIEW" + Kontext "TabInhalteHTML" + If TabInhalteHTML.exists then bCorPage = TRUE + case "FORMATTINGAIDS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabDirektCursor" + If TabDirektCursor.exists(2) then bCorPage = TRUE + case "GRID" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabRaster" + If TabRaster.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabDruckenHTML" + If TabDruckenHTML.exists(2) then bCorPage = TRUE + case "TABLE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) + bFirst = FALSE + Kontext "TabTabelleOptionen" + If TabTabelleOptionen.exists(2) then bCorPage = TRUE + case "BACKGROUND" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabHintergrund" + If TabHintergrund.exists then bCorPage = TRUE + case else : bCorPage = FALSE + end select + case "CALC" + '///Pages in group "Spreadsheet"are: + '///+
    • "General"
      • + '///+
    • "View"
      • + '///+
    • "Calculate"
      • + '///+
    • "Sortlists"
      • + '///+
    • "Changes"
      • + '///+
    • "Grid"
      • + '///+
    • "Print"
    + select case ucase$(Tabpagename) + case "GENERAL" + Kontext "TabLayoutCalc" + If TabLayoutCalc.exists(2) then bCorPage = TRUE + case "VIEW" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabInhaltCalc" + If TabInhaltCalc.exists(2) then bCorPage = TRUE + case "CALCULATE" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabBerechnen" + If TabBerechnen.exists(2) then bCorPage = TRUE + case "SORTLISTS" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabSortierlisten" + If TabSortierlisten.exists(2) then bCorPage = TRUE + case "CHANGES" + if bFirst = TRUE then Optionsliste.Select ( startpos + 5 ) + bFirst = FALSE + Kontext "TabAenderungenCalc" + If TabAenderungenCalc.exists(2) then bCorPage = TRUE + case "GRID" + if bFirst = TRUE then Optionsliste.Select ( startpos + 6 ) + bFirst = FALSE + Kontext "TabRaster" + If TabRaster.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 7 ) + bFirst = FALSE + Kontext "TabPrintCalcOptions" + If TabPrintCalcOptions.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE + end select + case "IMPRESS" + '///Pages in group "Presentation"are: + '///+
    • "General"
      • + '///+
    • "View"
      • + '///+
    • "Grid"
      • + '///+
    • "Print"
    + select case ucase$(Tabpagename) + case "GENERAL" + Kontext "TabSonstigesDraw" + If TabSonstigesDraw.exists then bCorPage = TRUE + case "VIEW" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabInhalteDraw" + If TabInhalteDraw.exists(2) then bCorPage = TRUE + case "GRID" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabRaster" + If TabRaster.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabDruckenDraw" + If TabDruckenDraw.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE + end select + case "DRAW" + '///Pages in group "Drawing"are: + '///+
    • "General"
      • + '///+
    • "View"
      • + '///+
    • "Grid"
      • + '///+
    • "Print"
    + select case ucase$(Tabpagename) + case "GENERAL" + Kontext "TabSonstigesDraw" + If TabSonstigesDraw.exists then bCorPage = TRUE + case "VIEW" + if bFirst = TRUE then Optionsliste.Select ( startpos + 2 ) + bFirst = FALSE + Kontext "TabInhalteDraw" + If TabInhalteDraw.exists(2) then bCorPage = TRUE + case "GRID" + if bFirst = TRUE then Optionsliste.Select ( startpos + 3 ) + bFirst = FALSE + Kontext "TabRaster" + If TabRaster.exists(2) then bCorPage = TRUE + case "PRINT" + if bFirst = TRUE then Optionsliste.Select ( startpos + 4 ) + bFirst = FALSE + Kontext "TabDruckenDraw" + If TabDruckenDraw.exists(2) then bCorPage = TRUE + case else : bCorPage = FALSE + end select + case "MATH" + '///Page(s) in group "Formula"are: + '///+
    • "Settings"
    + select case ucase$(Tabpagename) + case "SETTINGS" + Kontext "TabDruckenMath" + If TabDruckenMath.exists then bCorPage = TRUE + case else : bCorPage = FALSE + end select case "CHART" -'///Pages in group "Chart"are: -'///+
    • "DefaultColors"
    - select case ucase$(Tabpagename) - case "DEFAULTCOLORS" - Kontext "TabGrundfarben" - If TabGrundfarben.exists(4) then bCorPage = TRUE - case else : bCorPage = FALSE - end select + '///Pages in group "Chart"are: + '///+
    • "DefaultColors"
    + select case ucase$(Tabpagename) + case "DEFAULTCOLORS" + Kontext "TabGrundfarben" + If TabGrundfarben.exists(4) then bCorPage = TRUE + case else : bCorPage = FALSE + end select case "DATASOURCES" -'///Pages in group "Datasource"are: -'///+
    • "Connetions"
    - select case ucase$(Tabpagename) - case "CONNECTIONS" - Kontext "TabConnections" - If TabConnections.exists(4) then bCorPage = TRUE - case "DATABASES" - Kontext "TabRegisteredDatabase" - If TabRegisteredDatabase.exists(4) then bCorPage = TRUE - case else : bCorPage = FALSE - end select + '///Pages in group "Datasource"are: + '///+
    • "Connetions"
    + select case ucase$(Tabpagename) + case "CONNECTIONS" + Kontext "TabConnections" + If TabConnections.exists(4) then bCorPage = TRUE + case "DATABASES" + Kontext "TabRegisteredDatabase" + If TabRegisteredDatabase.exists(4) then bCorPage = TRUE + case else : bCorPage = FALSE + end select case else - bCorPage = False - end select - If bCorPage = TRUE then Exit for - next i - if bCorPage = FALSE then - if bSilent = FALSE then - warnlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " could not be found! Please review your test!" - else - printlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " should not be found!" - end if - end if - else - bCorPage = FALSE - warnlog "Please open the option-dialog with 'ToolsOptions' before you called this routine!" - end if - hToolsOptions = bCorPage + bCorPage = False + end select + If bCorPage = TRUE then Exit for + next i + if bCorPage = FALSE then + if bSilent = FALSE then + warnlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " could not be found! Please review your test!" + else + printlog "hToolsOptions(): "+ Applicationname + " / " + Tabpagename + " should not be found!" + end if + end if + else + bCorPage = FALSE + warnlog "Please open the option-dialog with 'ToolsOptions' before you called this routine!" + end if + hToolsOptions = bCorPage end function diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc index 51bbf1f98fe1..dc8e4d5817b4 100644 --- a/testautomation/global/tools/includes/required/t_option2.inc +++ b/testautomation/global/tools/includes/required/t_option2.inc @@ -1,613 +1,601 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: t_option2.inc,v $ -'* -'* $Revision: 1.1 $ -'* -'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $ -'* -'* 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 -'* -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* owner : thorsten.bosbach@sun.com -'* -'* short description : Tools library for options testcases -'* -'************************************************************************ -'* -' #0 OptionTabPageZaehler ' Counting tab pages in Tools / Options -' #0 ToPosInOptionlist ' Jumping to the correct position in the options tree -' #0 DialogeFuerTypenKontrollieren 'Complete test for path-options -' #1 hSetMacroSecurity ' switch between security levels in Tools/Options -' #0 fGetSetMacroSecurityUNO ' switch between security levels in Tools/Options without using UI -' #1 hGetMacroSecurityAPI ' Retrieve the current macro security level using API -' #1 hSetMacroSecurityAPI ' Set the macro security level via API -'* -'\*********************************************************************** - -function OptionTabPageZaehler ( SollAnzahl as Integer, optional Ausnahme as Boolean ) -'parameter Ausnahme is depracted - Dim IstAnzahl - Kontext "ExtrasOptionenDlg" - IstAnzahl = Optionsliste.GetItemCount - iSectionNumber - if Ausnahme = FALSE then - if IstAnzahl <> SollAnzahl then WarnLog "Number of tabpages old : " + SollAnzahl + " new : " + IstAnzahl - end if - OptionTabPageZaehler = IstAnzahl -end function - -'------------------------------------------------------------------------- - -sub ToPosInOptionlist ( Sprung as Integer ) - Dim i as Integer - Kontext "OptionenDlg" - Optionsliste.TypeKeys "" - for i = 1 to 12 - Optionsliste.TypeKeys "-" - next i - Optionsliste.Select Sprung - Optionsliste.TypeKeys "+" -end sub - -'------------------------------------------------------------------------- - -sub DialogeFuerTypenKontrollieren -' Complete test for path-options, for all entries the file-dialog or the path-dialog will be opened - Dim i as Integer - Dim iCount as Integer - Dim iErrorCount as integer - Kontext "TabPfade" - Typ.TypeKeys "" - iCount = 0 - iErrorCount = 0 - for i=1 to Typ.GetItemCount - if i<>1 then Typ.TypeKeys "" - printlog " "+typ.getText - if bAsianLan <> TRUE then - try - Bearbeiten.Click - kontext - if active.exists (3) then - iErrorCount = iErrorCount + 1 - if (iErrorCount > 1) then - Warnlog active.getText - endif - qaErrorlog "#i69014# gallery path doesn't exist: '" + active.getText + "'" - printlog active.getText - active.ok - endif - Kontext "OeffnenDlg" - if OeffnenDlg.Exists(2) then - if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!" - OeffnenDlg.Cancel - else - Kontext "PfadeAuswaehlen" - PfadeAuswaehlen.Cancel - end if - Sleep (1) - Kontext "TabPfade" - catch - Warnlog "Error on entry " & i & "!" - Exceptlog - endcatch - else - try - if Bearbeiten.IsEnabled = TRUE then - Bearbeiten.Click - kontext - if active.exists (3) then - iErrorCount = iErrorCount + 1 - if (iErrorCount > 1) then - Warnlog active.getText - endif - qaErrorlog "WorkAround for #109107# has to come up only once @'Add-Ins'! else BUG!" - active.ok - endif - Kontext "OeffnenDlg" - if OeffnenDlg.Exists(2) then - if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!" - OeffnenDlg.Cancel - else - Kontext "PfadeAuswaehlen" - PfadeAuswaehlen.Cancel - end if - Sleep (1) - Kontext "TabPfade" - else - iCount = iCount + 1 - end if - catch - Warnlog "Error on entry " & i & "!" - Exceptlog - endcatch - end if - next i - if iCount > 3 then Warnlog "There are more than 3 entries are disabled!" - -end sub - -'------------------------------------------------------------------------- - -function hSetMacroSecurity( iLevel as integer ) as integer - - '///

    Set macro security level via GUI

    - '///Set the macro security by accessing the Tools/Options-> - '///+ OpenOffice.org/Security::Macro... Tabpage

    - - '///Parameter(s):
    - '///
      - - '///+
    1. Desired macro security level (Integer). Following symbolic names are defined:
      2. - '///
        - '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • - '///
      - - '///
    - - - '///Returns:
    - '///
      - '///+
    1. Previous security level (Integer)
      2. - '///
        - '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • - '///+
      • -1 on error
        • - '///
      - '///
    - - - - '///Switch between macro security levels in Tools/Options - '///
      - const CFN = "hSetMacroSecurity::" - dim iOldSecurityLevel as integer - - dim caLevel( 3 ) as string - caLevel( 0 ) = "low" - caLevel( 1 ) = "medium" - caLevel( 2 ) = "high" - caLevel( 3 ) = "very high" - - if ( ( iLevel < GC_MACRO_SECURITY_LEVEL_LOW ) or ( iLevel > GC_MACRO_SECURITY_LEVEL_VERYHIGH ) ) then - warnlog( CFN & "Invalid index (0...3) passed to function: " & ilevel ) - hSetMacroSecurity() = -1 - exit function - end if - - '///+
    • Open Tools/Options -> OpenOffice.org/Security
      • - ToolsOptions - hToolsOptions( "Staroffice" , "Security" ) - - '///+
    • Click on the macro security button
      • - Kontext "TabSecurity" - if ( MacroSecurity.exists( 2 ) ) then - MacroSecurity.click() - - '///+
    • Ensure we are on the Security Level page
      • - kontext "Active" - if ( Active.exists( 2 ) ) then - - Kontext - active.setpage TabSecurityLevel - - '///+
    • Get the current setting (=returnvalue)
      • - Kontext "TabSecurityLevel" - if ( TabSecurityLevel.exists( 2 ) ) then - if ( veryhigh.isChecked() ) then - iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_VERYHIGH - elseif( high.isChecked() ) then - iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_HIGH - elseif( medium.isChecked() ) then - iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM - elseif( low.isChecked() ) then - iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_LOW - end if - else - printlog( CFN & "Security Tabpage not available. Aborting." ) - kontext "OptionenDlg" - if ( OptionenDlg.exists( 2 ) ) then - OptionenDlg.cancel() - else - warnlog( CFN & "Unrecoverable error, status unknown." ) - endif - hSetMacroSecurity() = -1 - exit function - endif - - '///+
    • Set the new security level
      • - select case iLevel - case GC_MACRO_SECURITY_LEVEL_LOW : low.check() - case GC_MACRO_SECURITY_LEVEL_MEDIUM : medium.check() - case GC_MACRO_SECURITY_LEVEL_HIGH : high.check() - case GC_MACRO_SECURITY_LEVEL_VERYHIGH : veryhigh.check() - end select - - printlog( CFN & "Setting macro security level to " & caLevel( iLevel ) ) - - else - printlog( CFN & "Macro Security Dialog did not open. Aborting." ) - kontext "OptionenDlg" - if ( OptionenDlg.exists( 2 ) ) then - OptionenDlg.cancel() - else - warnlog( CFN & "Unrecoverable error, status unknown." ) - endif - hSetMacroSecurity() = -1 - exit function - endif - - '///+
    • Close Tools/Options
      • - TabSecurityLevel.ok() - else - warnlog( CFN & "The Macro Security Button is not available" ) - iOldSecurityLevel = -1 - end if - Kontext "OptionenDLG" - OptionenDLG.OK() - '///
    - hSetMacroSecurity() = iOldSecurityLevel -end function - -'------------------------------------------------------------------------- - -function fGetSetMacroSecurityUNO (optional iLevel as integer) as integer - ' Input : Security level where 0 = low and 3 = very high; empty: just return current value - ' Return : Previous security level, -1 on error - ' Changes: If iLevel is given, update global variable gMacroSecurityLevel to new level - ' NOTE : If possible use this function outside the testcase - '///Switch between macro security levels in Tools/Options without using the UI - Dim sFileFunction as string - Dim iOldSecurityLevel as integer - Dim oUnoOfficeConnection as object - Dim oUnoConfigurationAccess as object - Dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value - Dim xViewRoot - Dim bOptional as boolean - - sFileFunction = "global::tools::inc::t_option2.inc::hSetMacroSecurity::" - bOptional = isMissing(iLevel) - iOldSecurityLevel = -1 - - ' Open OOo UNO-Port for communication - oUnoOfficeConnection=hGetUnoService(TRUE) - if (NOT isNull(oUnoOfficeConnection)) then - try - ' Open Configuration access - oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") - if (NOT isNull(oUnoConfigurationAccess)) then - ' Specifies the location of the view root in the configuration: - ' The value is the Path name of the configuration item to change. - aPropertyValue(0).Name="nodepath" - ' Controls how updates are handled in the cache: If false , the cache - ' must operate in write-through mode, where updates are written to - ' persistent storage at once - that is before ::commitChanges() returns. - aPropertyValue(1).Name="lazywrite" - aPropertyValue(1).Value=False - - '///Tools / Options / Security - '///Check which 'Macro Security Level' is set and put it into returnvalue. - aPropertyValue(0).Value="/org.openoffice.Office.Common/Security/Scripting" - xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) - iOldSecurityLevel = xViewRoot.getByName("MacroSecurityLevel") - ' If input is given, use it by setting the Security Level - if NOT bOptional then - xViewRoot.setPropertyValue("MacroSecurityLevel", iLevel) - xViewRoot.commitChanges() - ' Since we use lazywrite=false, the call to '.commitChanges()' returns if all data is written. - ' This call to ask for pending changes is just to convince me; - if xViewRoot.hasPendingChanges() then - qaErrorLog(sFileFunction+"Changes still pending...") - ' At this point there is no needed to think about what to do, if it doesn't work. - ' If it doesn't work, the change is performed in the UI via - ' global::system::inc::master.inc::mMakeGeneralOptions - end if - ' Update global value - gMacroSecurityLevel = iLevel - end if - ' Destroy, discard, dump, get rid of, put away, throw away, trash, the object: - xViewRoot.dispose() - else - qaErrorLog(sFileFunction+"Couldn't create Configuration access") - end if - catch - qaErrorLog(sFileFunction+"Failure during reading or setting Configuration Value") - endcatch - else - qaErrorLog(sFileFunction+"Couldn't get UNO service") - end if - fGetSetMacroSecurityUNO = iOldSecurityLevel -end function - - - -'******************************************************************************* - -function hGetMacroSecurityAPI() as integer - - - '///

    Retrieve the macro security level via API

    - '///Use remote UNO to quickly retrieve the current macro security level. - '///+ This function runs silent unless an error is encountered.

    - - '///Parameter(s):
    - '///
      - '///+
    1. No input parameters
      2. - '///
    - - - '///Returns:
    - '///
      - '///+
    1. Macro Security Level (Integer)
      2. - '///
        - '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • - '///+
      • -1 = Error
        • - '///
      - '///
    - - const CFN = "hGetMacroSecurityAPI::" - - dim oUnoOfficeConnection as object - dim oUnoConfigurationAccess as object - dim aPropertyValue( 1 ) As new com.sun.star.beans.PropertyValue - dim iLevel as integer - dim xViewRoot - - try - - oUnoOfficeConnection=hGetUnoService(TRUE) - oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") - - aPropertyValue( 0 ).Name = "nodepath" - aPropertyValue( 0 ).Value = "/org.openoffice.Office.Common/Security/Scripting" - aPropertyValue( 1 ).Name = "lazywrite" - aPropertyValue( 1 ).Value = FALSE - - xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", aPropertyValue() ) - iLevel = xViewRoot.getByName( "MacroSecurityLevel" ) - xViewRoot.dispose() - - catch - - warnlog( CFN & "Failed to retrieve macro security Level via API" ) - iLevel = -1 - - endcatch - - hGetMacroSecurityAPI() = iLevel - -end function - - -'******************************************************************************* - -function hSetMacroSecurityAPI( iSecLevel as integer ) as integer - - - '///

    Set macro security level using API

    - '///Set the macro security using remote uno. This implementation does exactly - '///+ the same as hSetMacroSecurity but is considerably faster

    - - '///Parameter(s):
    - '///
      - - '///+
    1. Desired macro security level (Integer). Following symbolic names are defined:
      2. - '///
        - '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • - '///
      - - '///
    - - - '///Returns:
    - '///
      - '///+
    1. Previous security level (Integer)
      2. - '///
        - '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • - '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • - '///+
      • -1 on error
        • - '///
      - '///
    - - const CFN = "hSetMacroSecurityAPI::" - - dim oUnoOfficeConnection as object - dim oUnoConfigurationAccess as object - dim aPropertyValue( 1 ) As new com.sun.star.beans.PropertyValue - dim iLevel as integer - dim xViewRoot - - dim caLevel( 3 ) as string - caLevel( 0 ) = "low" - caLevel( 1 ) = "medium" - caLevel( 2 ) = "high" - caLevel( 3 ) = "very high" - - aPropertyValue( 0 ).Name = "nodepath" - aPropertyValue( 0 ).Value = "/org.openoffice.Office.Common/Security/Scripting" - aPropertyValue( 1 ).Name = "lazywrite" - aPropertyValue( 1 ).Value = FALSE - - '///Description: - '///
      - - iLevel = 0 - - '///+
    • Verify input parameter, quit function with a warning on error
      • - if ( iSecLevel < GC_MACRO_SECURITY_LEVEL_LOW or iSecLevel > GC_MACRO_SECURITY_LEVEL_VERYHIGH ) then - - warnlog( CFN & "Invalid security level passed to function: " & iSecLevel ) - hSetMacroSecurityAPI() = -1 - exit function - - endif - - - '///+
    • Get current security level, set the new one
      • - try - - oUnoOfficeConnection=hGetUnoService(TRUE) - oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") - - xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) - iLevel = xViewRoot.getByName( "MacroSecurityLevel" ) ' Get the current value - xViewRoot.setPropertyValue( "MacroSecurityLevel" , iSecLevel ) ' Set the new value - xViewRoot.commitChanges() - xViewRoot.dispose() - - printlog( CFN & "Setting macro security level to " & caLevel( iSecLevel ) - - catch - - warnlog( CFN & "Failed to get/set new macro security level via API:" & iSecLevel ) - iLevel = -1 - - endcatch - '///
    - - hSetMacroSecurityAPI() = iLevel - -end function - -'******************************************************************************* - -function hIsOOoImprovementTabVisible() as boolean - - ' This function tries to find out whether the OOo Improvement Program - ' Tabpage in Tools/Options is visible or not. - - dim oUnoConnect as object - dim oOOoImprovementController as object - dim bExists as boolean - const CFN = "hIsOOoImprovementTabVisible()::" - - oUnoConnect = hGetUnoService( TRUE ) - if ( isNull( oUnoConnect ) ) then - warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) - hIsOOoImprovementTabVisible() = FALSE - exit function - else - try - oOOoImprovementController = oUnoConnect.createInstance( "com.sun.star.oooimprovement.CoreController" ) - bExists = oOOoImprovementController.showBuiltinOptionsPage( 1 ) - if ( bExists ) then - 'printlog( CFN & "The OOo Improvement Program Tabpage is visible" ) - hIsOOoImprovementTabVisible() = TRUE - else - printlog( CFN & "The OOo Improvement Program Tabpage is not visible" ) - hIsOOoImprovementTabVisible() = FALSE - endif - catch - warnlog( CFN & "Method com.sun.star.oooimprovement.CoreController.showBuiltinOptionsPage() not available." ) - printlog( CFN & "This indicates that the OOo Improvement Program feature is not included in this build." ) - hIsOOoImprovementTabVisible() = FALSE - endcatch - endif - -end function - -'******************************************************************************* - -function hEnableOOoImprovementProgramUNO() as boolean - - ' This function tries to enable the OOo Improvement Program (switch it on) - dim oUnoOfficeConnection as object - dim oUnoConfigurationAccess as object - dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value - dim xViewRoot - - const CFN = "hEnableOOoImprovementProgramUNO()::" - - aPropertyValue(0).Name = "nodepath" - aPropertyValue(0).Value = "/org.openoffice.Office.OOoImprovement.Settings/Participation" - aPropertyValue(1).Name = "lazywrite" - aPropertyValue(1).Value = False - - oUnoOfficeConnection = hGetUnoService( TRUE ) - if ( isNull( oUnoOfficeConnection )) then - warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) - hEnableOOoImprovementProgramUNO() = FALSE +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: t_option2.inc,v $ +'* +'* $Revision: 1.1 $ +'* +'* last change: $Author: jsi $ $Date: 2008-06-13 10:27:11 $ +'* +'* 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 +'* +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'* +'* owner : thorsten.bosbach@sun.com +'* +'* short description : Tools library for options testcases +'* +'\*********************************************************************** + +function OptionTabPageZaehler ( SollAnzahl as Integer, optional Ausnahme as Boolean ) + 'parameter Ausnahme is depracted + Dim IstAnzahl + Kontext "ExtrasOptionenDlg" + IstAnzahl = Optionsliste.GetItemCount - iSectionNumber + if Ausnahme = FALSE then + if IstAnzahl <> SollAnzahl then WarnLog "Number of tabpages old : " + SollAnzahl + " new : " + IstAnzahl + end if + OptionTabPageZaehler = IstAnzahl +end function + +'------------------------------------------------------------------------- + +sub ToPosInOptionlist ( Sprung as Integer ) + Dim i as Integer + Kontext "OptionenDlg" + Optionsliste.TypeKeys "" + for i = 1 to 12 + Optionsliste.TypeKeys "-" + next i + Optionsliste.Select Sprung + Optionsliste.TypeKeys "+" +end sub + +'------------------------------------------------------------------------- + +sub DialogeFuerTypenKontrollieren + ' Complete test for path-options, for all entries the file-dialog or the path-dialog will be opened + Dim i as Integer + Dim iCount as Integer + Dim iErrorCount as integer + Kontext "TabPfade" + Typ.TypeKeys "" + iCount = 0 + iErrorCount = 0 + for i=1 to Typ.GetItemCount + if i<>1 then Typ.TypeKeys "" + printlog " "+typ.getText + if bAsianLan <> TRUE then + try + Bearbeiten.Click + kontext + if active.exists (3) then + iErrorCount = iErrorCount + 1 + if (iErrorCount > 1) then + Warnlog active.getText + endif + qaErrorlog "#i69014# gallery path doesn't exist: '" + active.getText + "'" + printlog active.getText + active.ok + endif + Kontext "OeffnenDlg" + if OeffnenDlg.Exists(2) then + if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!" + OeffnenDlg.Cancel + else + Kontext "PfadeAuswaehlen" + PfadeAuswaehlen.Cancel + end if + Sleep (1) + Kontext "TabPfade" + catch + Warnlog "Error on entry " & i & "!" + Exceptlog + endcatch + else + try + if Bearbeiten.IsEnabled = TRUE then + Bearbeiten.Click + kontext + if active.exists (3) then + iErrorCount = iErrorCount + 1 + if (iErrorCount > 1) then + Warnlog active.getText + endif + qaErrorlog "WorkAround for #109107# has to come up only once @'Add-Ins'! else BUG!" + active.ok + endif + Kontext "OeffnenDlg" + if OeffnenDlg.Exists(2) then + if Dateityp.IsVisible = TRUE then Warnlog "The normal FileOpen-Dialog is visible with the Filetype-Listbox => BUG!" + OeffnenDlg.Cancel + else + Kontext "PfadeAuswaehlen" + PfadeAuswaehlen.Cancel + end if + Sleep (1) + Kontext "TabPfade" + else + iCount = iCount + 1 + end if + catch + Warnlog "Error on entry " & i & "!" + Exceptlog + endcatch + end if + next i + if iCount > 3 then Warnlog "There are more than 3 entries are disabled!" + +end sub + +'------------------------------------------------------------------------- + +function hSetMacroSecurity( iLevel as integer ) as integer + + '///

    Set macro security level via GUI

    + '///Set the macro security by accessing the Tools/Options-> + '///+ OpenOffice.org/Security::Macro... Tabpage

    + + '///Parameter(s):
    + '///
      + + '///+
    1. Desired macro security level (Integer). Following symbolic names are defined:
      2. + '///
        + '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • + '///
      + + '///
    + + + '///Returns:
    + '///
      + '///+
    1. Previous security level (Integer)
      2. + '///
        + '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • + '///+
      • -1 on error
        • + '///
      + '///
    + + + + '///Switch between macro security levels in Tools/Options + '///
      + const CFN = "hSetMacroSecurity::" + dim iOldSecurityLevel as integer + + dim caLevel( 3 ) as string + caLevel( 0 ) = "low" + caLevel( 1 ) = "medium" + caLevel( 2 ) = "high" + caLevel( 3 ) = "very high" + + if ( ( iLevel < GC_MACRO_SECURITY_LEVEL_LOW ) or ( iLevel > GC_MACRO_SECURITY_LEVEL_VERYHIGH ) ) then + warnlog( CFN & "Invalid index (0...3) passed to function: " & ilevel ) + hSetMacroSecurity() = -1 + exit function + end if + + '///+
    • Open Tools/Options -> OpenOffice.org/Security
      • + ToolsOptions + hToolsOptions( "Staroffice" , "Security" ) + + '///+
    • Click on the macro security button
      • + Kontext "TabSecurity" + if ( MacroSecurity.exists( 2 ) ) then + MacroSecurity.click() + + '///+
    • Ensure we are on the Security Level page
      • + kontext "Active" + if ( Active.exists( 2 ) ) then + + Kontext + active.setpage TabSecurityLevel + + '///+
    • Get the current setting (=returnvalue)
      • + Kontext "TabSecurityLevel" + if ( TabSecurityLevel.exists( 2 ) ) then + if ( veryhigh.isChecked() ) then + iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_VERYHIGH + elseif( high.isChecked() ) then + iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_HIGH + elseif( medium.isChecked() ) then + iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_MEDIUM + elseif( low.isChecked() ) then + iOldSecurityLevel = GC_MACRO_SECURITY_LEVEL_LOW + end if + else + printlog( CFN & "Security Tabpage not available. Aborting." ) + kontext "OptionenDlg" + if ( OptionenDlg.exists( 2 ) ) then + OptionenDlg.cancel() + else + warnlog( CFN & "Unrecoverable error, status unknown." ) + endif + hSetMacroSecurity() = -1 + exit function + endif + + '///+
    • Set the new security level
      • + select case iLevel + case GC_MACRO_SECURITY_LEVEL_LOW : low.check() + case GC_MACRO_SECURITY_LEVEL_MEDIUM : medium.check() + case GC_MACRO_SECURITY_LEVEL_HIGH : high.check() + case GC_MACRO_SECURITY_LEVEL_VERYHIGH : veryhigh.check() + end select + + printlog( CFN & "Setting macro security level to " & caLevel( iLevel ) ) + + else + printlog( CFN & "Macro Security Dialog did not open. Aborting." ) + kontext "OptionenDlg" + if ( OptionenDlg.exists( 2 ) ) then + OptionenDlg.cancel() + else + warnlog( CFN & "Unrecoverable error, status unknown." ) + endif + hSetMacroSecurity() = -1 + exit function + endif + + '///+
    • Close Tools/Options
      • + TabSecurityLevel.ok() else - oUnoConfigurationAccess = oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") - xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) - xViewRoot.replaceByName( "ShowedInvitation", TRUE ) - xViewRoot.replaceByName( "InvitationAccepted", TRUE ) - xViewRoot.commitChanges() - hEnableOOoImprovementProgramUNO() = TRUE - if ( xViewRoot.hasPendingChanges() ) then - hEnableOOoImprovementProgramUNO() = FALSE - endif - xViewRoot.dispose() - endif - -end function - -'******************************************************************************* - -function hDisableOOoImprovementProgramUNO() as boolean - - ' This function tries to enable the OOo Improvement Program (switch it on) - dim oUnoOfficeConnection as object - dim oUnoConfigurationAccess as object - dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value - dim xViewRoot - - const CFN = "hDisableOOoImprovementProgramUNO()::" - - aPropertyValue(0).Name = "nodepath" - aPropertyValue(0).Value = "/org.openoffice.Office.OOoImprovement.Settings/Participation" - aPropertyValue(1).Name = "lazywrite" - aPropertyValue(1).Value = False - - oUnoOfficeConnection = hGetUnoService( TRUE ) - if ( isNull( oUnoOfficeConnection )) then - warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) - hDisableOOoImprovementProgramUNO() = FALSE + warnlog( CFN & "The Macro Security Button is not available" ) + iOldSecurityLevel = -1 + end if + Kontext "OptionenDLG" + OptionenDLG.OK() + '///
    + hSetMacroSecurity() = iOldSecurityLevel +end function + +'------------------------------------------------------------------------- + +function fGetSetMacroSecurityUNO (optional iLevel as integer) as integer + ' Input : Security level where 0 = low and 3 = very high; empty: just return current value + ' Return : Previous security level, -1 on error + ' Changes: If iLevel is given, update global variable gMacroSecurityLevel to new level + ' NOTE : If possible use this function outside the testcase + '///Switch between macro security levels in Tools/Options without using the UI + Dim sFileFunction as string + Dim iOldSecurityLevel as integer + Dim oUnoOfficeConnection as object + Dim oUnoConfigurationAccess as object + Dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value + Dim xViewRoot + Dim bOptional as boolean + + sFileFunction = "global::tools::inc::t_option2.inc::hSetMacroSecurity::" + bOptional = isMissing(iLevel) + iOldSecurityLevel = -1 + + ' Open OOo UNO-Port for communication + oUnoOfficeConnection=hGetUnoService(TRUE) + if (NOT isNull(oUnoOfficeConnection)) then + try + ' Open Configuration access + oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") + if (NOT isNull(oUnoConfigurationAccess)) then + ' Specifies the location of the view root in the configuration: + ' The value is the Path name of the configuration item to change. + aPropertyValue(0).Name="nodepath" + ' Controls how updates are handled in the cache: If false , the cache + ' must operate in write-through mode, where updates are written to + ' persistent storage at once - that is before ::commitChanges() returns. + aPropertyValue(1).Name="lazywrite" + aPropertyValue(1).Value=False + + '///Tools / Options / Security + '///Check which 'Macro Security Level' is set and put it into returnvalue. + aPropertyValue(0).Value="/org.openoffice.Office.Common/Security/Scripting" + xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) + iOldSecurityLevel = xViewRoot.getByName("MacroSecurityLevel") + ' If input is given, use it by setting the Security Level + if NOT bOptional then + xViewRoot.setPropertyValue("MacroSecurityLevel", iLevel) + xViewRoot.commitChanges() + ' Since we use lazywrite=false, the call to '.commitChanges()' returns if all data is written. + ' This call to ask for pending changes is just to convince me; + if xViewRoot.hasPendingChanges() then + qaErrorLog(sFileFunction+"Changes still pending...") + ' At this point there is no needed to think about what to do, if it doesn't work. + ' If it doesn't work, the change is performed in the UI via + ' global::system::inc::master.inc::mMakeGeneralOptions + end if + ' Update global value + gMacroSecurityLevel = iLevel + end if + ' Destroy, discard, dump, get rid of, put away, throw away, trash, the object: + xViewRoot.dispose() + else + qaErrorLog(sFileFunction+"Couldn't create Configuration access") + end if + catch + qaErrorLog(sFileFunction+"Failure during reading or setting Configuration Value") + endcatch else - oUnoConfigurationAccess = oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") - xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) - xViewRoot.replaceByName( "ShowedInvitation", TRUE ) - xViewRoot.replaceByName( "InvitationAccepted", FALSE ) - xViewRoot.commitChanges() - hDisableOOoImprovementProgramUNO() = TRUE - if ( xViewRoot.hasPendingChanges() ) then - hDisableOOoImprovementProgramUNO() = FALSE - endif - xViewRoot.dispose() - endif - -end function + qaErrorLog(sFileFunction+"Couldn't get UNO service") + end if + fGetSetMacroSecurityUNO = iOldSecurityLevel +end function + +'******************************************************************************* + +function hGetMacroSecurityAPI() as integer + + + '///

    Retrieve the macro security level via API

    + '///Use remote UNO to quickly retrieve the current macro security level. + '///+ This function runs silent unless an error is encountered.

    + + '///Parameter(s):
    + '///
      + '///+
    1. No input parameters
      2. + '///
    + + + '///Returns:
    + '///
      + '///+
    1. Macro Security Level (Integer)
      2. + '///
        + '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • + '///+
      • -1 = Error
        • + '///
      + '///
    + + const CFN = "hGetMacroSecurityAPI::" + + dim oUnoOfficeConnection as object + dim oUnoConfigurationAccess as object + dim aPropertyValue( 1 ) As new com.sun.star.beans.PropertyValue + dim iLevel as integer + dim xViewRoot + + try + + oUnoOfficeConnection=hGetUnoService(TRUE) + oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") + + aPropertyValue( 0 ).Name = "nodepath" + aPropertyValue( 0 ).Value = "/org.openoffice.Office.Common/Security/Scripting" + aPropertyValue( 1 ).Name = "lazywrite" + aPropertyValue( 1 ).Value = FALSE + + xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", aPropertyValue() ) + iLevel = xViewRoot.getByName( "MacroSecurityLevel" ) + xViewRoot.dispose() + + catch + + warnlog( CFN & "Failed to retrieve macro security Level via API" ) + iLevel = -1 + + endcatch + + hGetMacroSecurityAPI() = iLevel + +end function + + +'******************************************************************************* + +function hSetMacroSecurityAPI( iSecLevel as integer ) as integer + + + '///

    Set macro security level using API

    + '///Set the macro security using remote uno. This implementation does exactly + '///+ the same as hSetMacroSecurity but is considerably faster

    + + '///Parameter(s):
    + '///
      + + '///+
    1. Desired macro security level (Integer). Following symbolic names are defined:
      2. + '///
        + '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • + '///
      + + '///
    + + + '///Returns:
    + '///
      + '///+
    1. Previous security level (Integer)
      2. + '///
        + '///+
      • GC_MACRO_SECURITY_LEVEL_LOW (0) for low security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_MEDIUM (1) for medium security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_HIGH (2) for high security
        • + '///+
      • GC_MACRO_SECURITY_LEVEL_VERYHIGH (3) for very high security
        • + '///+
      • -1 on error
        • + '///
      + '///
    + + const CFN = "hSetMacroSecurityAPI::" + + dim oUnoOfficeConnection as object + dim oUnoConfigurationAccess as object + dim aPropertyValue( 1 ) As new com.sun.star.beans.PropertyValue + dim iLevel as integer + dim xViewRoot + + dim caLevel( 3 ) as string + caLevel( 0 ) = "low" + caLevel( 1 ) = "medium" + caLevel( 2 ) = "high" + caLevel( 3 ) = "very high" + + aPropertyValue( 0 ).Name = "nodepath" + aPropertyValue( 0 ).Value = "/org.openoffice.Office.Common/Security/Scripting" + aPropertyValue( 1 ).Name = "lazywrite" + aPropertyValue( 1 ).Value = FALSE + + '///Description: + '///
      + + iLevel = 0 + + '///+
    • Verify input parameter, quit function with a warning on error
      • + if ( iSecLevel < GC_MACRO_SECURITY_LEVEL_LOW or iSecLevel > GC_MACRO_SECURITY_LEVEL_VERYHIGH ) then + + warnlog( CFN & "Invalid security level passed to function: " & iSecLevel ) + hSetMacroSecurityAPI() = -1 + exit function + + endif + + + '///+
    • Get current security level, set the new one
      • + try + + oUnoOfficeConnection=hGetUnoService(TRUE) + oUnoConfigurationAccess=oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") + + xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) + iLevel = xViewRoot.getByName( "MacroSecurityLevel" ) ' Get the current value + xViewRoot.setPropertyValue( "MacroSecurityLevel" , iSecLevel ) ' Set the new value + xViewRoot.commitChanges() + xViewRoot.dispose() + + printlog( CFN & "Setting macro security level to " & caLevel( iSecLevel ) + + catch + + warnlog( CFN & "Failed to get/set new macro security level via API:" & iSecLevel ) + iLevel = -1 + + endcatch + '///
    + + hSetMacroSecurityAPI() = iLevel + +end function + +'******************************************************************************* + +function hIsOOoImprovementTabVisible() as boolean + + ' This function tries to find out whether the OOo Improvement Program + ' Tabpage in Tools/Options is visible or not. + + dim oUnoConnect as object + dim oOOoImprovementController as object + dim bExists as boolean + const CFN = "hIsOOoImprovementTabVisible()::" + + oUnoConnect = hGetUnoService( TRUE ) + if ( isNull( oUnoConnect ) ) then + warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) + hIsOOoImprovementTabVisible() = FALSE + exit function + else + try + oOOoImprovementController = oUnoConnect.createInstance( "com.sun.star.oooimprovement.CoreController" ) + bExists = oOOoImprovementController.showBuiltinOptionsPage( 1 ) + if ( bExists ) then + 'printlog( CFN & "The OOo Improvement Program Tabpage is visible" ) + hIsOOoImprovementTabVisible() = TRUE + else + printlog( CFN & "The OOo Improvement Program Tabpage is not visible" ) + hIsOOoImprovementTabVisible() = FALSE + endif + catch + warnlog( CFN & "Method com.sun.star.oooimprovement.CoreController.showBuiltinOptionsPage() not available." ) + printlog( CFN & "This indicates that the OOo Improvement Program feature is not included in this build." ) + hIsOOoImprovementTabVisible() = FALSE + endcatch + endif + +end function + +'******************************************************************************* + +function hEnableOOoImprovementProgramUNO() as boolean + + ' This function tries to enable the OOo Improvement Program (switch it on) + dim oUnoOfficeConnection as object + dim oUnoConfigurationAccess as object + dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value + dim xViewRoot + + const CFN = "hEnableOOoImprovementProgramUNO()::" + + aPropertyValue(0).Name = "nodepath" + aPropertyValue(0).Value = "/org.openoffice.Office.OOoImprovement.Settings/Participation" + aPropertyValue(1).Name = "lazywrite" + aPropertyValue(1).Value = False + + oUnoOfficeConnection = hGetUnoService( TRUE ) + if ( isNull( oUnoOfficeConnection )) then + warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) + hEnableOOoImprovementProgramUNO() = FALSE + else + oUnoConfigurationAccess = oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") + xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) + xViewRoot.replaceByName( "ShowedInvitation", TRUE ) + xViewRoot.replaceByName( "InvitationAccepted", TRUE ) + xViewRoot.commitChanges() + hEnableOOoImprovementProgramUNO() = TRUE + if ( xViewRoot.hasPendingChanges() ) then + hEnableOOoImprovementProgramUNO() = FALSE + endif + xViewRoot.dispose() + endif + +end function + +'******************************************************************************* + +function hDisableOOoImprovementProgramUNO() as boolean + + ' This function tries to enable the OOo Improvement Program (switch it on) + dim oUnoOfficeConnection as object + dim oUnoConfigurationAccess as object + dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value + dim xViewRoot + + const CFN = "hDisableOOoImprovementProgramUNO()::" + + aPropertyValue(0).Name = "nodepath" + aPropertyValue(0).Value = "/org.openoffice.Office.OOoImprovement.Settings/Participation" + aPropertyValue(1).Name = "lazywrite" + aPropertyValue(1).Value = False + + oUnoOfficeConnection = hGetUnoService( TRUE ) + if ( isNull( oUnoOfficeConnection )) then + warnlog( CFN & "Failed to establish UNO connection, hGetUnoService failed" ) + hDisableOOoImprovementProgramUNO() = FALSE + else + oUnoConfigurationAccess = oUnoOfficeConnection.createInstance("com.sun.star.configuration.ConfigurationProvider") + xViewRoot = oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue()) + xViewRoot.replaceByName( "ShowedInvitation", TRUE ) + xViewRoot.replaceByName( "InvitationAccepted", FALSE ) + xViewRoot.commitChanges() + hDisableOOoImprovementProgramUNO() = TRUE + if ( xViewRoot.hasPendingChanges() ) then + hDisableOOoImprovementProgramUNO() = FALSE + endif + xViewRoot.dispose() + endif + +end function diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc index add4b6b38560..14bd3455a63c 100755 --- a/testautomation/global/tools/includes/required/t_tools1.inc +++ b/testautomation/global/tools/includes/required/t_tools1.inc @@ -116,11 +116,13 @@ function hDoubleClickInList ( window, Selektion as String, optional bFocus as bo window.MouseDown 5, i +1 window.MouseUp 5, i +1 - if Window.GetText = Selektion then ' catch if had any effects + ' catch if had any effects + if Window.GetText = Selektion then window.MouseDoubleClick 5, i +1 - if (isMissing (bFocus) = FALSE) then ' if optional parameter provided + ' if optional parameter provided + if (isMissing (bFocus) = FALSE) then window.MouseDown 5, i +1 window.MouseUp 5, i +1 endif @@ -203,10 +205,11 @@ function wielange (StrtTime, optional iFormat as integer) as String Zeitspannesek = Zeitspannesek - Zeitspannemin * 60 Zeitspannesek = Fix(Zeitspannesek) select case iFormat - case 0: + case 0 sTemp = "" & Zeitspanneh & "h " & Zeitspannemin & "m " & Zeitspannesek & "s" - case 1: - if Zeitspanneh < 10 then ' mysql format for status.inc + case 1 + ' mysql format for status.inc + if Zeitspanneh < 10 then sTemp = "0" & Zeitspanneh & ":" else sTemp = "" & Zeitspanneh & ":" @@ -929,20 +932,27 @@ function GetDecimalSeperator ( optional sDummy$ ) as String '/// Tools / Options / (Modul: gApplication) / General tabpage. ToolsOptions '///+
    1. Reading the string of the tabulator numeric field
      2. - select case UCase(gApplication) - case "WRITER", "TEXTDOKUMENT" : Call hToolsOptions("TEXTDOCUMENT","GENERAL") + select case gApplication + case "WRITER" + Call hToolsOptions("WRITER","GENERAL") sCheckForSeparator = Tabulatorenabstand.GetText - case "CALC", "TABELLENDOKUMENT" : Call hToolsOptions("SPREADSHEET","GENERAL") + case "CALC" + Call hToolsOptions("CALC","GENERAL") sCheckForSeparator = Tabulator.GetText - case "IMPRESS", "PRAESENTATION" : Call hToolsOptions("PRESENTATION","GENERAL") + case "IMPRESS" + Call hToolsOptions("IMPRESS","GENERAL") sCheckForSeparator = Tabulatorenabstand.GetText - case "DRAW", "ZEICHNUNG" : Call hToolsOptions("DRAWING","GENERAL") + case "DRAW" + Call hToolsOptions("DRAW","GENERAL") sCheckForSeparator = Tabulatorenabstand.GetText - case "GLOBALDOC", "GLOBALDOKUMENT": Call hToolsOptions("TEXTDOCUMENT","GENERAL") + case "MASTERDOCUMENT" + Call hToolsOptions("WRITER","GENERAL") sCheckForSeparator = Tabulatorenabstand.GetText - case "HTML", "HTMLDOKUMENT" : Call hToolsOptions("TEXTDOCUMENT","GENERAL") + case "HTML" + Call hToolsOptions("WRITER","GENERAL") sCheckForSeparator = Tabulatorenabstand.GetText - case else : warnlog cWhereIsThisFunction & "For this module ("& gApplication &") no decimal seperator setting exists." + case else + warnlog cWhereIsThisFunction & "For this module ("& gApplication &") no decimal seperator setting exists." end select Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc index 2879e10c4d3b..7f7d66288d8f 100755 --- a/testautomation/global/tools/includes/required/t_tools2.inc +++ b/testautomation/global/tools/includes/required/t_tools2.inc @@ -35,32 +35,6 @@ '* '* short description : Global Tools II '* -'*************************************************************************************** -'* -' #1 GetOLEDefaultNames 'Get the correct language depending names for OLE objects -' #1 hSetLocaleStrings 'Set a string array with language dependant strings -' #1 GetHTMLCharSet 'Get the character set for HTML export -' #1 SetHTMLCharSet 'Set the character set for HTML export -' #1 SetHTMLCharSetToUTF8 'Set the character set for HTML export to UTF8 -' #1 dec 'Decrease variable -' #1 inc 'Increase variable -' #1 ActivateAutoPilot 'Routine to activate (WebPage Autopilot, Form Autopilot, Documentconverter, Euroconveter and Addressdatasource) -' #1 SetURL 'Open a special URL with 'file open'-dialog -' #1 fGetFileText 'This function is for getting the first or last n characters of a file -' #1 fSetMeasurementToCM 'Sets the measurement unit to cm and returns the unit -' #1 fRemoveDoubleSpace 'Removes every space after a space -' #1 writeCrashRepFile 'Creates a file (gOfficePath)/user/work/crashrep.txt with testcase- and .bas-name -' #1 GetBuildNumHidLst 'Get the BuildId out of the hid.lst -' #1 fGetProductName 'Reads the ProductKey from bootstrap file and cuts of version number -' #1 fopenConfig 'Open a configuration package from the Office installation via UNO API. -' #1 hGetUNOService 'Function enables the UNO communication inside the TestTool to the office application. -' #0 hSetBuildVersionInformation 'set global version information variables: gMajor, gMinor, gBuild -' #1 FindBuildID 'Scans in iso*.res for the BuildID. -' #1 fRelativeToAbsolutePath 'removes ".." from a path with logic -' #1 sCheckValgrindStatus 'recognizes file $HOME/tcs.txt for valgrind tools -' #1 fgetDocumentLanguages 'gets the Default language for documents -' #1 fRemoveDoubleCharacter 'Removes double characters from a string -'* '\************************************************************************************* sub GetOLEDefaultNames @@ -267,25 +241,25 @@ function ActivateAutoPilot ( sWhichOne as String ) as Boolean LoadTime = 0 select case gApplication - case "WRITER", "TEXTDOKUMENT" + case "WRITER" Kontext "DocumentWriter" DocumentWriter.UseMenu - case "HTML", "HTMLDOKUMENT" + case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.UseMenu - case "MASTERDOC", "GLOBALDOKUMENT", "GLOBALDOC" + case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.UseMenu - case "CALC", "TABELLENDOKUMENT" + case "CALC" Kontext "DocumentCalc" DocumentCalc.UseMenu - case "IMPRESS", "PRAESENTATION" + case "IMPRESS" Kontext "DocumentImpress" DocumentImpress.UseMenu - case "DRAW", "ZEICHNUNG" + case "DRAW" Kontext "DocumentDraw" DocumentDraw.UseMenu - case "MATH", "FORMEL" + case "MATH" Kontext "DocumentMath" DocumentMath.UseMenu case else @@ -488,46 +462,52 @@ function fSetMeasurementToCM() as string Call hNewDocument ToolsOptions select case UCase(gApplication) - case "WRITER", "TEXTDOKUMENT" : Call hToolsOptions("TEXTDOCUMENT","GENERAL") + case "WRITER" + Call hToolsOptions("WRITER","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulatorenabstand.Gettext, 3 ) else fSetMeasurementToCM = Right$( Tabulatorenabstand.Gettext, 2 ) endif - case "CALC", "TABELLENDOKUMENT" : Call hToolsOptions("SPREADSHEET","GENERAL") + case "CALC" + Call hToolsOptions("CALC","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulator.Gettext , 3 ) else fSetMeasurementToCM = Right$( Tabulator.Gettext , 2 ) endif - case "IMPRESS", "PRAESENTATION" : Call hToolsOptions("PRESENTATION","GENERAL") + case "IMPRESS" + Call hToolsOptions("IMPRESS","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulatorabstand.Gettext, 3 ) else fSetMeasurementToCM = Right$( Tabulatorabstand.Gettext, 2 ) endif - case "DRAW", "ZEICHNUNG" : Call hToolsOptions("DRAWING","GENERAL") + case "DRAW" + Call hToolsOptions("DRAW","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulatorabstand.Gettext, 3 ) else fSetMeasurementToCM = Right$( Tabulatorabstand.Gettext, 2 ) endif - case "GLOBALDOC", "GLOBALDOKUMENT": Call hToolsOptions("TEXTDOCUMENT","GENERAL") + case "MASTERDOCUMENT" + Call hToolsOptions("WRITER","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulatorenabstand.Gettext, 3 ) else fSetMeasurementToCM = Right$( Tabulatorenabstand.Gettext, 2 ) endif - case "HTML", "HTMLDOKUMENT" : Call hToolsOptions("HTMLDOCUMENT","VIEW") + case "HTML" + Call hToolsOptions("HTML","VIEW") Masseinheit.Select(2) 'in Writer/Web also the Writer has to be set to cm 'because .sdw, .sxw etc. export to HTML depends on it. - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") Masseinheit.Select(2) if iSprache = 81 then fSetMeasurementToCM = Right$( Tabulatorenabstand.Gettext, 3 ) diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc index 56d362301e40..c2e976659e2b 100755 --- a/testautomation/global/tools/includes/required/t_tools3.inc +++ b/testautomation/global/tools/includes/required/t_tools3.inc @@ -35,12 +35,6 @@ '* '* short description : Global Tools III '* -'*************************************************************************************** -'* -' #1 hToolbarSelect ' opens/closes a toolbar through View/Toolbar menu -' #1 hCloseAllToolbars ' light implementation of i38796 -' #0 hIsAccessBridgeInstalled ' Find out whether the access bridge is installed -'* '\************************************************************************************* @@ -821,7 +815,7 @@ sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as endif - case "FORMULA" + case "MATH" Kontext "OL_SW_Rechenleiste" if OL_SW_Rechenleiste.Exists then Select Case sOpen diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 4d0079f1f021..874060e45213 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -1,3 +1,14 @@ +*Database UID_APP_VIEW +'UID_APP_VIEW_BORDER_WIN +DatabaseSplitter UID_APP_VIEW_VERT_SPLIT +DatabaseDetailView UID_APP_DETAIL_VIEW +CreationList HID_APP_CREATION_LIST +DatabaseSwapView UID_APP_SWAP_VIEW +DatabaseSwapIconView HID_APP_SWAP_ICONCONTROL +DatabaseQueriesView HID_APP_QUERY_TREE +DatabaseReportsView HID_APP_REPORT_TREE +DatabaseTablesView HID_APP_TABLE_TREE + *DatabaseBeamer UID_CTL_CONTENT *DatabaseProperties HID_DSADMIN_DIALOG diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 9acac5677505..47031e0c0e31 100755 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -133,17 +133,6 @@ ConstantValuePlus HID_SCH_STATISTIK_PLUS_VALUE ConstantValueMinus HID_SCH_STATISTIK_MINUS_VALUE ErrorIndicator HID_SCH_CT_INDICATE -*Insight UID_APP_VIEW -'UID_APP_VIEW_BORDER_WIN -InsightSplitter UID_APP_VIEW_VERT_SPLIT -InsightDetailView UID_APP_DETAIL_VIEW -CreationList HID_APP_CREATION_LIST -InsightSwapView UID_APP_SWAP_VIEW -InsightSwapIconView HID_APP_SWAP_ICONCONTROL -InsightQueriesView HID_APP_QUERY_TREE -InsightReportsView HID_APP_REPORT_TREE -InsightTablesView HID_APP_TABLE_TREE - *JavaClassPath HID_OPTIONS_JAVA_CLASSPATH ClassPath svx:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH AddArchive svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas index 7bdc42cae6fe..574eb2807f2b 100755 --- a/testautomation/graphics/optional/d_export_graphic_a.bas +++ b/testautomation/graphics/optional/d_export_graphic_a.bas @@ -75,6 +75,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Draw" + gApplication = "DRAW" end sub diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas index ea102113df58..4fe60ab26acd 100755 --- a/testautomation/graphics/optional/d_export_graphic_b.bas +++ b/testautomation/graphics/optional/d_export_graphic_b.bas @@ -74,6 +74,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Draw" + gApplication = "DRAW" end sub diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas index e10a49873329..df405ba9f8a8 100755 --- a/testautomation/graphics/optional/export_graphic_a.bas +++ b/testautomation/graphics/optional/export_graphic_a.bas @@ -74,6 +74,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/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas index 2f5e3366545d..bf1f78512bb8 100755 --- a/testautomation/graphics/optional/export_graphic_b.bas +++ b/testautomation/graphics/optional/export_graphic_b.bas @@ -74,6 +74,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/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas index ee14795a40b1..aaff8f00b90d 100755 --- a/testautomation/graphics/optional/g_accessability.bas +++ b/testautomation/graphics/optional/g_accessability.bas @@ -49,7 +49,7 @@ sub main Call tEis1549 Call tEis1523 - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tEis1549 Call tEis1523 @@ -60,6 +60,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas index ab8ba3ee2436..99fe74639b9d 100755 --- a/testautomation/graphics/optional/g_area.bas +++ b/testautomation/graphics/optional/g_area.bas @@ -47,7 +47,7 @@ sub main Call tiFormatArea Call tdFormatArea1 - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiFormatArea Call tdFormatArea1 @@ -58,6 +58,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas index 61ff3a62924a..d47403967994 100755 --- a/testautomation/graphics/optional/g_arrangealign.bas +++ b/testautomation/graphics/optional/g_arrangealign.bas @@ -66,7 +66,7 @@ sub main Call tdContextBehindObject Call tdContextReverse - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" if (Lcase(gApplication) = "impress") then Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odp") @@ -89,6 +89,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas index b7760a229e5f..fa7e30b23fb2 100755 --- a/testautomation/graphics/optional/g_autocorrection.bas +++ b/testautomation/graphics/optional/g_autocorrection.bas @@ -51,7 +51,7 @@ sub main GetOLEDefaultNames hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) - gApplication = "Impress" + gApplication = "IMPRESS" PrintLog "-------------------------" + gApplication + "-------------------" 'qaErrorLog "#i76832# - tToolsAutocorrectCustomQuotes (x4) outcommented due to Bug." Call tToolsAutocorrectCustomQuotes (TRUE) @@ -60,7 +60,7 @@ sub main Call tToolsAutocorrectReplace Call tToolsAutocorrectExceptions - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tToolsAutocorrectCustomQuotes (TRUE) Call tToolsAutocorrectCustomQuotes (FALSE) @@ -74,6 +74,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas index 8079a3f3cb3d..85cff92a27ba 100755 --- a/testautomation/graphics/optional/g_character.bas +++ b/testautomation/graphics/optional/g_character.bas @@ -52,7 +52,7 @@ sub main Call tSetFormatCharacter Call tGetFormatCharacter - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tDialogCharacter @@ -67,6 +67,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas index bd632421a70c..13fb611ca854 100755 --- a/testautomation/graphics/optional/g_clipboard.bas +++ b/testautomation/graphics/optional/g_clipboard.bas @@ -61,7 +61,7 @@ sub main Call tdEditPasteSpecial_Graphic Call tdEditPasteSpecial_Circle - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiEditPasteSpecial Call tiEditUndo @@ -78,6 +78,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas index ca930a936b78..d453025659a6 100755 --- a/testautomation/graphics/optional/g_convertto.bas +++ b/testautomation/graphics/optional/g_convertto.bas @@ -57,7 +57,7 @@ sub main Call tiAendernUmwandelnIn3DRotationsKoerper Call tiAendernUmwandelnInMetaFile - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiModifyConvertToPolygon Call tdContextConvertIntoBitmap @@ -73,6 +73,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas index 950ecd2370a3..3967f71937b1 100755 --- a/testautomation/graphics/optional/g_crossfading.bas +++ b/testautomation/graphics/optional/g_crossfading.bas @@ -47,7 +47,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tCrossfading - gApplication = "Impress" + gApplication = "IMPRESS" PrintLog "-------------------------" + gApplication + "-------------------" Call tCrossfading @@ -57,6 +57,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Draw" + gApplication = "DRAW" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas index 54cf5a1d4ea0..6a99f090ad04 100755 --- a/testautomation/graphics/optional/g_customshapes.bas +++ b/testautomation/graphics/optional/g_customshapes.bas @@ -48,7 +48,7 @@ sub main Call tFormatPaintbrush Call tCustomshapes - gApplication = "Draw" + gApplication = "DRAW" PrintLog "--------------------- " + gApplication + " -------------------" Call tFormatPaintbrush Call tCustomshapes @@ -59,6 +59,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas index faf9018c5164..819cfa73d062 100755 --- a/testautomation/graphics/optional/g_demoguide.bas +++ b/testautomation/graphics/optional/g_demoguide.bas @@ -57,6 +57,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas index ae5dc30d41d3..33a4f42ed0a9 100755 --- a/testautomation/graphics/optional/g_dimensions.bas +++ b/testautomation/graphics/optional/g_dimensions.bas @@ -46,7 +46,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call testFormatDimensioning - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call testFormatDimensioning @@ -56,6 +56,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas index 9e0a4e9fece5..22d37329bf8e 100755 --- a/testautomation/graphics/optional/g_edit.bas +++ b/testautomation/graphics/optional/g_edit.bas @@ -54,7 +54,7 @@ sub main Call tEditLinks Call tEditObjectEdit - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tEditDuplicate Call tEditFields @@ -70,5 +70,5 @@ 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/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas index d4ea75e7456b..43fff300041c 100755 --- a/testautomation/graphics/optional/g_export_html.bas +++ b/testautomation/graphics/optional/g_export_html.bas @@ -53,7 +53,7 @@ sub main Call tHTMLExport Call tHtmlExport_Webcast - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tHTMLExport @@ -65,5 +65,5 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" Call GetUseFiles - gApplication = "Impress" + gApplication = "IMPRESS" end sub diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas index 473b215c8fc7..cf013a01f2c8 100755 --- a/testautomation/graphics/optional/g_findreplace.bas +++ b/testautomation/graphics/optional/g_findreplace.bas @@ -52,7 +52,7 @@ sub main Call tiEditSearchAndReplace Call tiEditSearchAndReplaceBUGS - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiEditSearchAndReplace @@ -62,6 +62,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas index 8faf9a3f18b0..bd2bc0fee601 100755 --- a/testautomation/graphics/optional/g_format.bas +++ b/testautomation/graphics/optional/g_format.bas @@ -55,7 +55,7 @@ sub main Call tiFormatAufzaehlungszeichen Call tdFormatTemplates - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiFormatText Call tdFormatLayer @@ -72,5 +72,5 @@ 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/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas index 0ac5da2c4c9f..7841eee6f843 100755 --- a/testautomation/graphics/optional/g_group.bas +++ b/testautomation/graphics/optional/g_group.bas @@ -47,7 +47,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tiGruppierung - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiGruppierung @@ -57,6 +57,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas index 972faf3df12c..d358f9d60270 100755 --- a/testautomation/graphics/optional/g_imagemap.bas +++ b/testautomation/graphics/optional/g_imagemap.bas @@ -48,7 +48,7 @@ sub main Call tEditImageMap Call tEditImageMapProperties - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tEditImageMap Call tEditImageMapProperties @@ -59,6 +59,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas index 3eb70b48520f..2abe9d6e1978 100755 --- a/testautomation/graphics/optional/g_insert.bas +++ b/testautomation/graphics/optional/g_insert.bas @@ -66,7 +66,7 @@ sub main Call tInsertChart Call tdInsertFile - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tInsertFloatingFrame @@ -95,6 +95,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas index fc71c628eef3..d6e8501c0340 100755 --- a/testautomation/graphics/optional/g_line.bas +++ b/testautomation/graphics/optional/g_line.bas @@ -47,7 +47,7 @@ sub main Call tiFormatLine Call tLineConnect - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiFormatLine Call tLineConnect @@ -59,6 +59,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas index 066829ec801f..2800bd8512f1 100755 --- a/testautomation/graphics/optional/g_load_save.bas +++ b/testautomation/graphics/optional/g_load_save.bas @@ -67,7 +67,7 @@ sub main call tSaveLoadLayoutChart call tSaveLoadLayoutSpreadsheet - gApplication = "Impress" + gApplication = "IMPRESS" PrintLog "-------------------------" + gApplication + "-------------------" Call tFileOpenSaveEtc Call tFileProperties @@ -90,7 +90,7 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Draw" + gApplication = "DRAW" end sub diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas index fd6a20f4f106..bc143d7d68f9 100755 --- a/testautomation/graphics/optional/g_mediaplayer.bas +++ b/testautomation/graphics/optional/g_mediaplayer.bas @@ -46,7 +46,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" call g_mediaplayer - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" call g_mediaplayer @@ -57,6 +57,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas index bef4fe20088a..b0a2caa83c1e 100755 --- a/testautomation/graphics/optional/g_navigator.bas +++ b/testautomation/graphics/optional/g_navigator.bas @@ -51,7 +51,7 @@ sub main Call tViewNavigatorGroupedObjects Call tViewNavigatorNameActivated - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tViewNavigatorZOrder Call tdViewNavigator @@ -65,6 +65,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas index 9f99e64e8ab8..4f75f10508c1 100755 --- a/testautomation/graphics/optional/g_ole.bas +++ b/testautomation/graphics/optional/g_ole.bas @@ -61,6 +61,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas index bb46790aeda3..04955496744e 100755 --- a/testautomation/graphics/optional/g_paneview.bas +++ b/testautomation/graphics/optional/g_paneview.bas @@ -52,7 +52,7 @@ sub main call tiMinimize_Maximize_Docking_TaskPane call tiPaneview_LoadSave_Windowsstate - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" call tdMinimize_Maximize_Docking_Pagepane call tdPaneview_LoadSave_Windowsstate @@ -63,6 +63,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas index fefb227a1e30..52bfc72c1dd0 100755 --- a/testautomation/graphics/optional/g_paragraph.bas +++ b/testautomation/graphics/optional/g_paragraph.bas @@ -47,7 +47,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tdFormatParagraph - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tdFormatParagraph @@ -57,6 +57,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_print.bas b/testautomation/graphics/optional/g_print.bas index d853085c06b2..a08905c7ae99 100755 --- a/testautomation/graphics/optional/g_print.bas +++ b/testautomation/graphics/optional/g_print.bas @@ -49,7 +49,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" call tFilePrint - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" call tFilePrint @@ -59,6 +59,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas index a261738f94aa..b6fed70b9f53 100755 --- a/testautomation/graphics/optional/g_savepictureas.bas +++ b/testautomation/graphics/optional/g_savepictureas.bas @@ -52,7 +52,7 @@ sub main Call tContextSavePictureLinkAsPicture Call Mnemonickey - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tContextSaveAsPicture Call tContextSavePictureLinkAsPicture @@ -65,6 +65,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/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas index ed7dc74c38a8..1231ab4c51dc 100755 --- a/testautomation/graphics/optional/g_shaddow.bas +++ b/testautomation/graphics/optional/g_shaddow.bas @@ -48,11 +48,11 @@ sub main use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_shaddow.inc" - gApplication = "Impress" + gApplication = "IMPRESS" PrintLog "------------------------- " + gApplication + " Shaddow-Optional Test -------------------" Call tiShaddow - gApplication = "Draw" + gApplication = "DRAW" PrintLog "------------------------- " + gApplication + " Shaddow-Optional Test -------------------" Call tiShaddow @@ -62,6 +62,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Draw" + gApplication = "DRAW" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas index fb331e54ded6..8a243323932c 100755 --- a/testautomation/graphics/optional/g_slidelayer.bas +++ b/testautomation/graphics/optional/g_slidelayer.bas @@ -58,7 +58,7 @@ sub main Call t114174 ' only in impress Call t111862 - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tInsertSlide Call tInsertDuplicateSlide @@ -70,6 +70,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas index caceb20796f8..4b06ae014b26 100755 --- a/testautomation/graphics/optional/g_spellcheck.bas +++ b/testautomation/graphics/optional/g_spellcheck.bas @@ -55,7 +55,7 @@ sub main Call tiToolsSpellcheckCheck Call tToolsSpellcheckAutoSpellcheck - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsSpellcheckCorrect Call tiToolsSpellcheckError @@ -69,6 +69,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_extension_manager_tools.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas index 90c013350bb0..6ec8d4f4be7b 100755 --- a/testautomation/graphics/optional/g_stylist.bas +++ b/testautomation/graphics/optional/g_stylist.bas @@ -53,7 +53,7 @@ sub main warnlog "Locales file doesn't exist graphics\tools\locale_1.txt" endif - gApplication = "Impress" + gApplication = "IMPRESS" PrintLog "-------------------------" + gApplication + "-------------------" Call tFormatStylistFlyer @@ -79,7 +79,7 @@ else qaerrorlog "Deactivated tFormatStylistBackground due to string-name-difficulties." endif - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tFormatStylistFlyer @@ -101,6 +101,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas index 0bd6eb867e57..f585b343be70 100755 --- a/testautomation/graphics/optional/g_tables.bas +++ b/testautomation/graphics/optional/g_tables.bas @@ -49,7 +49,7 @@ sub main call tiInsertTableUsingButton call tiInsertTableUsingToolbarbutton call tiTableObjectBar - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" @@ -65,7 +65,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call getUseFiles end sub diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas index 88499551d228..f1dbbda362ae 100755 --- a/testautomation/graphics/optional/g_toolbars.bas +++ b/testautomation/graphics/optional/g_toolbars.bas @@ -54,7 +54,7 @@ sub main Call Toolboxen_Linien Call tToolsCustomize 'global\required\includes - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call Toolboxen_Rechtecke Call Toolboxen_Kreise @@ -71,5 +71,5 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\required\includes\g_customize.inc" Call GetUseFiles - gApplication = "Impress" + gApplication = "IMPRESS" end sub diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index 86feba5f5af4..65e3227dd8eb 100755 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas @@ -54,7 +54,7 @@ sub main Call tiToolsHyphenation2 Call tToolsMacro - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsThesaurus Call tiToolsHyphenation1 @@ -68,5 +68,5 @@ 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/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas index 164d3935f0a0..0e7e4779967d 100755 --- a/testautomation/graphics/optional/g_zoom.bas +++ b/testautomation/graphics/optional/g_zoom.bas @@ -48,7 +48,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tViewZoom - gApplication = "Draw" + gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tViewZoom @@ -58,6 +58,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas index 4b9c91777730..fc63b3bdc304 100755 --- a/testautomation/graphics/optional/i_animation.bas +++ b/testautomation/graphics/optional/i_animation.bas @@ -52,6 +52,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas index 81d9967ec34e..453a3c206caf 100755 --- a/testautomation/graphics/optional/i_headerfooter.bas +++ b/testautomation/graphics/optional/i_headerfooter.bas @@ -55,6 +55,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas index 1de701dcb8f8..6e6440e5a390 100755 --- a/testautomation/graphics/optional/i_pengine.bas +++ b/testautomation/graphics/optional/i_pengine.bas @@ -80,6 +80,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas index bfe3017a2467..d90fa4369ad3 100755 --- a/testautomation/graphics/optional/i_saveloadlayout.bas +++ b/testautomation/graphics/optional/i_saveloadlayout.bas @@ -62,7 +62,7 @@ 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/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas index fc442282b43f..7c5aa61caf0b 100755 --- a/testautomation/graphics/optional/i_slidecopy.bas +++ b/testautomation/graphics/optional/i_slidecopy.bas @@ -62,6 +62,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas index f433fc92488f..54dbfde3dd5e 100755 --- a/testautomation/graphics/optional/i_slideshow.bas +++ b/testautomation/graphics/optional/i_slideshow.bas @@ -92,6 +92,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas index ce0be19dda49..5b9bf47f9b3d 100755 --- a/testautomation/graphics/optional/i_us_presentation.bas +++ b/testautomation/graphics/optional/i_us_presentation.bas @@ -65,6 +65,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas index aa55ab34e8d8..9a10da11ee97 100755 --- a/testautomation/graphics/optional/i_view.bas +++ b/testautomation/graphics/optional/i_view.bas @@ -61,6 +61,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index 7500462615bf..033a27b05eae 100755 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -536,7 +536,7 @@ testcase tPDF_Creator End If sApp = gApplication - gApplication = "writer" + gApplication = "WRITER" sleep 5 ' wait for document to be loaded ' /Creator bTemp = hFindeImDokument ("<",true) '-------------------------------\ diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc index 3ec4dd559241..b4622711a5c5 100755 --- a/testautomation/graphics/optional/includes/global/g_accessability.inc +++ b/testautomation/graphics/optional/includes/global/g_accessability.inc @@ -205,7 +205,7 @@ testcase tEis1523 warnlog "Unexpected error :-(" endcatch - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then '/// IMPRESS only ///' '///+ check if Layout placeholders are inherited ///' '///+ create new page with [ctrl]+[Return]] ///' @@ -254,7 +254,7 @@ testcase tEis1581 '/// open application ///' call hNewDocument - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then '/// Format -> Layout ///' FormatModifyPage '/// choose layout with graphic ///' diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index ca936ba3a995..0ae5980e3f06 100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -145,7 +145,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) dim sTemp as string dim sFileName as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index e3a0d370f051..52af1ca97b62 100755 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -380,7 +380,7 @@ testcase tSetFormatCharacter dim sFile as string dim sTemp as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -580,7 +580,7 @@ testcase tGetFormatCharacter dim iTemp as integer dim sSpellBooks(30) as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 352808509de5..5725417d50a5 100755 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -51,7 +51,7 @@ testcase tiEditUndo Dim sDatei as string Dim Ueber_Text_1 as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -137,7 +137,7 @@ testcase tiEditRedo Dim Datei$ Dim Ueber_Text_1 - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc index 18f64b5c0632..a575c0c75101 100755 --- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc @@ -119,7 +119,7 @@ sub Make3dObject Kontext "ThreeDObjectsbar" ThreeDObjectsbar.close else - if (lCase(gApplication) = "DRAW") then + if (gApplication = "DRAW") then Toolbar.OpenContextMenu '/// enable 3d-object-button in menubar sleep 1 hMenuselectNr (1) diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc index a2a337b483da..563691496242 100755 --- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc @@ -404,13 +404,13 @@ sub Check_Text_Formatting sleep (3) '/// Select the text and bring up the attributes for it. ///' - select case (lCase(gApplication)) - case "draw" : hTypeKeys "" + select case (gApplication) + case "DRAW" : hTypeKeys "" hTypeKeys "" 'Mark the whole text' - case "impress" : hTypeKeys "" + case "IMPRESS" : hTypeKeys "" hTypeKeys "" 'Mark the whole text' - case "writer" : EditSelectAll 'Since there is currently only (should only be) one object (the text) in the document. - case "calc" : hTypeKeys "" + case "WRITER" : EditSelectAll 'Since there is currently only (should only be) one object (the text) in the document. + case "CALC" : hTypeKeys "" ' hTypeKeys "" 'Mark the whole text' case else : warnlog " the test has not been configured for this application ( '" + gApplication + "' ). Please notify testwriter." end select @@ -444,7 +444,7 @@ sub Check_Text_Formatting if Unterstrichen.GetState(2) <> Text6 then warnlog " Underline should be: " + Text6 + " but was: " + Unterstrichen.GetState(2) Kontext "TextObjectbar" - if (lCase(gApplication)) = "calc" then + if (gApplication) = "CALC" then kontext "FormatObjectBar" Printlog " - Check if the Font-attribute is set to Justified" '/// check state for button 'Justified' ///' diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc index 65961f5b12b5..11383ea62fb2 100755 --- a/testautomation/graphics/optional/includes/global/g_customshapes.inc +++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc @@ -46,7 +46,7 @@ testcase tCustomshapes '/// Create new document ///' Call hNewDocument - if lcase(gApplication) = "draw" then + if gApplication = "DRAW" then Kontext "Documentdraw" else '(Impress) Kontext "DocumentImpress" @@ -254,7 +254,7 @@ testcase tCustomshapes printlog "Change all objects into 3D." '/// Change all objects into 3D. ///' - if lcase(gApplication) = "draw" then + if gApplication = "DRAW" then Kontext "Documentdraw" else '(Impress) Kontext "DocumentImpress" @@ -306,7 +306,7 @@ testcase tCustomshapes hTypeKeys "" hTypeKeys "" ,9 - if lcase(gApplication) = "impress" then + if gApplication = "IMPRESS" then hTypeKeys "" ,86 hTypeKeys "", 48 else @@ -638,7 +638,7 @@ testcase tFormatPaintbrush '/// Create a second rectangle, and use the "Paintbrush-icon" to copy the settings for the first rectangle onto the new one ///' hRechteckErstellen ( 70, 70, 90, 90 ) - if lcase(gApplication) = "draw" then + if gApplication = "DRAW" then kontext "Documentdraw" Documentdraw.Mousedown 20, 20 Documentdraw.Mouseup 20, 20 diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index 3bbb84c110eb..6dbcb9f2cf14 100755 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -44,9 +44,9 @@ ' #1 tEditObjectEdit '\************************************************************************************* -' sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(lcase(gApplication),1) +' sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(gApplication,1) ' Call hDateiOeffnen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm") '/// Load html document ///' -' sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(lcase(gApplication),1) +' sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(gApplication,1) ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") testcase tEditDuplicate diff --git a/testautomation/graphics/optional/includes/global/g_export_html.inc b/testautomation/graphics/optional/includes/global/g_export_html.inc index ca87aa621e68..4b76e9b4be52 100755 --- a/testautomation/graphics/optional/includes/global/g_export_html.inc +++ b/testautomation/graphics/optional/includes/global/g_export_html.inc @@ -158,7 +158,7 @@ testcase tHtmlExport TitelSeiteErzeugen.Check Warnlog "- 'create Titlepage' should be checked as default :-(" end if - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then '/// if applcation is impress: the checkbox 'Show notes' is enabled by default///' If (Notizenanzeigen.IsChecked <> TRUE) Then warnlog "- 'Show notes' checked as default :-(" diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc index f2a96ac53d83..6492d05422e9 100755 --- a/testautomation/graphics/optional/includes/global/g_format.inc +++ b/testautomation/graphics/optional/includes/global/g_format.inc @@ -325,7 +325,7 @@ testcase tdFormatConnector dim sTemp as string dim cDecSep as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -786,8 +786,8 @@ testcase tiFormat3D_Effekte 'y = hMenuItemGetCount 'MenuSelect (0) 'gMouseClick 90,90 - 'select case lcase(gApplication) - ' case "draw" : if y = 13 then + 'select case gApplication + ' case "DRAW" : if y = 13 then ' Printlog "- 3D object created" ' else ' Warnlog " Context-menu-entry-number was wrong. Expected 13, but was " + y + "." diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc index a7e19e1d858c..61f5c9d3e31f 100755 --- a/testautomation/graphics/optional/includes/global/g_group.inc +++ b/testautomation/graphics/optional/includes/global/g_group.inc @@ -55,7 +55,7 @@ testcase tiGruppierung Printlog "- Created 3 rectangles for group testing" gMouseClick (50,50) '/// Put the mouse-marker in the middle of the screen ///' EditSelectAll '/// select all rectangles ///' - if (lcase(gApplication) = "draw") then + if (gApplication = "DRAW") then hOpenContextMenu sleep(2) hMenuSelectNr(12) ' Select "Group" diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc index a0213de3aefe..8f5a4ea1549d 100755 --- a/testautomation/graphics/optional/includes/global/g_insert.inc +++ b/testautomation/graphics/optional/includes/global/g_insert.inc @@ -112,7 +112,7 @@ testcase tInsertFloatingFrame dim iWaitIndex as integer - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -173,7 +173,7 @@ testcase tInsertFields dim sFile as string dim i as integer - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -346,7 +346,7 @@ testcase tdInsertSnapPoint_Line printlog " select Grid tab page in application " Select Case Ucase(gApplication) case "DRAW" : hToolsOptions ("Drawing","GRID") - case "IMPRESS" : hToolsOptions ("Presentation","GRID") + case "IMPRESS" : hToolsOptions ("IMPRESS","GRID") end select sGridArea = fangenFangBereich.GetText printlog " set metric field 'Snap Range' to Maximum " @@ -486,7 +486,7 @@ testcase tdInsertSnapPoint_Line ToolsOptions Select Case Ucase(gApplication) case "DRAW" : hToolsOptions ("Drawing","GRID") - case "IMPRESS" : hToolsOptions ("Presentation","GRID") + case "IMPRESS" : hToolsOptions ("IMPRESS","GRID") end select fangenFangBereich.SetText sGridArea Kontext "ExtrasOptionenDlg" @@ -505,7 +505,7 @@ testcase tdInsertFile dim i as integer dim iCut as integer - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index bc60909ff86e..dbd0e06b3370 100755 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -303,7 +303,7 @@ testcase tiFormatLine 'kontext "Toolbar" 'Kurven.Click 'sleep 1 - 'if (lcase(gApplication) = "draw") then + 'if (gApplication = "DRAW") then ' Kontext "DocumentDraw" ' gMouseMove (30,50, 40,60) ' sleep 1 @@ -361,7 +361,7 @@ testcase tLineConnect kontext "Toolbar" Kurven.Click sleep 1 - if (lcase(gApplication) = "draw") then + if (gApplication = "DRAW") then Kontext "DocumentDraw" gMouseMove (30,50, 40,60) sleep 1 @@ -379,14 +379,14 @@ testcase tLineConnect gMouseMove (70,50, 60,60) endif - printlog "'" + (lcase(gApplication)) +"'" + printlog "'" + (gApplication) +"'" '/// Check the amount of objects ///' gMouseClick (10, 10) sleep 1 EditSelectAll sleep 1 - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1)) else kontext "DocumentDraw" @@ -415,7 +415,7 @@ testcase tLineConnect sleep 1 EditSelectAll sleep 1 - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1)) else kontext "DocumentDraw" @@ -448,7 +448,7 @@ testcase tLineConnect EditSelectAll sleep 1 '/// Check the amount of objects ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1)) else kontext "DocumentDraw" @@ -499,7 +499,7 @@ testcase tLineConnect '/// And a nice finish to make life a bit happier for anyone who looks at the test ///' kontext "Toolbar" Ellipsen.Click - if (lcase(gApplication) = "draw") then + if (gApplication = "DRAW") then Kontext "DocumentDraw" gMouseMove (40,40, 50,30) sleep 1 diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc index 69321a7797a2..55685cfb9fbf 100755 --- a/testautomation/graphics/optional/includes/global/g_load_save.inc +++ b/testautomation/graphics/optional/includes/global/g_load_save.inc @@ -58,7 +58,7 @@ testcase tFileOpenSaveEtc Dokument$ = ConvertPath ( gOfficePath + "user\work\test1") Dokument2$ = ConvertPath ( gOfficePath + "user\work\test1_2") - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -187,7 +187,7 @@ testcase tFileProperties Call hNewDocument Call hTextrahmenErstellen ("This is a document to test the Menupoint in File/Properties",30,30,60,40) - if (lCase(gApplication) = "Impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -340,7 +340,7 @@ dim q as integer warnlog "Documents of Type 'ComputerGraphicsMetafile' can't get loaded :-(" endcatch Call hCloseDocument - if (lcase(gApplication)="draw") then + if (gApplication="DRAW") then Call hCloseDocument endif endcase @@ -366,7 +366,7 @@ dim q as integer Oeffnen.Click Sleep 2 - if lcase(gApplication) = "draw" then + if gApplication = "DRAW" then Kontext "Documentdraw" if Documentdraw.exists(5) then Documentdraw.TypeKeys ("") @@ -403,7 +403,7 @@ testcase tDeletedTemplate dim SavedActiveMessage as string dim found as boolean - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -516,7 +516,7 @@ testcase tSaveLoadLayoutEmpty '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an empty Layout. ///' @@ -562,7 +562,7 @@ testcase tSaveLoadLayoutOLE '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with an OLE. ///' @@ -624,7 +624,7 @@ testcase tSaveLoadLayoutText '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Text-field. ///' @@ -677,7 +677,7 @@ testcase tSaveLoadLayoutOutline '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Outline-field. ///' @@ -729,7 +729,7 @@ testcase tSaveLoadLayoutPicture '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Graphic-field. ///' @@ -781,7 +781,7 @@ testcase tSaveLoadLayoutChart '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Chart-field. ///' @@ -833,7 +833,7 @@ testcase tSaveLoadLayoutSpreadsheet '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Spreadsheet-field. ///' diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc index 22a33f2c33e5..d02383393f9a 100755 --- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc +++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc @@ -233,7 +233,7 @@ testcase g_mediaplayer ToolsMediaPlayer '/// Check if there is an object available. ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then kontext "DocumentImpress" else kontext "DocumentDraw" diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc index e33101ebdab0..4b27d6e8226d 100755 --- a/testautomation/graphics/optional/includes/global/g_navigator.inc +++ b/testautomation/graphics/optional/includes/global/g_navigator.inc @@ -183,7 +183,7 @@ testcase tViewNavigatorZOrder '/// Open the Navigator ///' Kontext "NavigatorDraw" - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then try NavigatorDraw.Close '/// test if the Navigator is visible. It should not be. ///' warnlog "- the Navigator was open, check earlier ran tests for inconsistency." diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc index b746c128bc62..0f631de28f2d 100755 --- a/testautomation/graphics/optional/includes/global/g_ole.inc +++ b/testautomation/graphics/optional/includes/global/g_ole.inc @@ -76,7 +76,7 @@ testcase tOLE_Copy '/// Close document. Open new Impress-Document. Paste the OLE-Object. ///' Call hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument EditPaste @@ -140,7 +140,7 @@ testcase tOLE_Copy sleep 1 Call hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument EditPaste @@ -205,7 +205,7 @@ testcase tOLE_Copy sleep 1 Call hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument EditPaste @@ -242,7 +242,7 @@ testcase tOLE_SaveLoad dim filetype as string dim filetype2 as string - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/g_paragraph.inc b/testautomation/graphics/optional/includes/global/g_paragraph.inc index b4237a4a6b2c..2d1e5ea449f7 100755 --- a/testautomation/graphics/optional/includes/global/g_paragraph.inc +++ b/testautomation/graphics/optional/includes/global/g_paragraph.inc @@ -51,10 +51,10 @@ testcase tdFormatParagraph dim iTemp as integer dim sApplication as string - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then sApplication = "DRAWING" else - sApplication = "PRESENTATION" + sApplication = "IMPRESS" endif iCount = 0 diff --git a/testautomation/graphics/optional/includes/global/g_print.inc b/testautomation/graphics/optional/includes/global/g_print.inc index 70ecf5e751ca..7339c105f3b2 100755 --- a/testautomation/graphics/optional/includes/global/g_print.inc +++ b/testautomation/graphics/optional/includes/global/g_print.inc @@ -64,7 +64,7 @@ testcase tFilePrint ' Not yet active since this feature is not build into the master: i85355 '/// Checking Options for impress, PrintContentBox ' printlog "Checking options for impress..." -' if (lCase(gApplication) = "impress") then +' if (gApplication = "IMPRESS") then ' if PrintContent.GetSelIndex <> 1 then ' warnlog "Not first entry selected!" ' else diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc index 3d46d6fbba23..240c7355da1a 100755 --- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc +++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc @@ -152,7 +152,7 @@ testcase tContextSaveAsPicture Oeffnen.Click '/// Select all ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" else Kontext "DocumentDraw" @@ -163,7 +163,7 @@ testcase tContextSaveAsPicture '/// The context menu must contain the "save as picture..." entry at 4th position from bottom. (Check it) ///' '/// Use the Context-Menu 'Save As Picture' ///' hOpenContextMenu - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" DocumentImpress.OpenContextMenu true WaitSlot(1000) @@ -326,7 +326,7 @@ testcase tContextSaveAsPicture endif endif '/// Remove all in the Document. (Impress/Draw) ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" else Kontext "DocumentDraw" @@ -478,7 +478,7 @@ testcase tContextSavePictureLinkAsPicture Oeffnen.Click '/// Select all ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" else Kontext "DocumentDraw" @@ -489,7 +489,7 @@ testcase tContextSavePictureLinkAsPicture '/// The context menu must contain the "save as picture..." entry at 4th position from bottom. (Check it) ///' '/// Use the Context-Menu 'Save As Picture' ///' hOpenContextMenu - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" DocumentImpress.OpenContextMenu true if hMenuFindSelect(27353, true, (MenuGetItemCount - 4), true) = false then @@ -776,7 +776,7 @@ testcase tContextSavePictureLinkAsPicture endif '/// Remove all in the Document. (Impress/Draw) ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpress" else Kontext "DocumentDraw" diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc index ba80e5fbadfc..47ef12a280f4 100755 --- a/testautomation/graphics/optional/includes/global/g_shaddow.inc +++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc @@ -61,7 +61,7 @@ testcase tiShaddow dim cornerstyletype as string '/// Set the file-extension we'll be using when opening the saved file ///' - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -326,7 +326,7 @@ testcase tiShaddow TabLinie.ok '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///' - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "ppt" else ExtensionString = "odg" @@ -337,7 +337,7 @@ testcase tiShaddow FileSaveAs Kontext "SpeichernDlg" Dateiname.SetText sFileName - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Dateityp.Select 5 ' Powerpoint printlog "Trying to save with filter: " + Dateityp.GetSelText + sFilter(5) else @@ -386,21 +386,21 @@ testcase tiShaddow Kontext Messagebox.SetPage TabTransparenz kontext "TabTransparenz" - if (lCase(gApplication) = "DRAW") then + if (gApplication = "DRAW") then if LineareTransparenz.Ischecked = FALSE then warnlog "Transparency should have been checked!" if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed" KeineTransparenz.Check end if endif - if (lCase(gApplication) = "DRAW") then + if (gApplication = "DRAW") then if LineareTransparenz.Ischecked = FALSE then warnlog "Transparency should have been checked!" if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed" KeineTransparenz.Check end if endif - if (lCase(gApplication) = "IMPRESS") then + if (gApplication = "IMPRESS") then if LineareTransparenz.Ischecked <> FALSE then warnlog "Transparency should NOT have been checked!" if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed" @@ -437,7 +437,7 @@ testcase tiShaddow TabSchatten.Ok '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///' - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "ppt" else ExtensionString = "odg" @@ -447,7 +447,7 @@ testcase tiShaddow FileSaveAs Kontext "SpeichernDlg" Dateiname.SetText sFileName - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Dateityp.Select 5 ' Powerpoint printlog "Trying to save with filter: " + Dateityp.GetSelText + sFilter(5) else diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index 90f072561877..356f2cfdc1ab 100755 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -245,7 +245,7 @@ testcase tFormatStylistTemplatesUse endif printlog " - Presentation-templates" '/// if application is impress: click on button 'Presentation Styles' ///' - if (Lcase (gApplication) = "impress") then + if (Lcase (gApplication) = "IMPRESS") then TBGestalter.Click Praesentationsvorlagen endif '/// select every item from the list 'Styles' ///' diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc index c6010535726d..023e30b5c826 100755 --- a/testautomation/graphics/optional/includes/global/g_zoom.inc +++ b/testautomation/graphics/optional/includes/global/g_zoom.inc @@ -46,7 +46,7 @@ testcase tViewZoom Dim Datei$ Printlog "- view Zoom" - if (lCase(gApplication) = "Impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc index 5bfca2e9f031..fa81a94330b5 100755 --- a/testautomation/graphics/optional/includes/global/gallery.inc +++ b/testautomation/graphics/optional/includes/global/gallery.inc @@ -53,7 +53,7 @@ testcase tGallery_DialogTest '///Open a new Writer document '///Tools / Gallery printlog "- Working with Gallery-Beamer!" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery Kontext "DocumentWriter" @@ -88,7 +88,7 @@ testcase tGallery_ActivateAndUpdateAllThemes '///+Tools / Gallery '///+Click on each theme and update it (via context menu) printlog "activate and update all gallery-themes" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -149,7 +149,7 @@ testcase tGallery_CheckNames '///Check the names for the gallery themes '///Open a new Writer document '///+Tools / Gallery - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -203,7 +203,7 @@ testcase tGallery_CheckContextMenuForGalleryThemes '/// Open a new Writer document '/// +Tools / Gallery printlog "check the contextmenu for the gallery-themes" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery '/// +Testing rename and properties for each gallery theme (via context-menu) @@ -271,7 +271,7 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes '/// Open a new Writer document '/// Tools / Gallery printlog "create a new gallery-theme ( TT-theme )" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery iMenuEntries = Gallerys.GetItemCount @@ -514,7 +514,7 @@ testcase tGallery_GalleryView_Preview '/// Open a new Writer document '/// Tools / Gallery printlog "open a writer and the gallery" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -644,14 +644,14 @@ testcase tGallery_GalleryView_Preview '/// If the MediaPlayer exists - close it ///' kontext "Mplayer" if Mplayer.Exists then - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then kontext "DocumentImpress" else kontext "DocumentDraw" end if ToolsMediaPlayer else - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then kontext "DocumentImpress" else kontext "DocumentDraw" @@ -713,10 +713,10 @@ testcase tGallery_GalleryView_Insert end if '/// Test following for all applications (Writer, Calc, Impress, Draw) for i=1 to 4 ' each application - if i=1 then gApplication = "Writer" - if i=2 then gApplication = "Calc" - if i=3 then gApplication = "Impress" - if i=4 then gApplication = "Draw" + if i=1 then gApplication = "WRITER" + if i=2 then gApplication = "CALC" + if i=3 then gApplication = "IMPRESS" + if i=4 then gApplication = "DRAW" '/// +Open a new document '/// +Open the Gallery @@ -920,7 +920,7 @@ testcase tGallery_GalleryView_Delete '/// Open a new writer-doc '/// Tools / Gallery - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery '/// Delete one object in list-view and icon-view for 3D, Animation and Sound diff --git a/testautomation/graphics/optional/includes/global/gallery2.inc b/testautomation/graphics/optional/includes/global/gallery2.inc index c1f6592404c0..98c8b3448da0 100755 --- a/testautomation/graphics/optional/includes/global/gallery2.inc +++ b/testautomation/graphics/optional/includes/global/gallery2.inc @@ -56,7 +56,7 @@ testcase tSettingsToCM WaitSlot (10000) Call hNewDocument ToolsOptions - hToolsOptions ( "Textdocument", "General" ) + hToolsOptions ( "WRITER", "General" ) iSaveSetting = Masseinheit.GetSelIndex Masseinheit.Select 2 Kontext "ExtrasOptionenDlg" @@ -286,7 +286,7 @@ testcase tResetSettings printlog "+Tools / options / text documents / general" call hNewDocument ToolsOptions - hToolsOptions ( "Textdocument", "General" ) + hToolsOptions ( "WRITER", "General" ) Masseinheit.Select iSaveSetting Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc index a54ab85474d4..ebd5f1ca8159 100755 --- a/testautomation/graphics/optional/includes/global/id_001.inc +++ b/testautomation/graphics/optional/includes/global/id_001.inc @@ -68,7 +68,7 @@ testcase tiFileSaveAs dim sFile as string ' filename to export dim sPath as string ' filename to export - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -79,12 +79,12 @@ testcase tiFileSaveAs sFileName = "graphics\required\input\tbo_alf_." + ExtensionString ' this is the file with all features sFile = "isas_" ' this is the filename of the export files - sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform) ' this is the export path + sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path if dir (sPath) = "" then app.mkdir (sPath) end if - Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\Lcase(gApplication) gPlatform isas_* ///'" + Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_* ///'" if gSamePC = TRUE then ' delete export directory GetFileList ( sPath, sFile+"*", Exlist() ) if KillFileList ( Exlist() ) <> TRUE then @@ -184,7 +184,7 @@ testcase tiFileReload Dim DokumentPfad$ Dim Datei$ - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -238,7 +238,7 @@ testcase tiFileVersion Dim DokumentPfad$ Dim Datei$ - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -304,15 +304,15 @@ testcase tiFilePassword dim sFile as string ' filename to export dim sPath as string ' and path to export - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if -'/// save file to: "graphics\required\output\"+Lcase(gApplication)+"\"+ gPlatform+"\"isp__" ///' +'/// save file to: "graphics\required\output\"+gApplication+"\"+ gPlatform+"\"isp__" ///' sFile = "isp__" ' this is the filename of the export files - sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform+"\") ' this is the export path + sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform+"\") ' this is the export path mkdir (sPath) if dir (sPath) = "" then app.mkdir (sPath) sFileIn = (sPath + sFile + "." + ExtensionString) diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc index 9c8798b3aa77..258ae7504340 100755 --- a/testautomation/graphics/optional/includes/global/id_003.inc +++ b/testautomation/graphics/optional/includes/global/id_003.inc @@ -125,7 +125,7 @@ testcase tiViewToolbar ViewToolbarsFontwork WaitSlot (1000) - ' if LCase(gApplication) = "impress" then + ' if gApplication = "IMPRESS" then '/// View->Toolbars->Presentation ///' ' ViewToolbarsPresentation ' only in impress, not draw '/// View->Toolbars->Presentation ///' diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc index 24f5e522ed8c..31ca3e0dce43 100755 --- a/testautomation/graphics/optional/includes/global/id_006.inc +++ b/testautomation/graphics/optional/includes/global/id_006.inc @@ -119,7 +119,7 @@ testcase tiToolsThesaurus '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in the options, to enable it for languages, which don't provide a dictionary (usually asian ones) ///' call hSetSpellHypLanguage '/// open application-specific document which contains an American-formatted textframe with text. And select the text ///' - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odp")) else sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg")) diff --git a/testautomation/graphics/optional/includes/global/id_011.inc b/testautomation/graphics/optional/includes/global/id_011.inc index 75f4c1e3a66d..3a17c098ba1a 100755 --- a/testautomation/graphics/optional/includes/global/id_011.inc +++ b/testautomation/graphics/optional/includes/global/id_011.inc @@ -373,7 +373,7 @@ testcase tiTextToolbar ViewToolbarsTextFormatting WaitSlot (2000) 'sleep 1 '/// Clear the document from content ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "" EditSelectAll diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc index 8cfcba8f25b2..de212977d7e2 100755 --- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc +++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc @@ -57,7 +57,7 @@ testcase tSaveLoadLayoutEmpty '/// Create a new document, add an empty Layout, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an empty Layout. ///' @@ -101,7 +101,7 @@ testcase tSaveLoadLayoutOLE '/// Create a new document, add a Layout with an OLE-field, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with an OLE. ///' @@ -162,7 +162,7 @@ testcase tSaveLoadLayoutText '/// Create a new document, add a Layout with a Textfield, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Text-field. ///' @@ -214,7 +214,7 @@ testcase tSaveLoadLayoutOutline '/// Create a new document, add a Layout with an Outline-field, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Outline-field. ///' @@ -265,7 +265,7 @@ testcase tSaveLoadLayoutPicture '/// Create a new document, add a Layout with a Graphic-field, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Graphic-field. ///' @@ -316,7 +316,7 @@ testcase tSaveLoadLayoutChart '/// Create a new document, add a Layout for a Chart, Save the document in all available formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Chart-field. ///' @@ -367,7 +367,7 @@ testcase tSaveLoadLayoutSpreadsheet '/// Create a new document, add a Layout containing a Spreadsheet, Save the document in all available Formats, and open the saved files. ///' '/// Make new Presentation ///' - gApplication = "Impress" + gApplication = "IMPRESS" Call hNewDocument '/// Choose and Insert an Layout with a Spreadsheet-field. ///' diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index d2254637a474..50ddc4e93200 100755 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -378,7 +378,7 @@ testcase t114174 dim i as integer dim sFile as string - if lCase(gApplication) = "impress" then + if gApplication = "IMPRESS" then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/optional/includes/impress/im_011_.inc b/testautomation/graphics/optional/includes/impress/im_011_.inc index 1632cb39bc82..b7a1bf39c711 100755 --- a/testautomation/graphics/optional/includes/impress/im_011_.inc +++ b/testautomation/graphics/optional/includes/impress/im_011_.inc @@ -48,7 +48,7 @@ testcase tiDiaLeiste sleep 1 '/// Change options so the presentation won't start from the current, but the first slide. ///' ToolsOptions - hToolsOptions ( "Presentation", "General" ) + hToolsOptions ( "IMPRESS", "General" ) MitAktuellerSeite.Uncheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -167,7 +167,7 @@ testcase tiDiaLeiste endif '/// Restore default settings in ToolsOptions ///' ToolsOptions - hToolsOptions ( "Presentation", "General" ) + hToolsOptions ( "IMPRESS", "General" ) MitAktuellerSeite.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/required/d_opt.bas b/testautomation/graphics/required/d_opt.bas index b9039c4c2c9c..017ac65a7bff 100755 --- a/testautomation/graphics/required/d_opt.bas +++ b/testautomation/graphics/required/d_opt.bas @@ -71,7 +71,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Draw" + gApplication = "DRAW" Call GetUseFiles end sub diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index df13533464fa..66ca92a6b190 100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas @@ -89,6 +89,6 @@ sub LoadIncludeFiles use "global\required\includes\g_customize.inc" use "global\required\includes\g_001.inc" Call GetUseFiles - gApplication = "Draw" + gApplication = "DRAW" end sub diff --git a/testautomation/graphics/required/i_opt.bas b/testautomation/graphics/required/i_opt.bas index a2e13047efa4..419d5a7941d4 100755 --- a/testautomation/graphics/required/i_opt.bas +++ b/testautomation/graphics/required/i_opt.bas @@ -73,7 +73,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/graphics/required/includes/global/gallery.inc b/testautomation/graphics/required/includes/global/gallery.inc index 9d13d3783817..86f5cc58bd38 100755 --- a/testautomation/graphics/required/includes/global/gallery.inc +++ b/testautomation/graphics/required/includes/global/gallery.inc @@ -53,7 +53,7 @@ testcase tGallery_DialogTest '///Open a new Writer document '///Tools / Gallery printlog "- Working with Gallery-Beamer!" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery Kontext "DocumentWriter" @@ -88,7 +88,7 @@ testcase tGallery_ActivateAndUpdateAllThemes '///+Tools / Gallery '///+Click on each theme and update it (via context menu) printlog "activate and update all gallery-themes" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -149,7 +149,7 @@ testcase tGallery_CheckNames '///Check the names for the gallery themes '///Open a new Writer document '///+Tools / Gallery - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -203,7 +203,7 @@ testcase tGallery_CheckContextMenuForGalleryThemes '/// Open a new Writer document '/// +Tools / Gallery printlog "check the contextmenu for the gallery-themes" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery '/// +Testing rename and properties for each gallery theme (via context-menu) @@ -271,7 +271,7 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes '/// Open a new Writer document '/// Tools / Gallery printlog "create a new gallery-theme ( TT-theme )" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery iMenuEntries = Gallerys.GetItemCount @@ -513,7 +513,7 @@ testcase tGallery_GalleryView_Preview '/// Open a new Writer document '/// Tools / Gallery printlog "open a writer and the gallery" - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument Kontext call hOpenGallery @@ -643,14 +643,14 @@ testcase tGallery_GalleryView_Preview '/// If the MediaPlayer exists - close it ///' kontext "Mplayer" if Mplayer.Exists then - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then kontext "DocumentImpress" else kontext "DocumentDraw" end if ToolsMediaPlayer else - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then kontext "DocumentImpress" else kontext "DocumentDraw" @@ -712,10 +712,10 @@ testcase tGallery_GalleryView_Insert end if '/// Test following for all applications (Writer, Calc, Impress, Draw) for i=1 to 4 ' each application - if i=1 then gApplication = "Writer" - if i=2 then gApplication = "Calc" - if i=3 then gApplication = "Impress" - if i=4 then gApplication = "Draw" + if i=1 then gApplication = "WRITER" + if i=2 then gApplication = "CALC" + if i=3 then gApplication = "IMPRESS" + if i=4 then gApplication = "DRAW" '/// +Open a new document '/// +Open the Gallery @@ -919,7 +919,7 @@ testcase tGallery_GalleryView_Delete '/// Open a new writer-doc '/// Tools / Gallery - gApplication = "Writer" + gApplication = "WRITER" call hNewDocument call hOpenGallery '/// Delete one object in list-view and icon-view for 3D, Animation and Sound diff --git a/testautomation/graphics/required/includes/global/gallery2.inc b/testautomation/graphics/required/includes/global/gallery2.inc index c0a17163b82d..7d3ef1e6819f 100755 --- a/testautomation/graphics/required/includes/global/gallery2.inc +++ b/testautomation/graphics/required/includes/global/gallery2.inc @@ -56,7 +56,7 @@ testcase tSettingsToCM WaitSlot (10000) Call hNewDocument ToolsOptions - hToolsOptions ( "Textdocument", "General" ) + hToolsOptions ( "WRITER", "General" ) iSaveSetting = Masseinheit.GetSelIndex Masseinheit.Select 2 Kontext "ExtrasOptionenDlg" @@ -286,7 +286,7 @@ testcase tResetSettings printlog "+Tools / options / text documents / general" call hNewDocument ToolsOptions - hToolsOptions ( "Textdocument", "General" ) + hToolsOptions ( "WRITER", "General" ) Masseinheit.Select iSaveSetting Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc index 87b7eadf4c18..3066372a8d68 100755 --- a/testautomation/graphics/required/includes/global/id_001.inc +++ b/testautomation/graphics/required/includes/global/id_001.inc @@ -71,7 +71,7 @@ testcase tiFileSaveAs dim sFileNameLoaded as string 'gets name of fiel from Dateiname that will be loaded - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -83,13 +83,13 @@ testcase tiFileSaveAs sFileName = "graphics\required\input\tbo_alf_." + ExtensionString ' this is the file with all features printlog "FileName is " + sFileName sFile = "isas_" ' this is the filename of the export files - sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform) ' this is the export path + sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path printlog "sPath is " + sPath if dir (sPath) = "" then app.mkdir (sPath) end if - Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\Lcase(gApplication) gPlatform isas_* ///'" + Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_* ///'" if gSamePC = TRUE then ' delete export directory GetFileList ( sPath, sFile+"*", Exlist() ) if KillFileList ( Exlist() ) <> TRUE then @@ -148,7 +148,7 @@ testcase tiFileSaveAs printlog "File will be loaded: " & sFileNameLoaded Oeffnen.Click printlog "Closing doc if it gets loaded: " & sFileNameLoaded - if lCase(gApplication) = "impress" then + if gApplication = "IMPRESS" then Kontext "DocumentImpress" if DocumentImpress.exists(5) then Call hCloseDocument @@ -175,7 +175,7 @@ testcase tiFileReload Dim DokumentPfad$ Dim Datei$ - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -233,7 +233,7 @@ testcase tiFileVersion Dim DokumentPfad$ Dim Datei$ - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" @@ -303,15 +303,15 @@ testcase tiFilePassword dim sFile as string ' filename to export dim sPath as string ' and path to export - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if -'/// save file to: "graphics\required\output\"+Lcase(gApplication)+"\"+ gPlatform+"\"isp__" ///' +'/// save file to: "graphics\required\output\"+gApplication+"\"+ gPlatform+"\"isp__" ///' sFile = "isp__" ' this is the filename of the export files - sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform+"\") ' this is the export path + sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform+"\") ' this is the export path mkdir (sPath) if dir (sPath) = "" then app.mkdir (sPath) sFileIn = (sPath + sFile + "." + ExtensionString) diff --git a/testautomation/graphics/required/includes/global/id_003.inc b/testautomation/graphics/required/includes/global/id_003.inc index 551fd6d133d8..036acbd1e04a 100755 --- a/testautomation/graphics/required/includes/global/id_003.inc +++ b/testautomation/graphics/required/includes/global/id_003.inc @@ -125,7 +125,7 @@ testcase tiViewToolbar ViewToolbarsFontwork WaitSlot (1000) - ' if LCase(gApplication) = "impress" then + ' if gApplication = "IMPRESS" then '/// View->Toolbars->Presentation ///' ' ViewToolbarsPresentation ' only in impress, not draw '/// View->Toolbars->Presentation ///' diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index 0300d26c6b48..d7a3834f64b7 100755 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -121,7 +121,7 @@ testcase tiToolsThesaurus '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in the options, to enable it for languages, which don't provide a dictionary (usually asian ones) ///' call hSetSpellHypLanguage '/// open application-specific document which contains an American-formatted textframe with text. And select the text ///' - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odp")) else sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg")) diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc index 95cdd4f8f774..e87a24d93f51 100755 --- a/testautomation/graphics/required/includes/global/id_011.inc +++ b/testautomation/graphics/required/includes/global/id_011.inc @@ -373,7 +373,7 @@ testcase tiTextToolbar ViewToolbarsTextFormatting WaitSlot (2000) 'sleep 1 '/// Clear the document from content ///' - if (lcase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then Kontext "DocumentImpressOutlineView" DocumentImpressOutlineView.TypeKeys "" EditSelectAll diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc index 9b84a930aadf..8fc884a50344 100755 --- a/testautomation/graphics/required/includes/global/id_opt_1.inc +++ b/testautomation/graphics/required/includes/global/id_opt_1.inc @@ -66,7 +66,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) irgendwas(4) = KopieBeimVerschieben.IsChecked irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then irgendwas(6) = SetzenAufKreis.IsChecked ' DRAW iZeichnungsmasstab = Zeichnungsmasstab.GetSelIndex ' DRAW else ' IMPRESS @@ -94,7 +94,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) if (LiberalMeasurement (sTemp,Tabulatorabstand.GetText) <> TRUE) Then Warnlog "Something wrong, please check!" Tabulatorabstand.SetText (sTabAbstand) - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then If ( Zeichnungsmasstab.GetItemCount <> iZeichnungsmasstab ) Then Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount) _ Else Zeichnungsmasstab.Select (1) iTemp2 = Zeichnungsmasstab.GetSelIndex @@ -134,7 +134,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) If ( irgendwas(4) = KopieBeimVerschieben.IsChecked ) Then WarnLog "Copy When Moving state changed" If ( irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked ) Then WarnLog "Objects Always Movable state changed" - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale state changed BUG #97391 is:"+Zeichnungsmasstab.GetSelIndex+"; should: "+iTemp2 If ( irgendwas(6) = SetzenAufKreis.IsChecked ) Then WarnLog "'Do not disort objects in curve' state changed" else ' IMPRESS @@ -156,7 +156,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) KopieBeimVerschieben.UnCheck ObjekteImmerVerschiebbar.UnCheck - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then Zeichnungsmasstab.Select (1) SetzenAufKreis.UnCheck else ' IMPRESS @@ -187,7 +187,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) If KopieBeimVerschieben.IsChecked Then WarnLog "Copy When Moving x" If ObjekteImmerVerschiebbar.IsChecked Then WarnLog "Objects Always Movable x" - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then If ( Zeichnungsmasstab.GetSelIndex <> 1 ) Then WarnLog "'Drawing Scale' is not item 1" If SetzenAufKreis.IsChecked Then WarnLog "'Do not disort objects in curve' x" else ' IMPRESS @@ -221,7 +221,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) ExtrasOptionenDlg.OK printlog "creating document with tabstops and save it" - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then kontext "Toolbar" Textfield.Click kontext "DocumentDraw" @@ -235,7 +235,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) hTypeKeys "abcdefghij" - if lCase(gApplication = "IMPRESS") then + if ( gApplication = "IMPRESS" ) then ExtensionString = "odp" else ExtensionString = "odg" @@ -286,7 +286,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) printlog "Click in the open impress document to get the focus back to the document" printlog "Otherwise it sometimes happend that the Tools/Option dialog doesn't display the correct applications" hNewDocument - if ( sApplication = "Presentation") then + if ( sApplication = "IMPRESS") then Kontext "DocumentImpress" DocumentImpress.MouseDown(50,50) DocumentImpress.MouseUp(50,50) @@ -307,7 +307,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) KopieBeimVerschieben.Check ObjekteImmerVerschiebbar.Check - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then Zeichnungsmasstab.Select (2) itemp2 = Zeichnungsmasstab.GetSelIndex SetzenAufKreis.Check @@ -336,7 +336,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) If True <> KopieBeimVerschieben.IsChecked Then WarnLog "Copy When Moving o" If True <> ObjekteImmerVerschiebbar.IsChecked Then WarnLog "Objects Always Movable o" - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale is not item " + iTemp2 + " it's: " + Zeichnungsmasstab.GetSelIndex If True <> SetzenAufKreis.IsChecked Then WarnLog "'Do not disort objects in curve' o" else ' IMPRESS @@ -357,7 +357,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string) If ( irgendwas(4) = TRUE ) Then KopieBeimVerschieben.Check Else KopieBeimVerschieben.UnCheck If ( irgendwas(5) = TRUE ) Then ObjekteImmerVerschiebbar.Check Else ObjekteImmerVerschiebbar.UnCheck - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then Zeichnungsmasstab.Select (iZeichnungsmasstab) If ( irgendwas(6) = TRUE ) Then SetzenAufKreis.Check Else SetzenAufKreis.UnCheck else ' IMPRESS @@ -472,7 +472,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string) dim sTempMetricField(7) as string dim iTry as integer ' some increment variable - if lCase(gApplication = "IMPRESS") then + if ( gApplication = "IMPRESS" ) then ExtensionString = "odp" else ExtensionString = "odg" @@ -735,7 +735,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string) printlog "Function Test: Grid Resolution" printlog "gTesttoolPath + graphics\required\input\gridtst.od?" - if lCase(gApplication = "IMPRESS") then + if ( gApplication = "IMPRESS" ) then ExtensionString = "odp" else ExtensionString = "odg" diff --git a/testautomation/graphics/required/includes/global/id_opt_2.inc b/testautomation/graphics/required/includes/global/id_opt_2.inc index cceb296673f5..0e02fc83a6c9 100755 --- a/testautomation/graphics/required/includes/global/id_opt_2.inc +++ b/testautomation/graphics/required/includes/global/id_opt_2.inc @@ -48,12 +48,12 @@ testcase tToolsOptionsMeasurementUnit (sApplication as string) dim gApplicationTemp as string gApplicationTemp = gApplication - gApplication = "writer" + gApplication = "WRITER" printlog "Take Measurement Units from Writer " hNewDocument ToolsOptions ' Take General Measurement units from writer, there are only 5! - hToolsOptions ("textdocument","General") + hToolsOptions ("WRITER","General") iCount2 = Masseinheit.GetItemCount for i=1 to iCount2 diff --git a/testautomation/graphics/required/includes/impress/im_011_.inc b/testautomation/graphics/required/includes/impress/im_011_.inc index 22a3afe29155..e0ec5aa6d1f4 100755 --- a/testautomation/graphics/required/includes/impress/im_011_.inc +++ b/testautomation/graphics/required/includes/impress/im_011_.inc @@ -48,7 +48,7 @@ testcase tiDiaLeiste sleep 1 '/// Change options so the presentation won't start from the current, but the first slide. ///' ToolsOptions - hToolsOptions ( "Presentation", "General" ) + hToolsOptions ( "IMPRESS", "General" ) MitAktuellerSeite.Uncheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -167,7 +167,7 @@ testcase tiDiaLeiste endif '/// Restore default settings in ToolsOptions ///' ToolsOptions - hToolsOptions ( "Presentation", "General" ) + hToolsOptions ( "IMPRESS", "General" ) MitAktuellerSeite.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index ac61d8fc0513..51dcb9e42ec7 100755 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -268,7 +268,7 @@ function setStartCurrentPage(optional bState as boolean) as boolean '/// tools->options ///' ToolsOptions '///+ select in section 'Presentation' tabpage 'general' ///' - hToolsOptions ("Presentation","General") + hToolsOptions ("IMPRESS","General") '///+ check the checkbox 'Always with current page' ///' setStartCurrentPage = MitAktuellerSeite.isChecked if bState then diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index a15d067511af..9f3783f8249c 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -98,14 +98,14 @@ sub sFileExport Dim ExPath as String Dim Liste( 50 ) as String - if (lCase(gApplication) = "impress") then + if (gApplication = "IMPRESS") then ExtensionString = "odp" else ExtensionString = "odg" end if '///- all files are saved in [StarOfficePath]/user/work/[applicatoion]/export ///' - ExPath = ConvertPath (gOfficePath + "user\work\" + lCase(gApplication) + "\export\" ) + ExPath = ConvertPath (gOfficePath + "user\work\" + gApplication + "\export\" ) OutputGrafikTBO = ExPath & "expo" Printlog "Create the export-dir for the graphics ( " + ExPath + " )" try @@ -315,14 +315,14 @@ end Sub '------------------------------------------------------------------------------- sub SaveMeasurementSetFirst - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then sApplication = "DRAWING" - elseIf (lCase(gApplication) = "impress") then - sApplication = "PRESENTATION" - elseIf (lCase(gApplication) = "writer") then - sApplication = "TEXTDOCUMENT" - elseIf (lCase(gApplication) = "calc") then - sApplication = "SPREADSHEET" + elseIf (gApplication = "IMPRESS") then + sApplication = "IMPRESS" + elseIf (gApplication = "WRITER") then + sApplication = "WRITER" + elseIf (gApplication = "CALC") then + sApplication = "CALC" endif printlog " '/// - save states ///'" ToolsOptions @@ -338,14 +338,14 @@ end Sub sub MeasurementSetFirst dim f as integer - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then sApplication = "DRAWING" - elseIf (lCase(gApplication) = "impress") then - sApplication = "PRESENTATION" - elseIf (lCase(gApplication) = "writer") then - sApplication = "TEXTDOCUMENT" - elseIf (lCase(gApplication) = "calc") then - sApplication = "SPREADSHEET" + elseIf (gApplication = "IMPRESS") then + sApplication = "IMPRESS" + elseIf (gApplication = "WRITER") then + sApplication = "WRITER" + elseIf (gApplication = "CALC") then + sApplication = "CALC" endif ToolsOptions hToolsOptions (sApplication,"General") @@ -367,14 +367,14 @@ end Sub sub ResetMeasurement dim f as integer - if (lCase(gApplication) = "draw") then + if (gApplication = "DRAW") then sApplication = "DRAWING" - elseIf (lCase(gApplication) = "impress") then - sApplication = "PRESENTATION" - elseIf (lCase(gApplication) = "writer") then - sApplication = "TEXTDOCUMENT" - elseIf (lCase(gApplication) = "calc") then - sApplication = "SPREADSHEET" + elseIf (gApplication = "IMPRESS") then + sApplication = "IMPRESS" + elseIf (gApplication = "WRITER") then + sApplication = "WRITER" + elseIf (gApplication = "CALC") then + sApplication = "CALC" endif printlog "'/// - Reset states back to what they were before ///'" ToolsOptions diff --git a/testautomation/graphics/tools/makeLokaleTxt.bas b/testautomation/graphics/tools/makeLokaleTxt.bas index 46ffc8fd5936..13c7d204c7b2 100755 --- a/testautomation/graphics/tools/makeLokaleTxt.bas +++ b/testautomation/graphics/tools/makeLokaleTxt.bas @@ -116,7 +116,7 @@ printlog "Strings from current office: " hCloseDocument '(3)tFormatStylistTemplateSelect 'stylist.inc::tFormatStylistTemplateSelect - gApplication = "Writer" + gApplication = "WRITER" hNewDocument kontext "Gestalter" if NOT Gestalter.Exists then @@ -126,14 +126,14 @@ printlog "Strings from current office: " glLocale (3) = Vorlagenliste.getSelText ' HID_STYLE_LISTBOX ' get "Default" printlog "L3: '" + glLocale (3) + "'" hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" '(4)ASIANONLY tiToolsSpellcheckError ' no need to exclude eurtopean! ' this entry will get English (USA) ' spellbook language as alternative for not existijng asians one ' tiToolsSpellcheckError - gApplication = "Draw" + gApplication = "DRAW" hDateiOeffnen (convertPath(gTesttoolpath + "graphics/required/input/recht_1.sxd")) sleep 5 hTypeKeys "" @@ -154,7 +154,7 @@ printlog "Strings from current office: " TabFont.Ok sleep 5 Call hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" '(5)tFormatStylistBackground ' stylist only one tabpage area! @@ -245,7 +245,7 @@ printlog "Strings from current office: " '(6) ' this entry will get German (Germany) - gApplication = "Draw" + gApplication = "DRAW" hDateiOeffnen (convertPath(gTesttoolpath + "graphics/required/input/recht_49.sxd")) sleep 5 hTypeKeys "" @@ -267,7 +267,7 @@ printlog "Strings from current office: " sleep 5 Call hCloseDocument - gApplication = "Impress" + gApplication = "IMPRESS" dim lLocale (15*20) as string ' list, where file gets loaded into dim flocale as string @@ -287,7 +287,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Impress" + gApplication = "IMPRESS" Call GetUseFiles end sub diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc index 0ddbd05768fa..98b72b99b734 100755 --- a/testautomation/math/optional/includes/m_101_.inc +++ b/testautomation/math/optional/includes/m_101_.inc @@ -52,9 +52,9 @@ sub m_101_ Call tFilePassword ' check which filtertypes enable saving with password Call tFileOpen_1 ' just load all previous saved files in this test Call tFileOpen_2 ' load testfiles for filters - gApplication = "Writer" + gApplication = "WRITER" Call tToolsCatalog ' code is in m_105_.inc, but i want to print he result, so i needed to moove teh call to here - gApplication = "Math" + gApplication = "MATH" Call tFilePrint ' writer dokument with math ole's ' Call tFileSaveAll ' Call tFileNewLoad diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc index 3052d711bed4..8b70ecbd4aaa 100644 --- a/testautomation/math/optional/includes/m_105.inc +++ b/testautomation/math/optional/includes/m_105.inc @@ -65,7 +65,7 @@ testcase tToolsOptions printlog ("'/// - save states ///") ToolsOptions sleep 1 - hToolsOptions ("FORMULA", "SETTINGS") + hToolsOptions ("MATH", "SETTINGS") irgendwas(1) = DruckeTitelzeile.IsChecked irgendwas(2) = DruckeFormeltext.IsChecked @@ -96,7 +96,7 @@ TBOrestart printlog ("'/// - checking states ///") ToolsOptions - hToolsOptions ("FORMULA", "SETTINGS") + hToolsOptions ("MATH", "SETTINGS") If ( irgendwas(1) = DruckeTitelzeile.IsChecked ) Then WarnLog "DruckeTitelzeile state changed" If ( irgendwas(2) = DruckeFormeltext.IsChecked ) Then WarnLog "DruckeFormeltext state changed" @@ -118,7 +118,7 @@ TBOrestart printlog ("'/// - check if all UnChecked ///") ToolsOptions - hToolsOptions ("FORMULA", "SETTINGS") + hToolsOptions ("MATH", "SETTINGS") If DruckeTitelzeile.IsChecked Then WarnLog "DruckeTitelzeil x" If DruckeFormeltext.IsChecked Then WarnLog "DruckeFormeltext x" @@ -146,7 +146,7 @@ TBOrestart DocumentMath.mouseUp 10,10 '----------------------------------------------- ToolsOptions - hToolsOptions ("FORMULA", "SETTINGS") + hToolsOptions ("MATH", "SETTINGS") try If True <> DruckeTitelzeile.IsChecked Then WarnLog "DruckeTitelzeil o" @@ -317,11 +317,11 @@ testcase tToolsCatalog dim sNotAllowed() as string '/// open Writer application ///' - gApplication = "Writer" + gApplication = "WRITER" Call hNewDocument '/// Insert->Object->Formula ///' InsertObjectFormulaWriter - Kontext "Math" + Kontext "MATH" '/// Tools->Catalog ///' try ToolsSymbolsCatalog @@ -494,7 +494,7 @@ goto endsub Call hNewDocument '1 - Kontext "Math" + Kontext "MATH" '/// Tools->Catalog ///' try ToolsSymbolsCatalog @@ -549,7 +549,7 @@ goto endsub exitRestartTheOffice '2 Call hNewDocument - Kontext "Math" + Kontext "MATH" '/// Tools->Catalog ///' try ToolsSymbolsCatalog @@ -598,7 +598,7 @@ goto endsub exitRestartTheOffice '3 Call hNewDocument - Kontext "Math" + Kontext "MATH" '/// Tools->Catalog ///' try ToolsSymbolsCatalog diff --git a/testautomation/math/optional/m_lvl1.bas b/testautomation/math/optional/m_lvl1.bas index f370445df68b..644174be51b5 100755 --- a/testautomation/math/optional/m_lvl1.bas +++ b/testautomation/math/optional/m_lvl1.bas @@ -62,5 +62,5 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" Call GetUseFiles - gApplication = "Math" + gApplication = "MATH" end sub diff --git a/testautomation/spreadsheet/optional/c_import_general.bas b/testautomation/spreadsheet/optional/c_import_general.bas index 639f8e103217..7d80f52413fa 100755 --- a/testautomation/spreadsheet/optional/c_import_general.bas +++ b/testautomation/spreadsheet/optional/c_import_general.bas @@ -65,7 +65,7 @@ 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/spreadsheet/optional/c_namedrange.bas b/testautomation/spreadsheet/optional/c_namedrange.bas index 4da5ad26d50a..434df0ec18cd 100755 --- a/testautomation/spreadsheet/optional/c_namedrange.bas +++ b/testautomation/spreadsheet/optional/c_namedrange.bas @@ -66,7 +66,7 @@ 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/spreadsheet/optional/c_printrange.bas b/testautomation/spreadsheet/optional/c_printrange.bas index 9a66e2ea0046..f1c117ed9c05 100755 --- a/testautomation/spreadsheet/optional/c_printrange.bas +++ b/testautomation/spreadsheet/optional/c_printrange.bas @@ -67,7 +67,7 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_spreadsheet_tools1.inc" - gApplication = "Calc" + gApplication = "CALC" Call GetUseFiles end sub diff --git a/testautomation/spreadsheet/optional/c_so7_pp1.bas b/testautomation/spreadsheet/optional/c_so7_pp1.bas index e1720b0f8e90..7ab799303468 100755 --- a/testautomation/spreadsheet/optional/c_so7_pp1.bas +++ b/testautomation/spreadsheet/optional/c_so7_pp1.bas @@ -68,7 +68,7 @@ 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/spreadsheet/required/c_updt1.bas b/testautomation/spreadsheet/required/c_updt1.bas index 18d304b3043e..af3ea7596374 100755 --- a/testautomation/spreadsheet/required/c_updt1.bas +++ b/testautomation/spreadsheet/required/c_updt1.bas @@ -69,6 +69,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_locale_tools.inc" - gApplication = "Calc" + gApplication = "CALC" GetUseFiles () end sub diff --git a/testautomation/spreadsheet/required/c_updt2.bas b/testautomation/spreadsheet/required/c_updt2.bas index d7eb5056f8bc..51ada5608949 100755 --- a/testautomation/spreadsheet/required/c_updt2.bas +++ b/testautomation/spreadsheet/required/c_updt2.bas @@ -76,6 +76,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_locale_tools.inc" - gApplication = "Calc" + gApplication = "CALC" GetUseFiles () end sub diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc index 897d6ab1458b..cb0dbfc64321 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc @@ -313,7 +313,7 @@ testcase tToolsOptions ToolsOptions '/// Choose 'Calc – General' printlog " Choose 'Calc – General'" - hToolsOptions("SPREADSHEET", "GENERAL") + hToolsOptions("CALC", "GENERAL") Call DialogTest ( TabLayoutCalc ) '/// Verify that the 'Measurement' combobox has items printlog " Verify that the 'Measurement' combobox has items" @@ -330,7 +330,7 @@ testcase tToolsOptions end if '/// Choose 'Calc – View' printlog " Choose 'Calc – View'" - hToolsOptions("SPREADSHEET", "VIEW") + hToolsOptions("CALC", "VIEW") Call DialogTest ( TabInhaltCalc ) '/// Verify that the 'Color' combobox has items printlog " Verify that the 'Color' combobox has items" @@ -354,11 +354,11 @@ testcase tToolsOptions end if '/// Choose 'Calc – Calculate' printlog " Choose 'Calc – Calculate'" - hToolsOptions("SPREADSHEET", "CALCULATE") + hToolsOptions("CALC", "CALCULATE") Call DialogTest ( TabBerechnen ) '/// Choose 'Calc – Sortlists' printlog " Choose 'Calc – Sortlists'" - hToolsOptions("SPREADSHEET", "SORTLISTS") + hToolsOptions("CALC", "SORTLISTS") Call DialogTest ( TabSortierlisten ) '/// Verify that there are sortlists available printlog " Verify that there are sortlists available" @@ -367,7 +367,7 @@ testcase tToolsOptions end if '/// Choose 'Calc – Changes' printlog " Choose 'Calc – Changes'" - hToolsOptions("SPREADSHEET", "CHANGES") + hToolsOptions("CALC", "CHANGES") Call DialogTest ( TabAenderungenCalc ) '/// Verify that the 'Changes' combobox has items printlog " Verify that the 'Changes' combobox has items" @@ -376,7 +376,7 @@ testcase tToolsOptions end if '/// Choose 'Calc – Grid' printlog " Choose 'Calc – Grid'" - hToolsOptions("SPREADSHEET", "GRID") + hToolsOptions("CALC", "GRID") Call DialogTest ( TabRaster ) '/// Decrease 'Horizontal Resolution' printlog " Decrease 'Horizontal Resolution'" @@ -386,7 +386,7 @@ testcase tToolsOptions RasterUnterteilungXAchse.More '/// Choose 'Calc – Print' printlog " Choose 'Calc – Print'" - hToolsOptions("SPREADSHEET", "PRINT") + hToolsOptions("CALC", "PRINT") Call DialogTest ( TabPrintCalcOptions ) '/// Close 'Options' dialog with 'Cancel' printlog " Close 'Options' dialog with 'Cancel'" diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc index e206a467c8f6..4fca662e7a55 100755 --- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc +++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc @@ -60,7 +60,7 @@ function wPasteAvailableClipboardFormats(TheNumber as integer, CheckWhat as Stri ClipboardFormat = Auswahl.GetSeltext printlog "- Paste as: " + ClipboardFormat Select Case CheckWhat - Case "ctext", "draw" + Case "ctext", "DRAW" if lcase(gPlatform) = "sol" and lcase(ClipboardFormat) = "bitmap" then QAErrorlog "#i49505#Paste drawing object as bitmap crashes office" goto s_next_item @@ -87,18 +87,18 @@ function wPasteAvailableClipboardFormats(TheNumber as integer, CheckWhat as Stri Call wDocSetContext Call wTypeKeys "",2 Select Case gApplication - Case "WRITER","MASTERDOC","HTMLDOKUMENT" + Case "WRITER","MASTERDOCUMENT","HTML" Select Case CheckWhat Case "text","field","table" Call wTypeKeys "" Call wTypeKeys "(" + Clipboardformat + ")" Call wTypeKeys "",2 - Case "frame", "draw", "graphicL", "graphicE", "ole", "control", "ctext" + Case "frame", "DRAW", "graphicL", "graphicE", "ole", "control", "ctext" 'Call gMouseClick (50,100) Call wTypeKeys ("") Call wTypeKeys "(" + Clipboardformat + ")" if i < TheNumber Then - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then InsertManualBreak Kontext "UmbruchEinfuegen" Seitenumbruch.Check @@ -181,7 +181,7 @@ function wSetClipboardtestDefaults(ForWhat as string) as boolean Call wTypeKeys ( "" ) '"+ Copy selected frame " - Case "draw" + Case "DRAW" '"+ Select 'Drawing Object' " Call wTypeKeys ( "" ) Call wTypeKeys "" @@ -368,7 +368,7 @@ Sub wDisableImpressAutopilot() gApplication = "IMPRESS" Call hNewDocument ToolsOptions - Call hToolsOptions ("PRESENTATION","General") + Call hToolsOptions ("IMPRESS","General") MitAutopilotStarten.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/writer/optional/includes/clipboard/w_210_.inc b/testautomation/writer/optional/includes/clipboard/w_210_.inc index ab34880aca6f..7110fe4ae0ed 100755 --- a/testautomation/writer/optional/includes/clipboard/w_210_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_210_.inc @@ -257,7 +257,7 @@ testcase WriterToWriterDrawingObject printlog " + Select 'Drawing Object' " printlog " + Copy selected Drawing Object " printlog " + Open new document " - if wSetClipboardtestDefaults("draw") = True then + if wSetClipboardtestDefaults("DRAW") = True then Call hNewDocument printlog " + Edit / Paste Special " EditPasteSpecialWriter @@ -266,7 +266,7 @@ testcase WriterToWriterDrawingObject Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then printlog " + Write Clipboard format under pasted content " - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Save document as ..\user\work\writer_to_writer_draw.odt" Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\writer_to_writer_draw.odt", "writer8") WaitSlot (2000) diff --git a/testautomation/writer/optional/includes/clipboard/w_211_.inc b/testautomation/writer/optional/includes/clipboard/w_211_.inc index edcd70401d3b..31d54bdcc6cc 100755 --- a/testautomation/writer/optional/includes/clipboard/w_211_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_211_.inc @@ -281,7 +281,7 @@ testcase WriterToCalcDrawingObject printlog " Jump to beginning of document " printlog " Select 'Drawing Object' " printlog " Copy selected Drawing Object " - if wSetClipboardtestDefaults("draw") = True then + if wSetClipboardtestDefaults("DRAW") = True then gApplication = "CALC" printlog " Open new document " Call hNewDocument @@ -300,7 +300,7 @@ testcase WriterToCalcDrawingObject printlog " Paste 'Table' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\writer_to_calc_draw.ods", "calc8") printlog " Save document as ..\user\work\writer_to_calc_draw.ods" diff --git a/testautomation/writer/optional/includes/clipboard/w_212_.inc b/testautomation/writer/optional/includes/clipboard/w_212_.inc index 3d8a6f0b9565..02b8d0fb1b94 100755 --- a/testautomation/writer/optional/includes/clipboard/w_212_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_212_.inc @@ -275,7 +275,7 @@ testcase WriterToImpressDrawingObject printlog " Jump to beginning of document " printlog " Select 'Drawing Object' " printlog " Copy selected Drawing Object " - if wSetClipboardtestDefaults("draw") = True then + if wSetClipboardtestDefaults("DRAW") = True then gApplication = "IMPRESS" printlog " Open new document " Call hNewDocument @@ -294,7 +294,7 @@ testcase WriterToImpressDrawingObject printlog " Paste 'Table' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\writer_to_impress_draw.odp", "impress8") printlog " Save document as ..\user\work\writer_to_impress_draw.odp" diff --git a/testautomation/writer/optional/includes/clipboard/w_213_.inc b/testautomation/writer/optional/includes/clipboard/w_213_.inc index b8aca51915e7..aebecc4291d0 100755 --- a/testautomation/writer/optional/includes/clipboard/w_213_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_213_.inc @@ -274,7 +274,7 @@ testcase WriterToDrawDrawingObject printlog " + Jump to beginning of document " printlog " + Select 'Drawing Object' " printlog " + Copy selected Drawing Object " - if wSetClipboardtestDefaults("draw") = True then + if wSetClipboardtestDefaults("DRAW") = True then gApplication = "DRAW" printlog " + Open new document " Call hNewDocument @@ -293,7 +293,7 @@ testcase WriterToDrawDrawingObject printlog " Paste 'Table' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\writer_to_draw_draw.odg", "draw8") printlog " + Save document as ..\user\work\writer_to_draw_draw.odg" diff --git a/testautomation/writer/optional/includes/clipboard/w_214_.inc b/testautomation/writer/optional/includes/clipboard/w_214_.inc index 63a699001312..f4ac014ddf5a 100755 --- a/testautomation/writer/optional/includes/clipboard/w_214_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_214_.inc @@ -59,7 +59,7 @@ testcase WriterToHTMLText printlog " + Select first paragraph " printlog " + Copy selected text " if wSetClipboardtestDefaults("text") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -112,7 +112,7 @@ testcase WriterToHTMLField printlog " + Select paragraph with 'Date Field' " printlog " + Copy selected text " if wSetClipboardtestDefaults("field") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -165,7 +165,7 @@ testcase WriterToHTMLTable printlog " + Select 'Table' " printlog " + Copy selected table " if wSetClipboardtestDefaults("table") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -218,7 +218,7 @@ testcase WriterToHTMLFrame printlog " + Select 'Frame' " printlog " + Copy selected frame " if wSetClipboardtestDefaults("frame") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -272,8 +272,8 @@ testcase WriterToHTMLDrawingObject printlog " + Jump to beginning of document " printlog " + Select 'Drawing Object' " printlog " + Copy selected Drawing Object " - if wSetClipboardtestDefaults("draw") = True then - gApplication = "HTMLDOKUMENT" + if wSetClipboardtestDefaults("DRAW") = True then + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -290,7 +290,7 @@ testcase WriterToHTMLDrawingObject printlog " Paste 'Table' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\writer_to_html_draw.html", "HTML") printlog " + Save document as ..\user\work\writer_to_html_draw.html" @@ -326,7 +326,7 @@ testcase WriterToHTMLGraphicLinked printlog " + Select 'Linked Graphic' " printlog " + Copy selected Linked Graphic " if wSetClipboardtestDefaults("graphicL") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -379,7 +379,7 @@ testcase WriterToHTMLGraphicEmbedded printlog " + Select 'Embedded Graphic' " printlog " + Copy selected Embedded Graphic " if wSetClipboardtestDefaults("graphicE") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -432,7 +432,7 @@ testcase WriterToHTMLOLEObject printlog " + Select 'OLE Object' " printlog " + Copy selected OLE Object " if wSetClipboardtestDefaults("ole") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " @@ -485,7 +485,7 @@ testcase WriterToHTMLControl printlog " + Select 'Control' " printlog " + Copy selected Control " if wSetClipboardtestDefaults("control") = True then - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " + Open new document " Call hNewDocument printlog " + Edit / Paste Special " diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc index 8a52e75edfaa..526a627d35bc 100755 --- a/testautomation/writer/optional/includes/clipboard/w_216_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc @@ -51,7 +51,7 @@ end sub testcase HTMLToWRITERText - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select first paragraph " @@ -118,7 +118,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToWRITERField - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " @@ -183,7 +183,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToWRITERTable - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Table' " @@ -248,7 +248,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToWRITERGraphicLinked - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " @@ -302,7 +302,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToWRITERControl - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Control' " @@ -357,7 +357,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToWRITERFloatingFrame - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " diff --git a/testautomation/writer/optional/includes/clipboard/w_217_.inc b/testautomation/writer/optional/includes/clipboard/w_217_.inc index a5449b1109f2..620823dd05c4 100755 --- a/testautomation/writer/optional/includes/clipboard/w_217_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_217_.inc @@ -50,7 +50,7 @@ end sub ' --------------------------------------------------------------------------------- testcase HTMLToCALCText - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select first paragraph " @@ -116,7 +116,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToCALCField - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " @@ -173,7 +173,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToCALCTable - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Table' " @@ -227,7 +227,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToCALCGraphicLinked - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " @@ -283,7 +283,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToCALCControl - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Control' " @@ -340,7 +340,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToCALCFloatingFrame - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " diff --git a/testautomation/writer/optional/includes/clipboard/w_218_.inc b/testautomation/writer/optional/includes/clipboard/w_218_.inc index 9ef5d241924b..56d9a6c7f707 100755 --- a/testautomation/writer/optional/includes/clipboard/w_218_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_218_.inc @@ -50,7 +50,7 @@ end sub ' --------------------------------------------------------------------------------- testcase HTMLToDRAWText - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select first paragraph " @@ -116,7 +116,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToDRAWField - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select paragraph with 'Date Field' " @@ -178,7 +178,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToDRAWTable - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select 'Table' " @@ -235,7 +235,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToDRAWGraphicLinked - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select 'Linked Graphic' " @@ -291,7 +291,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToDRAWControl - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select 'Control' " @@ -348,7 +348,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToDRAWFloatingFrame - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " + Jump to beginning of document " printlog " + Select 'Floating Frame' " diff --git a/testautomation/writer/optional/includes/clipboard/w_219_.inc b/testautomation/writer/optional/includes/clipboard/w_219_.inc index 0028afb5d982..7c1108367f3c 100755 --- a/testautomation/writer/optional/includes/clipboard/w_219_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_219_.inc @@ -50,7 +50,7 @@ end sub ' --------------------------------------------------------------------------------- testcase HTMLToIMPRESSText - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select first paragraph " @@ -116,7 +116,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToIMPRESSField - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " @@ -173,7 +173,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToIMPRESSTable - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Table' " @@ -230,7 +230,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToIMPRESSGraphicLinked - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " @@ -286,7 +286,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToIMPRESSControl - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Control' " @@ -343,7 +343,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToIMPRESSFloatingFrame - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " diff --git a/testautomation/writer/optional/includes/clipboard/w_220_.inc b/testautomation/writer/optional/includes/clipboard/w_220_.inc index 7b54865dd887..d86b289aaac4 100755 --- a/testautomation/writer/optional/includes/clipboard/w_220_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_220_.inc @@ -55,7 +55,7 @@ testcase HTMLToHTMLText ' QAErrorlog "#125780#Stacktrace ID: 251397" ' goto endsub ' end if - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select first paragraph " @@ -67,7 +67,7 @@ testcase HTMLToHTMLText Call wTypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " @@ -111,7 +111,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToHTMLField - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " @@ -124,7 +124,7 @@ testcase HTMLToHTMLField Call wTypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " @@ -168,7 +168,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToHTMLTable - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Table' " @@ -181,7 +181,7 @@ testcase HTMLToHTMLTable Call wTypeKeys "",2 EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " @@ -225,7 +225,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToHTMLGraphicLinked - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " @@ -237,7 +237,7 @@ testcase HTMLToHTMLGraphicLinked Call wTypeKeys ( "" ) EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " @@ -281,7 +281,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToHTMLControl - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Control' " @@ -294,7 +294,7 @@ testcase HTMLToHTMLControl Call wTypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " @@ -338,7 +338,7 @@ endcase ' ---------------------------------------------------------------------------------------------- testcase HTMLToHTMLFloatingFrame - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " @@ -356,7 +356,7 @@ testcase HTMLToHTMLFloatingFrame Call hCloseDocument goto endsub endcatch - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document " Call hNewDocument printlog " Edit / Paste Special " diff --git a/testautomation/writer/optional/includes/clipboard/w_221_.inc b/testautomation/writer/optional/includes/clipboard/w_221_.inc index 83adff258fb0..1d4813ec6c50 100755 --- a/testautomation/writer/optional/includes/clipboard/w_221_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_221_.inc @@ -65,7 +65,7 @@ testcase DrawToHTMLScrollingText printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -81,7 +81,7 @@ testcase DrawToHTMLScrollingText printlog " Paste 'Scrolling Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_scrolling_text.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_scrolling_text.html" @@ -123,7 +123,7 @@ testcase DrawToHTMLGroupedObject printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",2 EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -139,7 +139,7 @@ testcase DrawToHTMLGroupedObject printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_grouped_object.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_grouped_object.html" @@ -181,7 +181,7 @@ testcase DrawToHTML3D printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",3 EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -197,7 +197,7 @@ testcase DrawToHTML3D printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_3d.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_3d.html" @@ -239,7 +239,7 @@ testcase DrawToHTMLFontwork printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",4 EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -255,7 +255,7 @@ testcase DrawToHTMLFontwork printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_fontwork.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_fontwork.html" @@ -297,7 +297,7 @@ testcase DrawToHTMLBullets printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",5 EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -313,7 +313,7 @@ testcase DrawToHTMLBullets printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_bullets.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_bullets.html" @@ -356,7 +356,7 @@ testcase DrawToHTMLDimensionLines DocumentDraw.TypeKeys "" DocumentDraw.TypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -372,7 +372,7 @@ testcase DrawToHTMLDimensionLines printlog " Paste 'Dimension Lines' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_dim_lines.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_dim_lines.html" @@ -415,7 +415,7 @@ testcase DrawToHTMLConnectors DocumentDraw.TypeKeys "" DocumentDraw.TypeKeys "" EditCopy - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open a new writerdocument " Call hNewDocument Sleep 2 @@ -431,7 +431,7 @@ testcase DrawToHTMLConnectors printlog " Paste 'Connectors' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " + Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_html_connectors.html", "HTML") printlog " + Save document as ..\user\work\draw_to_html_connectors.html" diff --git a/testautomation/writer/optional/includes/clipboard/w_222_.inc b/testautomation/writer/optional/includes/clipboard/w_222_.inc index f453ce28a43f..49f8d3d6ba4f 100755 --- a/testautomation/writer/optional/includes/clipboard/w_222_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_222_.inc @@ -81,7 +81,7 @@ testcase DrawToWriterScrollingText printlog " Paste 'Scrolling Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_scrolling_text.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_scrolling_text.odt" @@ -139,7 +139,7 @@ testcase DrawToWriterGroupedObject printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_grouped_object.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_grouped_object.odt" @@ -197,7 +197,7 @@ testcase DrawToWriter3D printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_3d.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_3d.odt" @@ -255,7 +255,7 @@ testcase DrawToWriterFontwork printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_fontwork.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_fontwork.odt" @@ -313,7 +313,7 @@ testcase DrawToWriterBullets printlog " Paste 'Text' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_bullets.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_bullets.odt" @@ -372,7 +372,7 @@ testcase DrawToWriterDimensionLines printlog " Paste 'Dimension Lines' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_dim_lines.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_dim_lines.odt" @@ -431,7 +431,7 @@ testcase DrawToWriterConnectors printlog " Paste 'Connectors' in all available clipboard formats " Kontext "InhaltEinfuegen" if InhaltEinfuegen.Exists then - Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"draw") + Call wPasteAvailableClipboardFormats(Auswahl.GetItemCount,"DRAW") printlog " Write Clipboard format under pasted content " Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\draw_to_writer_connectors.odt", "writer8") printlog " Save document as ..\user\work\draw_to_writer_connectors.odt" diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc index fe91ac45a39a..af44b1e02e71 100755 --- a/testautomation/writer/optional/includes/fields/w_fields6.inc +++ b/testautomation/writer/optional/includes/fields/w_fields6.inc @@ -164,7 +164,7 @@ testcase tFunctions_2 '/// Tools/Options / StarOffice writer / Formatting Aids '/// Uncheck 'Fields : Hidden text" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","FORMATTINGAIDS") + Call hToolsOptions("WRITER","FORMATTINGAIDS") bHiddenText = FeldVersteckterText.IsChecked if bHiddenText = TRUE then FeldVersteckterText.UnCheck @@ -206,7 +206,7 @@ testcase tFunctions_2 'Recover to default ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","FORMATTINGAIDS") + Call hToolsOptions("WRITER","FORMATTINGAIDS") if bHiddenText = TRUE then FeldVersteckterText.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -248,7 +248,7 @@ testcase tFunctions_3 '/// Tools/Options / StarOffice writer / Formatting Aids '/// Uncheck 'Fields : Hidden paragraph" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","FORMATTINGAIDS") + Call hToolsOptions("WRITER","FORMATTINGAIDS") bHiddenText = VersteckteAbsatze.IsChecked if bHiddenText = TRUE then VersteckteAbsatze.UnCheck @@ -293,7 +293,7 @@ testcase tFunctions_3 'Recover to default ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","FORMATTINGAIDS") + Call hToolsOptions("WRITER","FORMATTINGAIDS") if bHiddenText = TRUE then VersteckteAbsatze.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/writer/optional/includes/filter/w_filter.inc b/testautomation/writer/optional/includes/filter/w_filter.inc index c048a8554f4b..a2c95b1e8cc4 100755 --- a/testautomation/writer/optional/includes/filter/w_filter.inc +++ b/testautomation/writer/optional/includes/filter/w_filter.inc @@ -267,7 +267,7 @@ testcase tCollectSaveAsFilter case 2: gApplication = "CALC" case 3: gApplication = "IMPRESS" case 4: gApplication = "DRAW" - case 5: gApplication = "GLOBALDOC" + case 5: gApplication = "MASTERDOCUMENT" case 6: gApplication = "MATH" case 7: gApplication = "HTML" end select @@ -330,7 +330,7 @@ testcase tCollectExportFilters case 2: gApplication = "CALC" case 3: gApplication = "IMPRESS" case 4: gApplication = "DRAW" - case 5: gApplication = "GLOBALDOC" + case 5: gApplication = "MASTERDOCUMENT" case 6: gApplication = "MATH" case 7: gApplication = "HTML" end select diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index 8370846338bc..d2f2882986d7 100755 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -1166,7 +1166,7 @@ testcase tParagraphIndent17 Call sMakeReadOnlyDocumentEditable ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" Sleep 2 Options.TypeKeys "" @@ -1188,7 +1188,7 @@ testcase tParagraphIndent17 Call sMakeReadOnlyDocumentEditable ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" Sleep 2 Options.TypeKeys "" diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index 12535b200847..6175f1ed260a 100755 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -512,7 +512,7 @@ testcase tToolsOptionsHTMLTable1 printlog ("'///- Tools/Options/Text document: Table ///") ToolsOptions - Call hToolsOptions ("Textdocument","Table") + Call hToolsOptions ("WRITER","Table") VerhaltenFix.Check Kontext "ExtrasOptionenDlg" diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc index 0a671b404a7b..d9b7c7374879 100755 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -65,7 +65,7 @@ testcase tToolsOptionsWriterView1 '///- Tools/Options/Writer: View ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) option_value(1) = Hilfslinien.IsChecked option_value(2) = FarbigeHandles.IsChecked @@ -127,7 +127,7 @@ testcase tToolsOptionsWriterView1 '///- Tools/Options/Writer: View '/// - checking states ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) if ( option_value(1) = Hilfslinien.IsChecked ) then WarnLog "Hilfslinien state changed" if ( option_value(2) = FarbigeHandles.IsChecked ) then WarnLog "FarbigeHandles state changed" if ( option_value(3) = GrosseHandles.IsChecked ) then WarnLog "GrosseHandles state changed" @@ -171,7 +171,7 @@ testcase tToolsOptionsWriterView2 '///- Tools/Options/Writer: View ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) '/// remember settings option_value(1) = Hilfslinien.IsChecked @@ -223,7 +223,7 @@ testcase tToolsOptionsWriterView2 '///- Tools/Options/Writer: View '/// - checking states ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) if Hilfslinien.IsChecked = true then WarnLog "Hilfslinien x" if FarbigeHandles.IsChecked = true then WarnLog "FarbigeHandles x" if GrosseHandles.IsChecked = true then WarnLog "GrosseHandles x" @@ -265,7 +265,7 @@ testcase tToolsOptionsWriterView3 '///- Tools/Options/Writer: View ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) '/// remember all settings option_value(1) = Hilfslinien.IsChecked @@ -308,7 +308,7 @@ testcase tToolsOptionsWriterView3 Call wOfficeRestart '///- Tools/Options/Writer: View ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) '/// - check if all checked if Hilfslinien.IsChecked = false then WarnLog "Hilfslinien o" @@ -346,7 +346,7 @@ testcase tToolsOptionsWriterView4 '///- Tools/Options/Writer: View ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) '/// remember all values printlog "- remember all values" @@ -394,7 +394,7 @@ testcase tToolsOptionsWriterView4 ' see everything ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) '///' Hilfslinien.Check only, when graphic's in motion! ///' printlog "- check values" @@ -404,7 +404,7 @@ testcase tToolsOptionsWriterView4 ExtrasOptionenDlg.Ok ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) printlog "- uncheck values" FarbigeHandles.UnCheck GrosseHandles.UnCheck @@ -433,7 +433,7 @@ testcase tToolsOptionsWriterView5 printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","VIEW") + Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked option_value(2) = Tabellen.IsChecked @@ -458,7 +458,7 @@ testcase tToolsOptionsWriterView5 printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "GrafikenUndObjekte state changed" if ( option_value(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" @@ -490,7 +490,7 @@ testcase tToolsOptionsWriterView6 printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","VIEW") + Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked option_value(2) = Tabellen.IsChecked @@ -515,7 +515,7 @@ testcase tToolsOptionsWriterView6 printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "VIEW" ) + Call hToolsOptions ( "WRITER" , "VIEW" ) if GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte x" if Tabellen.IsChecked then WarnLog "Tabellen x" @@ -547,7 +547,7 @@ testcase tToolsOptionsWriterView7 printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","VIEW") + Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked option_value(2) = Tabellen.IsChecked @@ -572,7 +572,7 @@ testcase tToolsOptionsWriterView7 printlog ("'/// - check if all Checked ///") ToolsOptions - hToolsOptions ( "TextDocument" , "VIEW" ) + hToolsOptions ( "WRITER" , "VIEW" ) if true <> GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte o" if true <> Tabellen.IsChecked then WarnLog "Tabellen." @@ -607,7 +607,7 @@ testcase tToolsOptionsWriterGrid1 '/// remember values ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) printlog "- remember values" option_value(1) = FangrasterBenutzen.IsChecked option_value(2) = RasterSichtbar.IsChecked @@ -653,7 +653,7 @@ testcase tToolsOptionsWriterGrid1 '/// - checking states printlog "- checking states" ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) if (option_value(1) = FangrasterBenutzen.IsChecked ) then WarnLog "FangrasterBenutzen state changed BugID: 82944 " if (option_value(2) = RasterSichtbar.IsChecked ) then WarnLog "RasterSichtbar state changed" @@ -686,7 +686,7 @@ testcase tToolsOptionsWriterGrid2 Call hNewDocument '/// Tools/Options/Writer: Grid ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) '/// remember values set option_value(1) = FangrasterBenutzen.IsChecked @@ -737,7 +737,7 @@ testcase tToolsOptionsWriterGrid2 printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) if FangrasterBenutzen.IsChecked then WarnLog "FangrasterBenutzen x" if RasterSichtbar.IsChecked then WarnLog "RasterSichtbar x" @@ -773,7 +773,7 @@ testcase tToolsOptionsWriterGrid3 '/// remember values ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) option_value(1) = FangrasterBenutzen.IsChecked option_value(2) = RasterSichtbar.IsChecked option_value(3) = AchsenSynchronisieren.IsChecked @@ -809,7 +809,7 @@ testcase tToolsOptionsWriterGrid3 printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) if FangrasterBenutzen.IsChecked = false then WarnLog "FangrasterBenutzen o" if RasterSichtbar.IsChecked = false then WarnLog "RasterSichtbar o" @@ -846,7 +846,7 @@ testcase tToolsOptionsWriterGrid4 printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) printlog ("'///TabRaster all UnCheck ! ///") @@ -888,7 +888,7 @@ testcase tToolsOptionsWriterGrid4 ' change Grid Resolution ToolsOptions - Call hToolsOptions ( "TextDocument" , "GRID" ) + Call hToolsOptions ( "WRITER" , "GRID" ) AchsenSynchronisieren.Uncheck RasterAufloesungXAchse.SetText("2") RasterAufloesungYAchse.SetText("3") diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc index 1158de8d7f81..7edb8fedb463 100755 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -80,7 +80,7 @@ goto endsub Call hNewDocument ' Remember the init-font directly after installation ToolsOptions - Call hToolsOptions ("TextDocument",WestOrEast) + Call hToolsOptions ("WRITER",WestOrEast) Standard.Click sInitFont(1) = StandardSchrift.GetSelText sInitFont(2) = Ueberschrift.GetSelText @@ -114,7 +114,7 @@ goto endsub printlog ("/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument",WestOrEast) + Call hToolsOptions ("WRITER",WestOrEast) bCheckboxes(1) = AktuellesDokument.IsChecked iListBox(1) = StandardSchrift.GetSelIndex @@ -223,7 +223,7 @@ goto endsub printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if ( AktuellesDokument.IsChecked = TRUE ) then WarnLog "Current document only state changed" if ( StandardSchrift.GetSelIndex <> iTempListBox(1) ) then WarnLog "Default font state changed" @@ -285,7 +285,7 @@ goto endsub printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if AktuellesDokument.IsEnabled = true then AktuellesDokument.Check @@ -295,7 +295,7 @@ goto endsub ExtrasOptionenDlg.Cancel sleep 2 ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) AktuellesDokument.Check end if @@ -317,7 +317,7 @@ goto endsub printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if ( AktuellesDokument.IsChecked <> True ) then WarnLog "Current document only is not checked anymore" if ( StandardSchrift.GetSelIndex <> 1 ) then WarnLog "Default font is not item 1" @@ -355,7 +355,7 @@ goto endsub printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if not AktuellesDokument.IsChecked then WarnLog "AktuellesDokument o" if ( StandardSchrift.GetSelIndex <> StandardSchrift.GetItemCount ) then WarnLog "Default font is not item (GetItemCount):"+StandardSchrift.GetSelIndex @@ -391,7 +391,7 @@ goto endsub '/// Open a new docuent and check fonts for default Call hNewDocument ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if ( StandardSchrift.GetSelText <> sInitFont(1) ) then warnlog "Default not init font!" if ( Ueberschrift.GetSelText <> sInitFont(2) ) then warnlog "Heading not init font! BUGID: 89816" @@ -410,7 +410,7 @@ goto endsub printlog ("'/// - restore states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , WestOrEast ) + Call hToolsOptions ( "WRITER" , WestOrEast ) if ( bCheckboxes(1) = TRUE ) then AktuellesDokument.Check else AktuellesDokument.UnCheck StandardSchrift.SetText (sListBox(1)) @@ -474,7 +474,7 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","PRINT") + Call hToolsOptions ("WRITER","PRINT") bCheckboxes(1) = Grafiken.IsChecked bCheckboxes(2) = Tabellen.IsChecked @@ -569,7 +569,7 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "PRINT" ) + Call hToolsOptions ( "WRITER" , "PRINT" ) if ( bCheckboxes(1) = Grafiken.IsChecked ) then WarnLog "Grafiken state changed" if ( bCheckboxes(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" @@ -600,7 +600,7 @@ testcase tToolsOptionsWriterPrint1 ' Notify is saved with document Call hFileOpen(gOfficepath + "user\work\printtest." & WriterFilterExtension(0) ) ToolsOptions - Call hToolsOptions ( "TextDocument" , "PRINT" ) + Call hToolsOptions ( "WRITER" , "PRINT" ) if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed (Not saved with document)" if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) then WarnLog "NurNotizen state changed (Not saved with document)" @@ -639,7 +639,7 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "PRINT" ) + Call hToolsOptions ( "WRITER" , "PRINT" ) if Grafiken.IsChecked then WarnLog "Grafiken x" if Tabellen.IsChecked then WarnLog "Tabellen x" @@ -695,7 +695,7 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "PRINT" ) + Call hToolsOptions ( "WRITER" , "PRINT" ) if not Grafiken.IsChecked then WarnLog "Grafiken o" if not Tabellen.IsChecked then WarnLog "Tabellen o" @@ -725,7 +725,7 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - restore states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "PRINT" ) + Call hToolsOptions ( "WRITER" , "PRINT" ) if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.UnCheck if ( bCheckboxes(2) = TRUE ) then Tabellen.Check else Tabellen.UnCheck @@ -787,7 +787,7 @@ testcase tToolsOptionsWriterTable printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") sMetricField(1) = VerschiebenZeile.GetText sMetricField(2) = VerschiebenSpalte.GetText @@ -829,7 +829,7 @@ testcase tToolsOptionsWriterTable printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if ( VerschiebenZeile.GetText <> sTempMetricField(1) ) then WarnLog "VerschiebenZeile state changed BugID: 82990 " if ( VerschiebenSpalte.GetText <> sTempMetricField(2) ) then WarnLog "VerschiebenSpalte state changed" @@ -846,7 +846,7 @@ testcase tToolsOptionsWriterTable printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) VerschiebenZeile.ToMin VerschiebenSpalte.ToMin @@ -883,7 +883,7 @@ testcase tToolsOptionsWriterTable printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if ( VerschiebenZeile.GetText <> sTempMetricField(1) ) then WarnLog "VerschiebenZeile is not min." if ( VerschiebenSpalte.GetText <> sTempMetricField(2) ) then WarnLog "VerschiebenSpalte is not min." @@ -929,7 +929,7 @@ testcase tToolsOptionsWriterTable printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if ( VerschiebenZeile.GetText <> sTempMetricField(1) ) then WarnLog "VerschiebenZeile is not max." if ( VerschiebenSpalte.GetText <> sTempMetricField(2) ) then WarnLog "VerschiebenSpalte is not max." diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc index 8ec48a7e55ef..03a08e640f84 100755 --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -73,7 +73,7 @@ testcase tToolsOptionsWriterCursor printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","FORMATTINGAIDS") + Call hToolsOptions ("WRITER","FORMATTINGAIDS") irgendwas(1) = DirektCursor.IsChecked irgendwas(2) = Zonen_Cursor.IsChecked @@ -123,7 +123,7 @@ testcase tToolsOptionsWriterCursor printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "FORMATTINGAIDS" ) + Call hToolsOptions ( "WRITER" , "FORMATTINGAIDS" ) if ( irgendwas(1) = DirektCursor.IsChecked ) then WarnLog "DirektCursor state changed BugID: 82955" if ( irgendwas(2) = Zonen_Cursor.IsChecked ) then WarnLog "Zonen_Cursor state changed" @@ -147,7 +147,7 @@ testcase tToolsOptionsWriterCursor printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "FORMATTINGAIDS" ) + Call hToolsOptions ( "WRITER" , "FORMATTINGAIDS" ) DirektCursor.UnCheck Zonen_Cursor.UnCheck @@ -172,7 +172,7 @@ testcase tToolsOptionsWriterCursor printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "FORMATTINGAIDS" ) + Call hToolsOptions ( "WRITER" , "FORMATTINGAIDS" ) if DirektCursor.IsChecked then WarnLog "DirektCursor x" if Zonen_Cursor.IsChecked then WarnLog "Zonen_Cursor x" @@ -216,7 +216,7 @@ testcase tToolsOptionsWriterCursor printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "FORMATTINGAIDS" ) + Call hToolsOptions ( "WRITER" , "FORMATTINGAIDS" ) if not DirektCursor.IsChecked then WarnLog "DirektCursor o" if not Zonen_Cursor.IsChecked then WarnLog "Zonen_Cursor o" @@ -281,7 +281,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","CHANGES") + Call hToolsOptions ("WRITER","CHANGES") iListBox2(1,1) = EinfuegenAttribute.GetSelIndex iListBox2(1,2) = EinfuegenFarbe.GetSelIndex @@ -332,7 +332,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - all states inverting ///") ToolsOptions - Call hToolsOptions ("TextDocument","CHANGES") + Call hToolsOptions ("WRITER","CHANGES") if ( EinfuegenAttribute.GetItemCount <> iListBox2(1,1) ) then EinfuegenAttribute.Select (iListBox2(1,1)+1) Else EinfuegenAttribute.Select(iListBox2(1,1)-1) if ( EinfuegenFarbe.GetItemCount <> iListBox2(1,2) ) then EinfuegenFarbe.Select (EinfuegenFarbe.GetItemCount ) Else EinfuegenFarbe.Select (1) @@ -360,7 +360,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) if ( EinfuegenAttribute.GetSelIndex <> iTempListBox2(1,1) ) then WarnLog "EinfuegenAttribute state changed; is: "+EinfuegenAttribute.GetSelIndex +"; should: "+ iTempListBox2(1,1) if ( EinfuegenFarbe.GetSelIndex <> iTempListBox2(1,2) ) then WarnLog "EinfuegenFarbe state changed" @@ -376,7 +376,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) EinfuegenAttribute.Select(1) EinfuegenFarbe.Select (1) @@ -393,7 +393,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) if (EinfuegenAttribute.GetSelIndex <> 1 ) then WarnLog "EinfuegenAttribute is not item 1" if (EinfuegenFarbe.GetSelIndex <> 1 ) then WarnLog "EinfuegenFarbe is not item 1" @@ -420,7 +420,7 @@ testcase tToolsOptionsWriterChanges printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) if (EinfuegenAttribute.GetSelIndex <> EinfuegenAttribute.GetItemCount ) then WarnLog "EinfuegenAttribute is not item (GetItemCount)" if (EinfuegenFarbe.GetSelIndex <> EinfuegenFarbe.GetItemCount ) then WarnLog "EinfuegenFarbe is not item (GetItemCount)" @@ -448,7 +448,7 @@ testcase tToolsOptionsWriterChanges DocumentWriter.TypeKeys "" ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) EinfuegenAttribute.Select (2) 'bold EinfuegenFarbe.Select (8) 'mangenta LoeschenAttribute.Select (4) 'strikethrough @@ -496,7 +496,7 @@ testcase tToolsOptionsWriterChanges '-------------------------------------------------------------------------- printlog ("'/// - restore states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "CHANGES" ) + Call hToolsOptions ( "WRITER" , "CHANGES" ) try EinfuegenAttribute.Select (iListBox2(1,1)) @@ -575,7 +575,7 @@ goto endsub printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") irgendwas(2) = Ueberschrift.IsChecked irgendwas(3) = Wiederholen.IsChecked @@ -605,7 +605,7 @@ goto endsub printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if ( Ueberschrift.IsChecked = False ) then WarnLog "Ueberschrift state changed" if ( irgendwas(3) = Wiederholen.IsChecked ) then WarnLog "Wiederholen state changed" @@ -621,7 +621,7 @@ goto endsub printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) Ueberschrift.UnCheck NichtTrennen.UnCheck @@ -658,7 +658,7 @@ goto endsub printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if Ueberschrift.IsChecked then WarnLog "Ueberschrift x" if NichtTrennen.IsChecked then WarnLog "NichtTrennen x" @@ -710,7 +710,7 @@ goto endsub printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "Table" ) + Call hToolsOptions ( "WRITER" , "Table" ) if ( Ueberschrift.IsChecked = FALSE ) then WarnLog "Ueberschrift o" if ( Wiederholen.IsChecked = FALSE ) then WarnLog "Wiederholen o" @@ -747,7 +747,7 @@ goto endsub Call hNewDocument ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","AutoCaption") + Call hToolsOptions("WRITER","AutoCaption") Kontext "TabAutocaption" Select Case iSprache case 36 : SplitString = "-" @@ -866,7 +866,7 @@ goto endsub Massstab.OK ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","AutoCaption") + Call hToolsOptions("WRITER","AutoCaption") Kontext "TabAutocaption" for i=1 to ObjectList.GetItemCount ObjectList.Select i @@ -891,7 +891,7 @@ testcase tToolsOptionsWriterCompatibility1 printlog " Test of option 'Use StarOffice 6.0/7 tabstop formatting'" Call hNewDocument ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") printlog " Check defaults of checkboxes. if default is wrong then set to default" Kontext "TabCompatibility" For i = 1 to Options.GetItemCount @@ -929,7 +929,7 @@ testcase tToolsOptionsWriterCompatibility1 Printlog "check state of all checkboxes and uncheck all checkboxes" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" For i = 1 to Options.GetItemCount Options.Select i @@ -954,7 +954,7 @@ testcase tToolsOptionsWriterCompatibility1 printlog "check state of all checkboxes and set defaults" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" For i = 1 to Options.GetItemCount Options.Select i @@ -1029,7 +1029,7 @@ testcase tToolsOptionsWriterCompatibility2 if DefaultFailed = false then printlog " in Tools->Options->StarOffice Writer->Compatitibility check option 'Use StarOffice 6.0/7 tabstop formatting'" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") printlog " Check defaults of checkboxes. if default is wrong then set to default" Kontext "TabCompatibility" Options.Select 4 @@ -1063,7 +1063,7 @@ testcase tToolsOptionsWriterCompatibility2 printlog "in Tools->Options->StarOffice Writer->Compatitibility uncheck option 'Use StarOffice 6.0/7 tabstop formatting'" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") printlog "Check defaults of checkboxes. if default is wrong then set to default" Kontext "TabCompatibility" Options.Select 4 @@ -1097,7 +1097,7 @@ DIM sFoundWord AS string 'variable for word found one line below printlog "Checking Options settings" printlog "Tools-Options-OOo Writer-Compatibility" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" printlog "Verify that the entry 'Expand word space on lines with manual line breaks in justified paragraphs' is checked by default" @@ -1167,7 +1167,7 @@ DIM sFoundWord AS string 'variable for word found one line below Kontext "ExtrasOptionenDLG" printlog "Uncheck the entry 'Expand word space [...]'" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" iOptionsCount = Options.GetItemCount Options.Select iOptionsCount @@ -1221,7 +1221,7 @@ DIM sFoundWord AS string 'variable for word found one line below printlog "Tools-Options-OOo Writer-Compatibility" ToolsOptions Kontext "ExtrasOptionenDLG" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" printlog "Verify that the entry 'Expand word space [...]' is checked" @@ -1243,7 +1243,7 @@ DIM sFoundWord AS string 'variable for word found one line below printlog "Tools-Options-OOo Writer-Compatibility" ToolsOptions Kontext "ExtrasOptionenDLG" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" printlog "Verify that the entry 'Expand word space [...]' is unchecked" @@ -1328,7 +1328,7 @@ DIM sFoundWord AS string 'variable for word found one line below printlog " Tools-Options-OOo Writer-Compatibility" ToolsOptions 'calling options Kontext "ExtrasOptionenDLG" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" printlog " Check the entry 'Expand word space [...]" @@ -1366,7 +1366,7 @@ DIM sFoundWord AS string 'variable for word found one line below printlog " Tools-Options-OOo Writer-Compatibility" ToolsOptions 'calling options Kontext "ExtrasOptionenDLG" - Call hToolsOptions("TEXTDOCUMENT","COMPATIBILITY") + Call hToolsOptions("WRITER","COMPATIBILITY") Kontext "TabCompatibility" printlog " Verify that the entry 'Expand word space [...]' is checked" diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index 776a87c67d28..6d66e5b6be63 100755 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -82,7 +82,7 @@ testcase tToolsOptionsWriterOther printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","GENERAL") + Call hToolsOptions ("WRITER","GENERAL") irgendwas(2) = Feldbefehle.IsChecked irgendwas(3) = Diagramme.IsChecked @@ -130,7 +130,7 @@ testcase tToolsOptionsWriterOther printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GENERAL" ) + Call hToolsOptions ( "WRITER" , "GENERAL" ) if ( irgendwas(2) = Feldbefehle.IsChecked ) Then WarnLog "Feldbefehle state changed" if Feldbefehle.IsChecked Then if ( irgendwas(3) = Diagramme.IsChecked ) Then WarnLog "Diagramme state changed" @@ -146,7 +146,7 @@ testcase tToolsOptionsWriterOther printlog ("'/// - all UnCheck -> o ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GENERAL" ) + Call hToolsOptions ( "WRITER" , "GENERAL" ) Feldbefehle.UnCheck @@ -169,7 +169,7 @@ testcase tToolsOptionsWriterOther printlog ("'/// - check if all UnChecked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GENERAL" ) + Call hToolsOptions ( "WRITER" , "GENERAL" ) if Feldbefehle.IsChecked Then WarnLog "Feldbefehle x" @@ -191,7 +191,7 @@ testcase tToolsOptionsWriterOther ' set Default Tab Stop to 2,5cm ToolsOptions - Call hToolsOptions ("TextDocument","GENERAL") + Call hToolsOptions ("WRITER","GENERAL") Masseinheit.Select (2) ' cm ' printlog "before " + Tabulatorenabstand.GetText Tabulatorenabstand.SetText ("2" + GetDecimalSeperator(Tabulatorenabstand.GetText) + "50" + mUnit) @@ -212,7 +212,7 @@ testcase tToolsOptionsWriterOther Call hNewDocument ' set Default Tab Stop to 2,9cm ToolsOptions - Call hToolsOptions ("TextDocument","GENERAL") + Call hToolsOptions ("WRITER","GENERAL") Masseinheit.Select (2) ' cm ' printlog "before " + Tabulatorenabstand.GetText Tabulatorenabstand.SetText ( "2" + GetDecimalSeperator(Tabulatorenabstand.GetText) + "90" + mUnit ) @@ -227,7 +227,7 @@ testcase tToolsOptionsWriterOther sleep (2) ' check TabStops, have to be the ones this file was saved with ToolsOptions - Call hToolsOptions ("TextDocument","GENERAL") + Call hToolsOptions ("WRITER","GENERAL") Masseinheit.Select (2) ' cm ' printlog "before " + Tabulatorenabstand.GetText if Tabulatorenabstand.GetText <> ("2" + GetDecimalSeperator(Tabulatorenabstand.GetText) + "50" + mUnit) Then @@ -243,7 +243,7 @@ testcase tToolsOptionsWriterOther Printlog ("'/// - all Check -> x ///") ToolsOptions - Call hToolsOptions ("TextDocument","GENERAL") + Call hToolsOptions ("WRITER","GENERAL") ' NurFuerAktuellesDokument.Check Feldbefehle.Check @@ -266,7 +266,7 @@ testcase tToolsOptionsWriterOther printlog ("'/// - check if all Checked ///") ToolsOptions - Call hToolsOptions ( "TextDocument" , "GENERAL" ) + Call hToolsOptions ( "WRITER" , "GENERAL" ) ' if not NurFuerAktuellesDokument.IsChecked Then WarnLog "NurFuerAktuellesDokument o" if not Feldbefehle.IsChecked Then WarnLog "Feldbefehle o" @@ -333,7 +333,7 @@ sub hGetAllOptionsWriterGeneralCaption Call hNewDocument ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for x=1 to ObjectList.GetItemCount @@ -357,7 +357,7 @@ sub hGetAllOptionsWriterGeneralCaption Printlog "'///(2/3) Select every ListItem & exit with OK ///" ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for x=1 to ObjectList.GetItemCount @@ -385,7 +385,7 @@ sub hGetAllOptionsWriterGeneralCaption ' put them in lsHoleTabPage2 and write them to 'user\work\opt2_...' ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for x=1 to ObjectList.GetItemCount ' Printlog x @@ -433,7 +433,7 @@ testcase tToolsOptionsWriterAutoCaption printlog ("'/// - save states ///") ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" NumberOfObjects = ObjectList.GetItemCount @@ -473,7 +473,7 @@ testcase tToolsOptionsWriterAutoCaption printlog ("'/// - verify if all unchecked and check all ///") ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects ObjectList.Select (i) @@ -488,7 +488,7 @@ testcase tToolsOptionsWriterAutoCaption printlog ("'/// - verify all checkboxes are checked ///") ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects ObjectList.Select (i) @@ -562,7 +562,7 @@ testcase tToolsOptionsWriterAutoCaption printlog ("'/// - checking states ///") ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects printlog "- checking: " & ObjectList.Gettext @@ -713,7 +713,7 @@ testcase tToolsOptionsWriterAutoCaption printlog ("'/// - restore states ///") ToolsOptions - Call hToolsOptions ("TextDocument","AutoCaption") + Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects @@ -766,7 +766,7 @@ testcase tToolsOptionsWriterGeneral Call hNewDocument printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") printlog "'///- Update links when loading -> always ///" Immer.Check Kontext "ExtrasOptionenDlg" @@ -793,7 +793,7 @@ testcase tToolsOptionsWriterGeneral Sleep 2 ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") if not Immer.IsChecked then Warnlog "Option 'always' has not been changed" printlog "'///- Update links when loading -> On request ///" AufNachfrage.Check @@ -817,7 +817,7 @@ testcase tToolsOptionsWriterGeneral Sleep 2 ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") if not AufNachfrage.IsChecked then Warnlog "Option 'On request' has been changed" printlog "'///- Update links when loading -> Never ///" Nie.Check @@ -856,7 +856,7 @@ testcase tToolsOptionsWriterGeneral Sleep 2 ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") if Nie.IsChecked = false then Warnlog "Option 'Never' is not checked" AufNachfrage.Check Kontext "ExtrasOptionenDlg" @@ -875,7 +875,7 @@ testcase tToolsOptionsWriterMailMerge Kontext "Navigator" if Navigator.Exists then ViewNavigator ToolsOptions - Call hToolsOptions ("TextDocument","MailMergeEMail") + Call hToolsOptions ("WRITER","MailMergeEMail") '/// Fill out all fields printlog " - fill out Mail Settings" @@ -931,7 +931,7 @@ testcase tToolsOptionsWriterMailMerge '/// Reopen Tools/Options and check settings printlog " - check settings" ToolsOptions - Call hToolsOptions ("TextDocument","MailMergeEMail") + Call hToolsOptions ("WRITER","MailMergeEMail") Kontext "TabMailMergeEmail" if YourName.Gettext <> "Helge Delfs" then Warnlog "'Your Name' has been changed after a restart" diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc index 593454cfa063..b1aaed276e55 100755 --- a/testautomation/writer/optional/includes/option/wr_o_a.inc +++ b/testautomation/writer/optional/includes/option/wr_o_a.inc @@ -56,7 +56,7 @@ testcase tToolsOptionsWriterPrint Printlog " - check all (real print)" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","PRINT") + Call hToolsOptions("WRITER","PRINT") Grafiken.Check Tabellen.Check @@ -92,7 +92,7 @@ testcase tToolsOptionsWriterPrint end if ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","PRINT") + Call hToolsOptions("WRITER","PRINT") Printlog " - uncheck everything" @@ -158,7 +158,7 @@ testcase tToolsOptionsWriterTableMove '/// New writerdocument Call hNewDocument ToolsOptions ' Measurement unit should be set to cm - Call hToolsOptions("TEXTDOCUMENT","GENERAL") + Call hToolsOptions("WRITER","GENERAL") '/// Set measurement unit to cm in options Masseinheit.Select 2 sSeparator = GetDecimalSeperator ( Tabulatorenabstand.GetText ) @@ -167,7 +167,7 @@ testcase tToolsOptionsWriterTableMove printlog "'///- Tools / Options / Table: Move" '/// Tools / Options / Table ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","TABLE") + Call hToolsOptions("WRITER","TABLE") Printlog "'/// - check minimum settings" '/// check minimum settings @@ -345,7 +345,7 @@ testcase tToolsOptionsWriterTableInsert printlog "- Tools / Options / Table" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","TABLE") + Call hToolsOptions("WRITER","TABLE") Printlog "- make settings" sSeparator = GetDecimalSeperator(EinfuegenZeile.GetText) @@ -445,7 +445,7 @@ testcase tToolsOptionsWriterTableEffects printlog "- Tools / Options / Table" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","TABLE") + Call hToolsOptions("WRITER","TABLE") VerschubZeile = ZahlAusSpinnfield ( VerschiebenZeile.GetText ) VerhaltenFix.Check Kontext "ExtrasOptionenDlg" @@ -524,7 +524,7 @@ testcase tToolsOptionsWriterTableEffects printlog "- Fixed, proportional: Changes affect the entire table" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","TABLE" + Call hToolsOptions("WRITER","TABLE" FixProportional.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -617,7 +617,7 @@ testcase tToolsOptionsWriterTableEffects2 Spalte1 = SpaltenBreiteHolen ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","TABLE") + Call hToolsOptions("WRITER","TABLE") VerschubZeile = ZahlAusSpinnfield ( VerschiebenZeile.GetText ) if NOT Variabel.IsChecked then Warnlog "Variable is not checked so test will be interrupted here" @@ -661,7 +661,7 @@ testcase tToolsOptionsWriterDirectCursor2 Printlog "- set left paragraph margin" ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","FORMATTINGAIDS") + Call hToolsOptions("WRITER","FORMATTINGAIDS") DirektCursor.Check LinkerAbsatzrand.Check Kontext "ExtrasOptionenDlg" diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc index 2fc547e508ab..5f7da613fa1a 100755 --- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc @@ -84,7 +84,7 @@ testcase tRedlining_1 '/// Tools / Options / Textdocument / Changes ToolsOptions - Call hToolsOptions("TEXTDOCUMENT","CHANGES") + Call hToolsOptions("WRITER","CHANGES") '/// Check default settings diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index 8646edf18a00..feb959bd5870 100755 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -273,7 +273,7 @@ testcase i75027 Dim sClipBrd() as string Dim bNumberingError as boolean - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" '/// New HTML Document Call hNewDocument '/// type 'This
      is
      a numbering
      test' diff --git a/testautomation/writer/optional/includes/section/w_section_tools.inc b/testautomation/writer/optional/includes/section/w_section_tools.inc index 11b0b818884e..dcf2df32c469 100755 --- a/testautomation/writer/optional/includes/section/w_section_tools.inc +++ b/testautomation/writer/optional/includes/section/w_section_tools.inc @@ -164,7 +164,7 @@ end function function fCheckDirectCursor ToolsOptions - Call hToolsOptions("TextDocument","FormattingAids") + Call hToolsOptions("WRITER","FormattingAids") Zonen_Cursor.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 8037be6ffee9..4f6d889e3821 100755 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -383,7 +383,7 @@ testcase tToolsSpellcheckForward goto endsub end select - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else @@ -556,7 +556,7 @@ testcase tToolsSpellcheckOnlyOneWord goto endsub end select - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else @@ -927,7 +927,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute goto endsub end select - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else @@ -1124,7 +1124,7 @@ testcase tToolsSpellcheckButtonChange goto endsub end select - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else @@ -1191,7 +1191,7 @@ testcase tToolsSpellcheckButtonChangeAll goto endsub end select - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index 91b8fd13a56c..85364d24fc44 100755 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc @@ -1005,7 +1005,7 @@ testcase tKeyboardShortcutToStyles() sTempa = Vorlage.getSelText printlog "should now be the default from the beginning" - if (uCase(gApplication)<>"HTMLDOKUMENT") then + if (uCase(gApplication)<>"HTML") then if (sTempa = sTempc) then printlog "OK: Heading changed to default: '" + sTempa + "'" else diff --git a/testautomation/writer/optional/includes/table/w_204_.inc b/testautomation/writer/optional/includes/table/w_204_.inc index 4b3b6172a8fe..977abcb4d044 100755 --- a/testautomation/writer/optional/includes/table/w_204_.inc +++ b/testautomation/writer/optional/includes/table/w_204_.inc @@ -76,7 +76,7 @@ testcase tTableOption '/// two boxes below are checked but disabled ///" ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") if AutomatischeZahlenerkennung.IsChecked then warnlog "The default for 'Number recognition' should be OFF => 114166 " AutomatischeZahlenerkennung.UnCheck @@ -128,7 +128,7 @@ testcase tTableInsert1 Printlog "'///+ ... play with number recognition in TOOLS->OPTIONS->TextDoc->Table ///" Printlog "'///+ ... Number recognition OFF ///" ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") AutomatischeZahlenerkennung.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -158,7 +158,7 @@ testcase tTableInsert1 Printlog "'///+ ... Number recognition ON - ///" ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") AutomatischeZahlenerkennung.Check ' even with that, everything is a TEXT :-(???? Zahlenformaterkennung.UnCheck ' much better with that! everything with numbers&decimalsep is number with 2 decimal places displayed, but all kept!!! AutomatischeAusrichtung.UnCheck ' just the allignment does change too! @@ -187,7 +187,7 @@ testcase tTableInsert1 Printlog "'///+ ... Number recognition ON - Number format recognition ///" ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") AutomatischeZahlenerkennung.Check ' even with that, everything is a TEXT :-(???? Zahlenformaterkennung.Check ' much better with that! everything with numbers&decimalsep is number with 2 decimal places displayed, but all kept!!! AutomatischeAusrichtung.UnCheck ' just the allignment does change too! @@ -217,7 +217,7 @@ testcase tTableInsert1 Printlog "'///+ ... Number recognition ON - Number format recognition - Alignment ///" ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") AutomatischeZahlenerkennung.Check ' even with that, everything is a TEXT :-(???? Zahlenformaterkennung.Check ' much better with that! everything with numbers&decimalsep is number with 2 decimal places displayed, but all kept!!! AutomatischeAusrichtung.Check ' just the allignment does change too! @@ -488,7 +488,7 @@ testcase tTableNumberFormat Call wTypeKeys "six" ToolsOptions ' set options for this test - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") AutomatischeZahlenerkennung.Check Zahlenformaterkennung.Check AutomatischeAusrichtung.Check diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc index 134001c74bf8..d3a8a6521a14 100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc @@ -466,7 +466,7 @@ testcase tUndoTableGeneral printlog "- format a cell" '/// Format cell (enable number recognition form that) ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") if Not AutomatischeZahlenerkennung.IsChecked then AutomatischeZahlenerkennung.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Cancel @@ -478,7 +478,7 @@ testcase tUndoTableGeneral Call CheckUndoStringInUndoList ( 10, "FormatCell" ) ToolsOptions - Call hToolsOptions ("TextDocument","Table") + Call hToolsOptions ("WRITER","Table") if AutomatischeZahlenerkennung.IsChecked then AutomatischeZahlenerkennung.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Cancel diff --git a/testautomation/writer/optional/w_autotext.bas b/testautomation/writer/optional/w_autotext.bas index 7c0d0e42c77f..9f51bdcf7db2 100644 --- a/testautomation/writer/optional/w_autotext.bas +++ b/testautomation/writer/optional/w_autotext.bas @@ -63,5 +63,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_calculate.bas b/testautomation/writer/optional/w_calculate.bas index dd4f5fc9abf7..952d917bb2d8 100644 --- a/testautomation/writer/optional/w_calculate.bas +++ b/testautomation/writer/optional/w_calculate.bas @@ -74,5 +74,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_chinesetranslate.bas b/testautomation/writer/optional/w_chinesetranslate.bas index 5e23f44cfb83..ef1a6813d66f 100644 --- a/testautomation/writer/optional/w_chinesetranslate.bas +++ b/testautomation/writer/optional/w_chinesetranslate.bas @@ -108,5 +108,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_clipbrd.bas b/testautomation/writer/optional/w_clipbrd.bas index 63ee378129c0..d4f477ad5f4e 100644 --- a/testautomation/writer/optional/w_clipbrd.bas +++ b/testautomation/writer/optional/w_clipbrd.bas @@ -87,6 +87,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Writer" + gApplication = "WRITER" Call GetUseFiles end sub diff --git a/testautomation/writer/optional/w_contextmenu.bas b/testautomation/writer/optional/w_contextmenu.bas index bc00caba5552..06ad8b1b1302 100755 --- a/testautomation/writer/optional/w_contextmenu.bas +++ b/testautomation/writer/optional/w_contextmenu.bas @@ -64,5 +64,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_drawing_tools.bas b/testautomation/writer/optional/w_drawing_tools.bas index 7f7b573801f0..ed9c3d64a5b6 100644 --- a/testautomation/writer/optional/w_drawing_tools.bas +++ b/testautomation/writer/optional/w_drawing_tools.bas @@ -74,5 +74,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_dropdownLB.bas b/testautomation/writer/optional/w_dropdownLB.bas index d987cdc5b9aa..08d69301c0c4 100644 --- a/testautomation/writer/optional/w_dropdownLB.bas +++ b/testautomation/writer/optional/w_dropdownLB.bas @@ -86,5 +86,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas index 09f67d491ff1..a18ed1cbe072 100644 --- a/testautomation/writer/optional/w_fields.bas +++ b/testautomation/writer/optional/w_fields.bas @@ -95,5 +95,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_filter.bas b/testautomation/writer/optional/w_filter.bas index 7b657ec33e6d..3aa2b901f498 100755 --- a/testautomation/writer/optional/w_filter.bas +++ b/testautomation/writer/optional/w_filter.bas @@ -94,5 +94,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_fontwork.bas b/testautomation/writer/optional/w_fontwork.bas index c6f0ddfc517a..46b888c67997 100644 --- a/testautomation/writer/optional/w_fontwork.bas +++ b/testautomation/writer/optional/w_fontwork.bas @@ -71,5 +71,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_formatcharacter.bas b/testautomation/writer/optional/w_formatcharacter.bas index 93ae30cc0c7d..d429eb653c09 100755 --- a/testautomation/writer/optional/w_formatcharacter.bas +++ b/testautomation/writer/optional/w_formatcharacter.bas @@ -71,5 +71,5 @@ sub LoadIncludeFiles use "global\tools\includes\optional\t_extension_manager_tools.inc" use "global\tools\includes\optional\t_ui_filters.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_formatpage.bas b/testautomation/writer/optional/w_formatpage.bas index 8fa50ca205e7..8798f7174187 100644 --- a/testautomation/writer/optional/w_formatpage.bas +++ b/testautomation/writer/optional/w_formatpage.bas @@ -140,6 +140,6 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_formatparagraph.bas b/testautomation/writer/optional/w_formatparagraph.bas index ddb898787b62..320f0fb6240f 100644 --- a/testautomation/writer/optional/w_formatparagraph.bas +++ b/testautomation/writer/optional/w_formatparagraph.bas @@ -143,5 +143,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_hhConversion.bas b/testautomation/writer/optional/w_hhConversion.bas index ce55acf190f7..df6b13479a27 100644 --- a/testautomation/writer/optional/w_hhConversion.bas +++ b/testautomation/writer/optional/w_hhConversion.bas @@ -141,5 +141,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_hyphenation.bas b/testautomation/writer/optional/w_hyphenation.bas index 0701a040040e..f086c8c6a033 100644 --- a/testautomation/writer/optional/w_hyphenation.bas +++ b/testautomation/writer/optional/w_hyphenation.bas @@ -60,5 +60,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas index 923ce524e0e8..86b730b2f643 100644 --- a/testautomation/writer/optional/w_insertgraphic.bas +++ b/testautomation/writer/optional/w_insertgraphic.bas @@ -132,5 +132,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_issuezilla_regression.bas b/testautomation/writer/optional/w_issuezilla_regression.bas index 8f265d368a85..3a3727a965bb 100755 --- a/testautomation/writer/optional/w_issuezilla_regression.bas +++ b/testautomation/writer/optional/w_issuezilla_regression.bas @@ -64,5 +64,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_loadsave.bas b/testautomation/writer/optional/w_loadsave.bas index 9905cee8a232..a53aa2d76119 100644 --- a/testautomation/writer/optional/w_loadsave.bas +++ b/testautomation/writer/optional/w_loadsave.bas @@ -65,5 +65,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_numbering.bas b/testautomation/writer/optional/w_numbering.bas index 3300321c927b..ed0ee8282d85 100755 --- a/testautomation/writer/optional/w_numbering.bas +++ b/testautomation/writer/optional/w_numbering.bas @@ -77,5 +77,5 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_opt.bas b/testautomation/writer/optional/w_opt.bas index 256fb7ff4d02..0fbb4d456cfb 100755 --- a/testautomation/writer/optional/w_opt.bas +++ b/testautomation/writer/optional/w_opt.bas @@ -87,5 +87,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_redlining.bas b/testautomation/writer/optional/w_redlining.bas index 4295b5f10f0d..6b48eec9f6f0 100644 --- a/testautomation/writer/optional/w_redlining.bas +++ b/testautomation/writer/optional/w_redlining.bas @@ -100,5 +100,5 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\required\t_lists.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_search.bas b/testautomation/writer/optional/w_search.bas index 199d93203955..170301230e2b 100755 --- a/testautomation/writer/optional/w_search.bas +++ b/testautomation/writer/optional/w_search.bas @@ -60,6 +60,6 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - gApplication = "Writer" + gApplication = "WRITER" Call GetUseFiles end sub diff --git a/testautomation/writer/optional/w_section.bas b/testautomation/writer/optional/w_section.bas index 17f0e509a60f..0fdc5b9698a7 100644 --- a/testautomation/writer/optional/w_section.bas +++ b/testautomation/writer/optional/w_section.bas @@ -98,6 +98,6 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\required\t_lists.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_shortcuts.bas b/testautomation/writer/optional/w_shortcuts.bas index 0ad2d193651f..ccb68b18f140 100755 --- a/testautomation/writer/optional/w_shortcuts.bas +++ b/testautomation/writer/optional/w_shortcuts.bas @@ -76,5 +76,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_sorting.bas b/testautomation/writer/optional/w_sorting.bas index 90a8cea8c78a..bec310f4a5aa 100644 --- a/testautomation/writer/optional/w_sorting.bas +++ b/testautomation/writer/optional/w_sorting.bas @@ -66,5 +66,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_spellcheck.bas b/testautomation/writer/optional/w_spellcheck.bas index 9919c43aa1e2..69881b1b13c3 100644 --- a/testautomation/writer/optional/w_spellcheck.bas +++ b/testautomation/writer/optional/w_spellcheck.bas @@ -65,5 +65,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_stylist.bas b/testautomation/writer/optional/w_stylist.bas index 734cf44f3f09..5f84ba123bd4 100644 --- a/testautomation/writer/optional/w_stylist.bas +++ b/testautomation/writer/optional/w_stylist.bas @@ -53,5 +53,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/writer/optional/w_table.bas b/testautomation/writer/optional/w_table.bas index 954c278131d6..f8722c9069a2 100755 --- a/testautomation/writer/optional/w_table.bas +++ b/testautomation/writer/optional/w_table.bas @@ -91,7 +91,7 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\tools\includes\optional\t_locale_strings1.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub sub TableConfiguration diff --git a/testautomation/writer/optional/w_textframes.bas b/testautomation/writer/optional/w_textframes.bas index 4d96be4fb6d4..f9da7849b795 100644 --- a/testautomation/writer/optional/w_textframes.bas +++ b/testautomation/writer/optional/w_textframes.bas @@ -88,5 +88,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end Sub diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index c8b34f226cde..79b56b58cf6c 100755 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -37,7 +37,9 @@ '* '\*********************************************************************** -sub w_001printLog Chr(13) + "--------- File Menu (w_001_.inc) ----------" +sub w_001_ + + printLog Chr(13) + "--------- File Menu (w_001_.inc) ----------" gApplication = "WRITER" Call tFileNewLabels @@ -53,7 +55,7 @@ sub w_001printLog Chr(13) + "--------- File Menu (w_001_.inc) ----------" Call tFileReload Call tFileVersions - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Call tToolsXMLFilterSettings end if Call tFileExportAsPDF @@ -66,7 +68,7 @@ sub w_001printLog Chr(13) + "--------- File Menu (w_001_.inc) ----------" Call tFileSendAutoabstractToPresentation 'Writer Master Document - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tMasterDocFileSaveWithPassword Call tMasterDocFileReload Call tMasterDocFileVersions @@ -712,10 +714,10 @@ testcase tFileSaveWithPassword Case "WRITER" sFile$ = "password.odt" sFile2$ = "password2.odt" - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "password.odm" sFile2$ = "password2.odm" - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -889,9 +891,9 @@ testcase tFileReload Select Case gApplication Case "WRITER" sFile$ = "reload." & WriterFilterExtension(0) - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "reload." & MasterDocFilterExtension(0) - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -947,9 +949,9 @@ testcase tFileVersions Select Case gApplication Case "WRITER" sFile$ = "kann_weg." & WriterFilterExtension(0) - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "kann_weg." & MasterDocFilterExtension(0) - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -1020,9 +1022,9 @@ testcase tFileSendCreateHTMLDocument Select Case gApplication Case "WRITER" Call hNewDocument - Case "MASTERDOC" + Case "MASTERDOCUMENT" Call hNewDocument - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in WriterWeb!" goto endsub end select @@ -1049,9 +1051,9 @@ testcase tFileSendOutlineToPresentation Select Case gApplication Case "WRITER" sFile$ = "htmltest.sxw" - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "htmltest.sxg" - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -1102,9 +1104,9 @@ testcase tFileSendOutlineToClipboard Select Case gApplication Case "WRITER" sFile$ = "htmltest.sxw" - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "htmltest.sxg" - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -1149,9 +1151,9 @@ testcase tFileSendCreateAutoabstract Select Case gApplication Case "WRITER" sFile$ = "htmltest.sxw" - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "htmltest.sxg" - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -1204,9 +1206,9 @@ testcase tFileSendAutoabstractToPresentation Select Case gApplication Case "WRITER" sFile$ = "htmltest.sxw" - Case "MASTERDOC" + Case "MASTERDOCUMENT" sFile$ = "htmltest.sxg" - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -1269,7 +1271,7 @@ testcase tMasterDocFileSaveWithPassword sFile$ = "password.odm" sFile2$ = "password2.odm" - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" PrintLog "Open new document" Call hNewDocument PrintLog "Enter some text into document" @@ -1438,7 +1440,7 @@ testcase tMasterDocFileReload PrintLog "- File / Reload" sFile$ = "reload." & MasterDocFilterExtension(0) - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" PrintLog "Open new document" Call hNewDocument @@ -1486,7 +1488,7 @@ testcase tMasterDocFileVersions WriterFilterExtension() = hGetFilternameExtension ( "writer8" ) MasterDocFilterExtension() = hGetFilternameExtension ( "writerglobal8" ) - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" PrintLog "- File / Versions" sFile$ = "kann_weg." & MasterDocFilterExtension(0) @@ -1524,7 +1526,7 @@ endcase testcase tMasterDocFileSendCreateHTMLDocument PrintLog "- File / Send / Create HTML-Dokument" - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" PrintLog "Open new document" Call hNewDocument @@ -1545,7 +1547,7 @@ endcase testcase tMasterDocFileSendOutlineToPresentation Dim sFile$ PrintLog "- File / Send / Outline to Presentation" - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" sFile$ = "htmltest.sxg" PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" @@ -1590,7 +1592,7 @@ endcase '----------------------------------------------------------- testcase tMasterDocFileSendOutlineToClipboard - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Dim sFile$ PrintLog "- File / Send / Outline to Clipboard" sFile$ = "htmltest.sxg" @@ -1629,7 +1631,7 @@ endcase '----------------------------------------------------------- testcase tMasterDocFileSendCreateAutoabstract - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Dim sFile$ PrintLog "- File / Send / Create Autoabstract" sFile$ = "htmltest.sxg" @@ -1678,7 +1680,7 @@ endcase '----------------------------------------------------------- testcase tMasterDocFileSendAutoabstractToPresentation - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Dim sFile$ PrintLog "- File / Send / Autoabstract to Presentation" sFile$ = "htmltest.sxg" diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index 38749fdf0d66..bc96aa2b08b8 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -36,7 +36,9 @@ '* '\*********************************************************************** -sub w_001aprintLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------" +sub w_001a_ + + printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------" gApplication = "WRITER" Call tFileProperties @@ -51,7 +53,7 @@ sub w_001aprintLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------" Call tFilePrinterSetup 'Writer Master Document - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tMasterDocFilePagePreview gApplication = "WRITER" @@ -258,7 +260,7 @@ endcase '----------------------------------------------------------- testcase tFileTemplatesSave - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then qaErrorLog " tFileTemplatesSave has been disabled in Masterdocument." goto endsub end if @@ -317,10 +319,10 @@ testcase tFilePagePreview Case "WRITER" Call hNewDocument - Case "MASTERDOC" + Case "MASTERDOCUMENT" Call hNewDocument - Case "HTMLDOKUMENT" + Case "HTML" printlog "Not in Writer/Web!" goto endsub end select @@ -513,7 +515,7 @@ testcase tMasterDocFilePagePreview PrintLog "- File / Page Preview" Dim gehtnicht as boolean gehtnicht = FALSE - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" printlog " Open new document" Call hNewDocument diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index 3f68c15f7d62..ff752ad8c300 100755 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -37,7 +37,9 @@ '* ** '\****************************************************************** -sub w_002printLog Chr(13) + "--------- Edit Menu ( w_002_.inc ) ----------" +sub w_002_ + + printLog Chr(13) + "--------- Edit Menu ( w_002_.inc ) ----------" gApplication = "WRITER" Call tEditUndoRedo @@ -65,12 +67,12 @@ sub w_002printLog Chr(13) + "--------- Edit Menu ( w_002_.inc ) ----------" Call tEditObjectEdit 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocEditFields gApplication = "WRITER" 'Writer Master Document - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tMasterDocEditNavigator gApplication = "WRITER" @@ -277,7 +279,7 @@ endcase 'tEditSelectionMode testcase tEditChanges PrintLog "- Edit/Changes" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -374,10 +376,10 @@ testcase tEditCompareDocument PrintLog "Open new document" EditCompareDocumentCalc PrintLog "Edit / Compare document" - Case "MASTERDOC" + Case "MASTERDOCUMENT" printlog "Comparing documents not in Masterdocument!" goto endsub - Case "HTMLDOKUMENT" + Case "HTML" printlog "Comparing documents not in WriterWeb!" goto endsub end select @@ -507,7 +509,7 @@ testcase tViewNavigator Call hNewDocument PrintLog "Open new document" - if gApplication = "MASTERDOC" then + if gApplication = "MASTERDOCUMENT" then Kontext "NavigatorGlobalDoc" if Not NavigatorGlobalDoc.Exists then ViewNavigator Kontext "NavigatorGlobalDoc" @@ -993,7 +995,7 @@ testcase tEditFields Sleep 1 PrintLog "Insert Field 'Sender -> Company'" Select Case gApplication - Case "HTMLDOKUMENT" + Case "HTML" Select case iSprache case 01 : Feldtyp.Select 5 'Sender Auswahl.Select 1 'Company @@ -1120,7 +1122,7 @@ endcase testcase tEditFieldsInputList PrintLog "- Edit / Fields / Functions" - If gApplication = "HTMLDOKUMENT" then goto endsub + If gApplication = "HTML" then goto endsub PrintLog "Open new document" Call hNewDocument @@ -1205,7 +1207,7 @@ testcase tEditIndexEntry goto endsub PrintLog "- Edit/Index Entry" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1247,7 +1249,7 @@ endcase testcase tEditLinks PrintLog "- Edit/Links" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1371,7 +1373,7 @@ endcase testcase tHtmlDocEditFields PrintLog "- Edit/Fields" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" PrintLog "Open new document" Call hNewDocument @@ -1465,7 +1467,7 @@ testcase tMasterDocEditNavigator printlog "- View/Navigator" Dim ToolboxOk as boolean - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call hNewDocument PrintLog "Open new document" diff --git a/testautomation/writer/required/includes/w_003_.inc b/testautomation/writer/required/includes/w_003_.inc index 5beb3ab3062c..2befbcb13c83 100755 --- a/testautomation/writer/required/includes/w_003_.inc +++ b/testautomation/writer/required/includes/w_003_.inc @@ -37,7 +37,9 @@ '* '\****************************************************************** -sub w_003printLog Chr(13) + "--------- View Menu (w_003_.inc) ----------" +sub w_003_ + + printLog Chr(13) + "--------- View Menu (w_003_.inc) ----------" gApplication = "WRITER" Call tViewPrintLayout @@ -62,7 +64,7 @@ sub w_003printLog Chr(13) + "--------- View Menu (w_003_.inc) ----------" Call tViewZoom 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocViewZoom Call tHtmlDocViewHTMLSource gApplication = "WRITER" @@ -82,7 +84,7 @@ testcase tViewZoom Kontext "Massstab" DialogTest ( Massstab ) select case uCASE(gApplication) - case "HTMLDOKUMENT" : + case "HTML" : printlog " check checkbox '100%'" Vergroesserung100.check printlog " check checkbox 'Variable'" @@ -335,7 +337,7 @@ testcase tViewToolbars printlog "- Toolbar 'Formula'" printlog "- open" - Call hToolbarSelect("Formula", true) + Call hToolbarSelect("MATH", true) OL_SW_Rechenleiste.TypeKeys "" printlog " Close active document" @@ -524,7 +526,7 @@ endcase testcase tViewHTMLSource PrintLog "- View / HTML Source (only in HTML-Document)" - if gApplication <> "HTMLDOKUMENT" then goto endsub + if gApplication <> "HTML" then goto endsub printlog "Open new document" Call hNewDocument printlog "View / HTML-Source" @@ -560,7 +562,7 @@ endcase '----------------------------------------------------------- testcase tHtmlDocViewZoom - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " open application" Call hNewDocument printlog " type something into the document" @@ -585,7 +587,7 @@ endcase testcase tHtmlDocViewHTMLSource PrintLog "- View / HTML Source (only in HTML-Document)" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog "Open new document" Call hNewDocument printlog "View / HTML-Source" diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc index a0848b532deb..6406176da25e 100755 --- a/testautomation/writer/required/includes/w_004_.inc +++ b/testautomation/writer/required/includes/w_004_.inc @@ -36,7 +36,9 @@ '* '\*********************************************************************** -sub w_004printLog Chr(13) + "--------- Insert Menu ( w_004_ ) ----------" +sub w_004_ + + printLog Chr(13) + "--------- Insert Menu ( w_004_ ) ----------" gApplication = "WRITER" Call tInsertManualBreak @@ -75,7 +77,7 @@ sub w_004printLog Chr(13) + "--------- Insert Menu ( w_004_ ) ----------" Call tInsertFile 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocInsertFields Call tHtmlDocInsertFieldsOther Call tHtmlDocInsertSection @@ -160,7 +162,7 @@ testcase tInsertFields Warnlog "Unable to execute: Insert / Fields / Author" endcatch printlog " Insert / Fields / Author" - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then try printlog "Insert / Fields / Subject" InsertFieldsSubject @@ -205,7 +207,7 @@ testcase tInsertFieldsOther Kontext "TabVariablen" Call Dialogtest ( TabVariablen ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext Active.SetPage TabReferenzen Kontext "TabReferenzen" @@ -313,7 +315,7 @@ testcase tInsertSection Kontext "TabHintergrund" Call DialogTest (TabHintergrund) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then printlog "Tabpage Indents" Kontext Active.Setpage TabSectionIndent @@ -500,7 +502,7 @@ testcase tInsertCrossReference Dim i as integer Dim j as integer printlog "- Insert / Reference Field" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -594,7 +596,7 @@ testcase tInsertIndexesEntry goto endsub PrintLog "- Insert / Indexes / Entry" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -624,7 +626,7 @@ endcase testcase tInsertIndexesIndex Dim i as integer Printlog "- Insert / Indexes / Index" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -757,7 +759,7 @@ endcase testcase tInsertIndexesBibliographyEntry Printlog "- Insert / Indexes / Bibliography Entry" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -801,7 +803,7 @@ endcase testcase tInsertEnvelope PrintLog "- Insert / Envelope" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -940,7 +942,7 @@ testcase tInsertFrame Warnlog "Maybe missing combobox! (#i29517)" endcatch - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabHyperlinkRahmen Kontext "TabHyperlinkRahmen" @@ -1122,7 +1124,7 @@ testcase tInsertGraphicsFromFile Kontext "TabMakro" Call DialogTest ( TabMakro ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabZuschneiden wait 500 @@ -1376,7 +1378,7 @@ endcase testcase tHtmlDocInsertFields PrintLog "- Insert / Fields" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1427,7 +1429,7 @@ testcase tHtmlDocInsertFields Warnlog "Unable to execute: Insert / Fields / Author" endcatch printlog " Insert / Fields / Author" - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then try printlog "Insert / Fields / Subject" InsertFieldsSubject @@ -1451,7 +1453,7 @@ testcase tHtmlDocInsertFieldsOther Dim j as integer printlog "- Insert / Fields / Other" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1474,7 +1476,7 @@ testcase tHtmlDocInsertFieldsOther Kontext "TabVariablen" Call Dialogtest ( TabVariablen ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext Active.SetPage TabReferenzen Kontext "TabReferenzen" @@ -1533,7 +1535,7 @@ endcase testcase tHtmlDocInsertSection PrintLog "- Insert / Section" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1565,7 +1567,7 @@ testcase tHtmlDocInsertSection Kontext "TabHintergrund" Call DialogTest (TabHintergrund) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then printlog "Tabpage Indents" Kontext Active.Setpage TabSectionIndent @@ -1591,7 +1593,7 @@ endcase testcase tHtmlDocInsertFrame PrintLog "- Insert / Frame" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1637,7 +1639,7 @@ testcase tHtmlDocInsertFrame Warnlog "Maybe missing combobox! (#i29517)" endcatch - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabHyperlinkRahmen Kontext "TabHyperlinkRahmen" @@ -1671,7 +1673,7 @@ testcase tHtmlDocInsertGraphicsFromFile PrintLog "- Insert / Graphics / From File" Dim j as integer - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1755,7 +1757,7 @@ testcase tHtmlDocInsertGraphicsFromFile Kontext "TabMakro" Call DialogTest ( TabMakro ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabZuschneiden wait 500 diff --git a/testautomation/writer/required/includes/w_005_.inc b/testautomation/writer/required/includes/w_005_.inc index 6d683daa74a7..d5dd9fcb08d8 100755 --- a/testautomation/writer/required/includes/w_005_.inc +++ b/testautomation/writer/required/includes/w_005_.inc @@ -36,7 +36,9 @@ '* '\****************************************************************** -sub w_005printLog Chr(13) + "--------- Menu Format (w_005_.inc) ----------" +sub w_005_ + + printLog Chr(13) + "--------- Menu Format (w_005_.inc) ----------" gApplication = "WRITER" Call tFormatDefault @@ -60,7 +62,7 @@ sub w_005printLog Chr(13) + "--------- Menu Format (w_005_.inc) ----------" Call tFormatWrapArea 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocFormatParagraph Call tHtmlDocFormatPage Call tHtmlDocFormatStylist @@ -278,7 +280,7 @@ endcase testcase tFormatRuby printlog "- Format / Ruby" if gAsianSup = True then - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -349,7 +351,7 @@ testcase tFormatParagraph kontext "TabUmrandung" Call DialogTest ( TabUmrandung ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabTextfluss kontext "TabTextfluss" @@ -442,7 +444,7 @@ testcase tFormatPage active.SetPage TabKopfzeile kontext "TabKopfzeile" Call DialogTest ( TabKopfzeile ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then KopfzeileMitAbstand.Check Zusaetze.Click @@ -462,7 +464,7 @@ testcase tFormatPage active.SetPage TabFusszeile kontext "TabFusszeile" Call DialogTest ( TabFusszeile ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then FusszeileMitAbstand.Check Zusaetze.Click @@ -619,7 +621,7 @@ testcase tFormatStylist Call DialogTest ( Gestalter ) Zeichenvorlagen.Click printlog " Click all Styles-buttons in Stylist" - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Sleep 1 Rahmenvorlagen.Click Sleep 1 @@ -785,7 +787,7 @@ endcase testcase tFormatWrap PrintLog "- Format / Wrap" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in Writer/Web!" goto endsub end if @@ -873,7 +875,7 @@ endcase testcase tFormatAnchorArea PrintLog "- Format / Anchor drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -914,7 +916,7 @@ endcase testcase tFormatWrapArea PrintLog "- Format / Wrap drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1007,7 +1009,7 @@ endcase testcase tHtmlDocFormatParagraph PrintLog "- Format / Paragraph" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument printlog " Format / Paragraph" @@ -1045,7 +1047,7 @@ endcase testcase tHtmlDocFormatPage PrintLog "- Format / Page" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1099,7 +1101,7 @@ endcase testcase tHtmlDocFormatStylist PrintLog "- Format / Stylist" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" if gPlatgroup = "unx" then QAErrorlog "Doesn't run on unix" goto endsub diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc index f65bbb935bda..cb8b2298ca20 100755 --- a/testautomation/writer/required/includes/w_005b_.inc +++ b/testautomation/writer/required/includes/w_005b_.inc @@ -37,7 +37,9 @@ '* '\*********************************************************************** -sub w_005bprintLog Chr(13) + "--------- Menu Format / 2 (w_005b_.inc) ----------" +sub w_005b_ + + printLog Chr(13) + "--------- Menu Format / 2 (w_005b_.inc) ----------" gApplication = "WRITER" Call tFormatAlignment @@ -74,7 +76,7 @@ sub w_005bprintLog Chr(13) + "--------- Menu Format / 2 (w_005b_.inc) ---------- Call tFormatParagraphEdit 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocFormatGraphics Call tHtmlDocFormatAlignment Call tHtmlDocFormatObject @@ -128,7 +130,7 @@ testcase tFormatGraphics Kontext "TabGrafik" Call DialogTest ( TabGrafik ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabZuschneiden Kontext "TabZuschneiden" @@ -224,7 +226,7 @@ testcase tFormatAlignment Call hNewDocument printlog " Insert a graphic from file '..\writer\required\input\graphics\jolink.jpg'" Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" ) - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then wait 500 printlog " Format / Anchor / to Page" FormatAnchorToPage @@ -315,7 +317,7 @@ testcase tFormatObject Kontext "TabHintergrund" Call DialogTest ( TabHintergrund ) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabHyperlinkRahmen Kontext "TabHyperlinkRahmen" @@ -380,7 +382,7 @@ endcase testcase tFormatAlignmentObject PrintLog "- Format / Alignment Frame" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -439,7 +441,7 @@ endcase testcase tFormatWrapObject PrintLog "- Format / Wrap (Frame)" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -496,7 +498,7 @@ endcase testcase tFormatLine PrintLog "- Format / Line in drawing object" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -573,7 +575,7 @@ endcase testcase tFormatArea Dim i as integer PrintLog "- Format / Area in drawing object" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -685,7 +687,7 @@ endcase testcase tFormatText PrintLog "- Format / Text in drawing object" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -730,7 +732,7 @@ endcase testcase tFormatPositionAndSize PrintLog "- Format / Position and Size in drawing object" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -780,7 +782,7 @@ endcase testcase tFormatFlip PrintLog "- Format / Flip drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -814,7 +816,7 @@ endcase testcase tFormatArrangeArea PrintLog "- Format / Arrange drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -856,7 +858,7 @@ endcase testcase tFormatAlignmentArea PrintLog "- Format / Alignment drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -940,7 +942,7 @@ testcase tFormatGroup Dim y1% PrintLog "- Format / Group drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1027,7 +1029,7 @@ endcase testcase tFormatFontwork PrintLog "- Format / Fontwork drawing objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1067,7 +1069,7 @@ endcase testcase tFormatPositionAndSizeLegend PrintLog "- Format / Position and Size in Legend" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1110,7 +1112,7 @@ endcase testcase tFormatStyleEdit PrintLog "- Format / Style Text objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb !" goto endsub end if @@ -1183,7 +1185,7 @@ endcase testcase tFormatAlignmentEdit PrintLog "- Format / Alignment text objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1223,7 +1225,7 @@ endcase testcase tFormatLineSpacing PrintLog "- Format / Line Spacing text objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1264,7 +1266,7 @@ endcase testcase tFormatParagraphEdit PrintLog "- Format / Paragraph text objects" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -1313,7 +1315,7 @@ testcase tHtmlDocFormatGraphics PrintLog "- Format / Graphics" Dim j as integer - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1390,7 +1392,7 @@ endcase '----------------------------------------------------------- testcase tHtmlDocFormatAlignment - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" PrintLog "- Format / Alignment" printlog " Open new document" @@ -1452,7 +1454,7 @@ testcase tHtmlDocFormatObject PrintLog "- Format / Object" Dim j as integer - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument diff --git a/testautomation/writer/required/includes/w_006_.inc b/testautomation/writer/required/includes/w_006_.inc index 9054db5cbb5f..267b4646b2eb 100755 --- a/testautomation/writer/required/includes/w_006_.inc +++ b/testautomation/writer/required/includes/w_006_.inc @@ -37,7 +37,9 @@ '* '\*********************************************************************** -sub w_006printLog Chr(13) + "--------- Table Menu (w_006_.inc) ----------" +sub w_006_ + + printLog Chr(13) + "--------- Table Menu (w_006_.inc) ----------" gApplication = "WRITER" Call tFormatTable diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 038853fdda8b..a1f9c5bfe09d 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -37,7 +37,9 @@ '* '\*********************************************************************** -sub w_007printLog Chr(13) + "--------- Tools Menu (w_007_.inc) ----------" +sub w_007_ + + printLog Chr(13) + "--------- Tools Menu (w_007_.inc) ----------" gApplication = "WRITER" Call tToolsSpellcheck @@ -59,11 +61,11 @@ sub w_007printLog Chr(13) + "--------- Tools Menu (w_007_.inc) ----------" Call tToolsChineseTranslation 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocToolsHangulHanjaConversion 'Writer Master Document - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tMasterDocToolsHyphenation gApplication = "WRITER" @@ -345,7 +347,7 @@ testcase tToolsHyphenation Case "WRITER" Call hFileOpen ( DieDatei ) - Case "MASTERDOC" + Case "MASTERDOCUMENT" if wInsertDocumentinMasterDoc(DieDatei) = False then Warnlog "Loading document did not work!" goto endsub @@ -355,7 +357,7 @@ testcase tToolsHyphenation EditPaste end if - Case "HTMLDOKUMENT" + Case "HTML" printlog "- No Hyphenation in WriterWeb!" goto endsub end select @@ -405,7 +407,7 @@ testcase tToolsHyphenation Call hCloseDocument printlog " Close active document" - if gApplication = "MASTERDOC" then Call hCloseDocument + if gApplication = "MASTERDOCUMENT" then Call hCloseDocument endcase ' ------------------------------------------- @@ -672,7 +674,7 @@ testcase tToolsMailMergeWizard Dim i as integer PrintLog "- Tools / Mail Merge" - if gApplication = "HTMLDOKUMENT" then goto endsub + if gApplication = "HTML" then goto endsub Call hNewDocument printlog " Open new document" @@ -884,7 +886,7 @@ endcase testcase tToolsUpdate PrintLog "- Tools / Update" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb !" goto endsub end if @@ -960,10 +962,10 @@ testcase tToolsHangulHanjaConversion Dim bAsianLanguage as Boolean Dim sTestFile as String - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then sTestFile = Convertpath (gTesttoolpath + "writer\required\input\hangul.html") else - if Ucase(gApplication) = "MASTERDOC" then + if Ucase(gApplication) = "MASTERDOCUMENT" then goto endsub else sTestFile = Convertpath (gTesttoolpath + "writer\required\input\hangul.sxw") @@ -1110,7 +1112,7 @@ testcase tHtmlDocToolsHangulHanjaConversion Dim bAsianLanguage as Boolean Dim sTestFile as String - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" PrintLog "- Tools / HangulHanjaConversion" sTestFile = Convertpath (gTesttoolpath + "writer\required\input\hangul.html") @@ -1181,7 +1183,7 @@ testcase tMasterDocToolsHyphenation Dim DieDatei as string Dim LingFile as string - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" PrintLog "- Tools / Hyphenation" ' As long as OOo has no modules for that, disabled if gOOO = True then diff --git a/testautomation/writer/required/includes/w_008_.inc b/testautomation/writer/required/includes/w_008_.inc index 461e66ec204c..c6bba9fedd43 100755 --- a/testautomation/writer/required/includes/w_008_.inc +++ b/testautomation/writer/required/includes/w_008_.inc @@ -36,7 +36,9 @@ '* '\****************************************************************** -sub w_008printLog Chr(13) + "--------- Window Menu (w_008_.inc) ----------" +sub w_008_ + + printLog Chr(13) + "--------- Window Menu (w_008_.inc) ----------" gApplication = "WRITER" Call tWindowNewWindow @@ -47,7 +49,7 @@ end sub testcase tWindowNewWindow PrintLog "- Window / New Window" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb !" goto endsub end if diff --git a/testautomation/writer/required/includes/w_009_.inc b/testautomation/writer/required/includes/w_009_.inc index ff3298a9549e..c0df1023ed8e 100755 --- a/testautomation/writer/required/includes/w_009_.inc +++ b/testautomation/writer/required/includes/w_009_.inc @@ -36,7 +36,9 @@ '* '\****************************************************************** -sub w_009printLog Chr(13) + "--------- Menu Help (w_009_.inc) ----------" +sub w_009_ + + printLog Chr(13) + "--------- Menu Help (w_009_.inc) ----------" gApplication = "WRITER" Call tHelpTip diff --git a/testautomation/writer/required/includes/w_010_.inc b/testautomation/writer/required/includes/w_010_.inc index 23168cd5b0fa..2740a5fb5ee0 100755 --- a/testautomation/writer/required/includes/w_010_.inc +++ b/testautomation/writer/required/includes/w_010_.inc @@ -37,7 +37,9 @@ '* '\****************************************************************** -sub w_010printLog Chr(13) + "--------- Objectbars (w_010_.inc) ----------" +sub w_010_ + + printLog Chr(13) + "--------- Objectbars (w_010_.inc) ----------" gApplication = "WRITER" ' ** Objectbar @@ -67,9 +69,9 @@ sub w_010printLog Chr(13) + "--------- Objectbars (w_010_.inc) ----------" Call tUpNumberingEnumerating 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocFormatting - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" Call tMasterDocFormatting gApplication = "WRITER" @@ -135,7 +137,7 @@ testcase tFormatting printlog " Select 'Centered' in object bar" Zentriert.Click Sleep 1 - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then printlog " - Justify" printlog " Select 'Justify' in object bar (not in HTML)" Blocksatz.Click @@ -1075,7 +1077,7 @@ endcase testcase tHtmlDocFormatting printlog "- Objectbar ( normal ) : Formatting" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -1150,7 +1152,7 @@ endcase testcase tMasterDocFormatting printlog "- Objectbar ( normal ) : Formatting" - gApplication = "MASTERDOC" + gApplication = "MASTERDOCUMENT" printlog " Open new document" Call hNewDocument diff --git a/testautomation/writer/required/includes/w_010_1.inc b/testautomation/writer/required/includes/w_010_1.inc index c27fd9d51239..1395cc9451be 100644 --- a/testautomation/writer/required/includes/w_010_1.inc +++ b/testautomation/writer/required/includes/w_010_1.inc @@ -38,6 +38,7 @@ '\****************************************************************** sub w_010_1 + printLog Chr(13) + "--------- Objectbars . Part two. (w_010_1.inc) ----------" gApplication = "WRITER" @@ -64,7 +65,7 @@ sub w_010_1 Call tFormulaApply 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDocGraphicWrap Call tHtmlDocGraphicAlign Call tHtmlDocGraphicProperties @@ -296,7 +297,7 @@ testcase tGraphicWrap Warnlog "'Wrap Off' in Objectbar couldn't be checked" endcatch - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then try printlog " Check 'Wrap through' in object bar" Durchlauf.Click @@ -362,7 +363,7 @@ testcase tGraphicAlign endcatch ' Only Left and Right in WriterWeb - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog " Close active document" Call hCloseDocument goto endsub @@ -408,7 +409,7 @@ endcase testcase tGraphicFlip printlog "- Graphic-(Frame)-Objectbar: Flip" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then Printlog "Not in WriterWeb!" goto endsub end if @@ -606,7 +607,7 @@ testcase tGraphicProperties Call DialogTest ( TabMakro ) printlog " Close 'Graphic' dialog" - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext active.SetPage TabHintergrund Kontext "TabHintergrund" @@ -726,7 +727,7 @@ endcase testcase tHtmlDocGraphicWrap printlog "- Grafik-(Rahmen)-Objectbar: Wrap" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -768,7 +769,7 @@ endcase testcase tHtmlDocGraphicAlign printlog "- Graphic-(Frame)-Objectbar: Align" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -804,7 +805,7 @@ testcase tHtmlDocGraphicProperties printlog "- Graphic-(Frame)-Objectbar: Properties" Dim j as integer - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument diff --git a/testautomation/writer/required/includes/w_011_.inc b/testautomation/writer/required/includes/w_011_.inc index d2c04b7ddcd2..82faaab6f668 100755 --- a/testautomation/writer/required/includes/w_011_.inc +++ b/testautomation/writer/required/includes/w_011_.inc @@ -36,7 +36,9 @@ '* '\****************************************************************** -sub w_011printLog Chr(13) + "--------- Toolbar ( w_011_.inc ) ----------" +sub w_011_ + + printLog Chr(13) + "--------- Toolbar ( w_011_.inc ) ----------" gApplication = "WRITER" 'Objektleiste Grafik Call tGraphicFilters @@ -55,7 +57,7 @@ end sub testcase tGraphicFilters printlog "- Objectbar Graphic (Filters)" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "This test applies not to HTML-Document" Printlog "Not in WriterWeb!" goto endsub @@ -317,7 +319,7 @@ endcase testcase tZOEditPoints printlog "- Draw Functions-Objectbar: Edit Points" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then Printlog "This test does not apply to HTML documents" Printlog "Not in WriterWeb!" goto endsub @@ -353,7 +355,7 @@ endcase testcase tZOLine printlog "- Draw Functions-Objectbar: all within Line" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then Printlog "This test does not apply to HTML documents" Printlog "Not in WriterWeb!" goto endsub @@ -405,7 +407,7 @@ endcase testcase tZOArea printlog "- Draw Functions-Objectbar: all within rectangle" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "This test applies not to HTML document" Printlog "Not in WriterWeb!" goto endsub @@ -445,7 +447,7 @@ endcase testcase tZORest printlog "- Draw Functions-Objectbar: Rest" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "This test does not apply to HTML documents" Printlog "Not in WriterWeb!" goto endsub @@ -515,7 +517,7 @@ endcase testcase tZOText printlog "- Draw Functions-Objectbar: Text" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "This test does not apply to HTML documents" Printlog "Not in WriterWeb!" goto endsub @@ -651,7 +653,7 @@ endcase testcase tZOVerticalText printlog "- Draw Functions-Objectbar: Vertical Text" if gAsianSup = False then goto endsub - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "This test applies not to HTML document and only if Asian Support is enabled" Printlog "Not in WriterWeb!" goto endsub diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index a61d0207c336..d07c6500d05d 100755 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc @@ -37,7 +37,9 @@ '* '\****************************************************************** -sub w_020printLog Chr(13) + "--------- Toolbars (w_020_.inc) ----------" +sub w_020_ + + printLog Chr(13) + "--------- Toolbars (w_020_.inc) ----------" 'Toolbar Call t_TB_Insert @@ -51,7 +53,7 @@ sub w_020printLog Chr(13) + "--------- Toolbars (w_020_.inc) ----------" Call t_TB_Rest 'Writer Web - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" Call tHtmlDoc_TB_Insert Call tHtmlDoc_TB_InsertFields Call tHtmlDoc_TB_Form @@ -74,7 +76,7 @@ testcase t_TB_Insert Kontext "Insertbar" if Not Insertbar.Exists then Call hToolbarSelect("Insert", true) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext "Insertbar" printlog " - Frame" printlog " Click 'Frame' and Insert a Frame" @@ -134,7 +136,7 @@ testcase t_TB_Insert Kontext "Insertbar" if Not Insertbar.Exists then Call hToolbarSelect("Insert", true) - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then printlog " - Footnote" printlog " Click 'Insert Footnote Directly' in Toolbox" Kontext "Insertbar" @@ -245,7 +247,7 @@ testcase t_TB_InsertFields Sleep 1 Feldbefehle.OpenMenu wait 500 - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then Call hMenuSelectNr(6) else Call hMenuSelectNr(8) @@ -267,7 +269,7 @@ endcase testcase t_TB_ShowDrawFunctions printlog "- Toolbox ( normal ) : Draw Functions" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -404,7 +406,7 @@ testcase t_TB_Form Call sMenufunktionen("-Checkbox-") Kontext "FormControls" - if Ucase(gApplication) <> "HTMLDOKUMENT" then + if Ucase(gApplication) <> "HTML" then wait 500 Label.Click printlog " Insert a textbox from toolbox" @@ -433,7 +435,7 @@ testcase t_TB_Form Call sMenufunktionen("-Listbox-") Kontext "FormControls" - if Ucase(gApplication) <> "HTMLDOKUMENT" then + if Ucase(gApplication) <> "HTML" then Combobox.Click printlog " Insert a Combobox from toolbox" Wait 500 @@ -446,7 +448,7 @@ testcase t_TB_Form printlog " Insert a Formatted Field from toolbox" Kontext "FormControls" - if Ucase(gApplication) <> "HTMLDOKUMENT" then + if Ucase(gApplication) <> "HTML" then FormattedField.Click Wait 500 Call hMalZeichnenMitSelektion ( 45, 50, 55, 55 ) @@ -551,7 +553,7 @@ endcase testcase t_TB_DirektCursor printlog "- Toolbox ( normal ) : Direct Cursor" - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then printlog "Not in WriterWeb!" goto endsub end if @@ -601,7 +603,7 @@ testcase t_TB_Rest endcatch printlog " - OnlineLayout" - if gApplication <> "HTMLDOKUMENT" then + if gApplication <> "HTML" then Kontext "Toolbar" if Not Toolbar.Exists then Call hToolbarSelect("Tools", true) try @@ -651,7 +653,7 @@ testcase tHtmlDoc_TB_Insert goto endsub printlog "- Toolbox ( normal ) : All within Insert" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument @@ -767,7 +769,7 @@ testcase tHtmlDoc_TB_InsertFields Dim Ende as Integer Dim i as Integer printlog "- Toolbox ( normal ) : Fields" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" if gPlatgroup = "unx" then QAErrorlog "Doesn't run on unix" @@ -803,7 +805,7 @@ endcase '----------------------------------------------------------- testcase tHtmlDoc_TB_Form printlog "- Toolbox ( normal ) : Formular" - gApplication = "HTMLDOKUMENT" + gApplication = "HTML" printlog " Open new document" Call hNewDocument diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc index 01d2b6044d80..39148ccf3279 100755 --- a/testautomation/writer/tools/includes/w_tool1.inc +++ b/testautomation/writer/tools/includes/w_tool1.inc @@ -281,14 +281,14 @@ sub hMalZeichnenMitSelektion ( xS, yS, xE, yE ) DocumentWriter.MouseUp ( xE, yE ) Sleep 1 - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.MouseDown ( xS, yS ) DocumentWriterWeb.MouseMove ( xE, yE ) DocumentWriterWeb.MouseUp ( xE, yE ) Sleep 1 - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown ( xS, yS ) DocumentMasterDoc.MouseMove ( xE, yE ) @@ -310,7 +310,7 @@ sub hMalZeichnen ( xS, yS, xE, yE ) Sleep 1 if DocumentWriter.IsEnabled then Call wTypeKeys "" - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.MouseDown ( xS, yS ) DocumentWriterWeb.MouseMove ( xE, yE ) @@ -318,7 +318,7 @@ sub hMalZeichnen ( xS, yS, xE, yE ) Sleep 1 if DocumentWriterWeb.IsEnabled then DocumentWriterWeb.TypeKeys "" - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown ( xS, yS ) DocumentMasterDoc.MouseMove ( xE, yE ) diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc index d8bb7378804b..498956365baa 100755 --- a/testautomation/writer/tools/includes/w_tool3.inc +++ b/testautomation/writer/tools/includes/w_tool3.inc @@ -686,7 +686,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "" 'OpenContextMenu - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" Call DocumentMasterDoc.TypeKeys "" 'OpenContextMenu @@ -698,7 +698,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean) Kontext "DocumentWriter" Call DocumentWriter.OpenContextMenu true - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" Call DocumentMasterDoc.OpenContextMenu true @@ -709,7 +709,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean) Kontext "DocumentWriter" Call DocumentWriter.OpenContextMenu - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" Call DocumentMasterDoc.OpenContextMenu end select diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc index a493f4e3f4ce..805dcac835bf 100755 --- a/testautomation/writer/tools/includes/w_tool4.inc +++ b/testautomation/writer/tools/includes/w_tool4.inc @@ -166,8 +166,8 @@ sub wToolsSpellcheckCheckWriter '/// This function opens the spellcheck-dialog in all applications Select Case Ucase(gApplication) Case "WRITER" : ToolsSpellcheckWriter - Case "MASTERDOC" : ToolsSpellcheckWriter - Case "HTMLDOKUMENT" : ToolsSpellcheckWriter + Case "MASTERDOCUMENT" : ToolsSpellcheckWriter + Case "HTML" : ToolsSpellcheckWriter case "DRAW" : ToolsSpellcheck case "IMPRESS" : ToolsSpellcheck end select diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 331286c4c1b8..57cfb8670423 100755 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc @@ -490,10 +490,10 @@ sub TBOhTabelleEinfuegen (optional tName as string, optional tHeader as boolean, Case "WRITER" Kontext "DocumentWriter" - Case "GLOBALDOKUMENT" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" end select diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index 64b64a58e427..f9c0d459d377 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -76,11 +76,11 @@ If IsMissing(iLoop) = True then iLoop = 1 Kontext "DocumentWriter" DocumentWriter.TypeKeys OutputText - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.TypeKeys OutputText - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.TypeKeys OutputText @@ -108,11 +108,11 @@ If IsMissing(iLoop) = True then iLoop = 1 Kontext "DocumentWriter" DocumentWriter.TypeKeys OutputText - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.TypeKeys OutputText - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" DocumentWriterWeb.TypeKeys OutputText @@ -132,10 +132,10 @@ sub wDocSetContext Case "WRITER" Kontext "DocumentWriter" - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" Case "IMPRESS" @@ -250,7 +250,7 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona wait 100 end if - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% DocumentMasterDoc.MouseMove xEnde%, yEnde% @@ -282,7 +282,7 @@ sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% ) DocumentWriter.MouseDown xStart%, yStart% DocumentWriter.MouseMove xEnde%, yEnde% DocumentWriter.MouseUp xEnde%, yEnde% - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% DocumentMasterDoc.MouseMove xEnde%, yEnde% @@ -316,7 +316,7 @@ sub wFindSelectObjectBelow ( xStart%, yStart%, xEnde%, yEnde% ) if (getMouseStyle <> 0) then i = 80 wend - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% DocumentMasterDoc.MouseMove xEnde%, yEnde% @@ -422,7 +422,7 @@ sub hLeisteUmschalten(welche as integer) catch endcatch Sleep 1 - if gApplication = "HTMLDOKUMENT" then + if gApplication = "HTML" then Kontext "TextObjectbar" else Kontext "TextObjectbar" @@ -440,7 +440,7 @@ sub hLeisteUmschalten(welche as integer) case 2: Select Case gApplication ' Numbering-Objectbar - Case "HTMLDOKUMENT" + Case "HTML" Kontext "TextObjectbar" try TextObjectbar.SetNextToolbox @@ -541,13 +541,13 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus wait 500 Kontext "NavigatorCalc" MinEntrys = 8 - Case "WRITER", "HTMLDOKUMENT", "HTML" + Case "WRITER", "HTML", "HTML" Kontext "NavigatorWriter" if NavigatorWriter.NotExists then ViewNavigator wait 500 Kontext "NavigatorWriter" MinEntrys = 11 - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "NavigatorGlobalDoc" if NavigatorGlobalDoc.NotExists then ViewNavigator wait 500 @@ -583,7 +583,7 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus Liste.TypeKeys "" end if - Case "WRITER","HTMLDOKUMENT", "HTML" + Case "WRITER","HTML", "HTML" if (Auswahlliste.GetItemCount < MinEntrys) then try Inhaltsansicht.Click @@ -605,7 +605,7 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus Auswahlliste.TypeKeys "" end if - Case "MASTERDOC" + Case "MASTERDOCUMENT" if Liste.IsVisible = True then Umschalten.Click end if @@ -630,11 +630,11 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus Select Case Ucase(gApplication) Case "CALC" Kontext "DocumentCalc" - Case "HTMLDOKUMENT", "HTML" + Case "HTML", "HTML" Kontext "DocumentWriter" Case "WRITER" Kontext "DocumentWriter" - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" end select end if @@ -722,9 +722,9 @@ sub wMarkObjects(delete as boolean) Select Case gApplication Case "WRITER" Kontext "DocumentWriter" - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" - Case "HTMLDOKUMENT" + Case "HTML" Kontext "DocumentWriterWeb" end select @@ -736,10 +736,10 @@ sub wMarkObjects(delete as boolean) Case "WRITER" DocumentWriter.TypeKeys "" - Case "MASTERDOC" + Case "MASTERDOCUMENT" DocumentMasterDoc.TypeKeys "" - Case "HTMLDOKUMENT" + Case "HTML" DocumentWriterWeb.TypeKeys "" end select @@ -753,7 +753,7 @@ end sub ' ----------------------------------------------------------------------- sub hExportUmstellung ( WasDenn as Boolean ) - if Ucase(gApplication) = "HTMLDOKUMENT" then + if Ucase(gApplication) = "HTML" then ToolsOptions Call hToolsOptions("LoadSave","HTMLCompatibility") if WasDenn = TRUE then @@ -845,7 +845,7 @@ sub wRectangleToClipboard Select Case gApplication Case "WRITER" Kontext "DocumentWriter" - Case "MASTERDOC" + Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" end select Call gMouseClick 10,10 @@ -860,7 +860,7 @@ sub wRectangleToClipboardHTML EditSelectAll EditCopy Call hCloseDocument - gApplication = "HTMLDokument" + gApplication = "HTML" Kontext "DocumentWriterWeb" Call gMouseClick end sub @@ -898,7 +898,7 @@ sub wOptionenUndo ( sOption$ ) ToolsOptions end if - Call hToolsOptions("Textdocument","General") + Call hToolsOptions("WRITER","General") if Instr(Tabulatorenabstand.Gettext, ",") then sTempSeparator = "," else @@ -926,7 +926,7 @@ sub wOptionenUndo ( sOption$ ) end select end if - Call hToolsOptions("Textdocument","View") + Call hToolsOptions("WRITER","View") if sOption$ = "Inhalte" OR sOption$ = "Alle" then ' Guides Hilfslinien.Uncheck @@ -948,7 +948,7 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "Cursor" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","FormattingAids") + Call hToolsOptions("WRITER","FormattingAids") ' Display of Absatzenden.UnCheck WeicheTrenner.Check @@ -966,7 +966,7 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "Raster" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","Grid") + Call hToolsOptions("WRITER","Grid") ' Grid FangrasterBenutzen.Uncheck RasterSichtbar.Uncheck @@ -996,13 +996,13 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "Grundschriften" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","BasicFonts") + Call hToolsOptions("WRITER","BasicFonts") Standard.Click AktuellesDokument.Uncheck end if if sOption$ = "Drucken" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","Print") + Call hToolsOptions("WRITER","Print") ' Contents Grafiken.Check Tabellen.Check @@ -1024,7 +1024,7 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "Tabelle" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","Table") + Call hToolsOptions("WRITER","Table") ' Default Ueberschrift.Check Wiederholen.Check @@ -1069,7 +1069,7 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "Aenderung" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","Changes") + Call hToolsOptions("WRITER","Changes") ' Text display EinfuegenAttribute.Select 4 EinfuegenFarbe.Select 2 @@ -1083,7 +1083,7 @@ sub wOptionenUndo ( sOption$ ) end if if sOption$ = "AutoCaption" OR sOption$ = "Alle" then - Call hToolsOptions("Textdocument","Autocaption") + Call hToolsOptions("WRITER","Autocaption") for i = 1 to ObjectList.GetItemCount ObjectList.Select i ObjectList.UnCheck diff --git a/testautomation/writer/tools/w_get_locale_strings.bas b/testautomation/writer/tools/w_get_locale_strings.bas index e49889e8789a..30bfb96cfcae 100755 --- a/testautomation/writer/tools/w_get_locale_strings.bas +++ b/testautomation/writer/tools/w_get_locale_strings.bas @@ -52,5 +52,5 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" Call GetUseFiles - gApplication = "Writer" + gApplication = "WRITER" end sub diff --git a/testautomation/xml/optional/w_xml_vertical_alignment.bas b/testautomation/xml/optional/w_xml_vertical_alignment.bas index 6c38000feb6a..b42ddaf7d58c 100755 --- a/testautomation/xml/optional/w_xml_vertical_alignment.bas +++ b/testautomation/xml/optional/w_xml_vertical_alignment.bas @@ -57,6 +57,6 @@ sub LoadIncludeFiles use "global/system/includes/master.inc" use "global/system/includes/gvariabl.inc" use "global\tools\includes\optional\t_ui_filters.inc" - gApplication = "Writer" + gApplication = "WRITER" call getusefiles end sub -- cgit