diff options
66 files changed, 99 insertions, 90 deletions
diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc index 0151f5021b3e..0151f5021b3e 100644..100755 --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 357fa89c4393..357fa89c4393 100755..100644 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc index a89e8fad80d8..a89e8fad80d8 100644..100755 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc index d01f9f8eee5f..d01f9f8eee5f 100644..100755 --- a/testautomation/chart2/required/includes/ch2_insert_ctl.inc +++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc index d7f5efbee3a5..d7f5efbee3a5 100644..100755 --- a/testautomation/chart2/required/includes/ch2_menu.inc +++ b/testautomation/chart2/required/includes/ch2_menu.inc diff --git a/testautomation/chart2/tools/ch_tools_axes.inc b/testautomation/chart2/tools/ch_tools_axes.inc index ef897fbc345f..ef897fbc345f 100644..100755 --- a/testautomation/chart2/tools/ch_tools_axes.inc +++ b/testautomation/chart2/tools/ch_tools_axes.inc diff --git a/testautomation/chart2/tools/ch_tools_chart_type.inc b/testautomation/chart2/tools/ch_tools_chart_type.inc index 7cf0a1e7d61b..7cf0a1e7d61b 100644..100755 --- a/testautomation/chart2/tools/ch_tools_chart_type.inc +++ b/testautomation/chart2/tools/ch_tools_chart_type.inc diff --git a/testautomation/chart2/tools/ch_tools_data_labels.inc b/testautomation/chart2/tools/ch_tools_data_labels.inc index 879ddae59361..879ddae59361 100644..100755 --- a/testautomation/chart2/tools/ch_tools_data_labels.inc +++ b/testautomation/chart2/tools/ch_tools_data_labels.inc diff --git a/testautomation/chart2/tools/ch_tools_grids.inc b/testautomation/chart2/tools/ch_tools_grids.inc index d909ef7426e1..d909ef7426e1 100644..100755 --- a/testautomation/chart2/tools/ch_tools_grids.inc +++ b/testautomation/chart2/tools/ch_tools_grids.inc diff --git a/testautomation/chart2/tools/ch_tools_legend.inc b/testautomation/chart2/tools/ch_tools_legend.inc index 9c16c71d1af7..9c16c71d1af7 100644..100755 --- a/testautomation/chart2/tools/ch_tools_legend.inc +++ b/testautomation/chart2/tools/ch_tools_legend.inc diff --git a/testautomation/chart2/tools/ch_tools_select.inc b/testautomation/chart2/tools/ch_tools_select.inc index 8df51c8d9279..8df51c8d9279 100644..100755 --- a/testautomation/chart2/tools/ch_tools_select.inc +++ b/testautomation/chart2/tools/ch_tools_select.inc diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc index 59bd74496113..59bd74496113 100644..100755 --- a/testautomation/chart2/tools/ch_tools_statistics.inc +++ b/testautomation/chart2/tools/ch_tools_statistics.inc diff --git a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc index 4d9847615782..4d9847615782 100644..100755 --- a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc +++ b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc diff --git a/testautomation/chart2/tools/ch_tools_tab_pages.inc b/testautomation/chart2/tools/ch_tools_tab_pages.inc index 63d88d35c3ff..63d88d35c3ff 100644..100755 --- a/testautomation/chart2/tools/ch_tools_tab_pages.inc +++ b/testautomation/chart2/tools/ch_tools_tab_pages.inc diff --git a/testautomation/chart2/tools/ch_tools_titles.inc b/testautomation/chart2/tools/ch_tools_titles.inc index c3b64a6fa8f7..c3b64a6fa8f7 100644..100755 --- a/testautomation/chart2/tools/ch_tools_titles.inc +++ b/testautomation/chart2/tools/ch_tools_titles.inc diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index df9026ba2dd9..df9026ba2dd9 100755..100644 --- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc index db115274e19d..db115274e19d 100755..100644 --- a/testautomation/extensions/optional/includes/extensions.inc +++ b/testautomation/extensions/optional/includes/extensions.inc diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc index 262495666cbb..262495666cbb 100755..100644 --- a/testautomation/extensions/optional/includes/location.inc +++ b/testautomation/extensions/optional/includes/location.inc diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc index ef20c2a2f1e5..c52ae61c0945 100755..100644 --- a/testautomation/framework/optional/includes/f_usage_tracking.inc +++ b/testautomation/framework/optional/includes/f_usage_tracking.inc @@ -100,7 +100,7 @@ testcase tUsageTracking3 kontext "Active" if ( Active.exists( 2 ) ) then - qaerrorlog( "Messagebox not required as control should not be enabled (see #i97340#)" ) + warnlog( "Messagebox not required as control should not be enabled (see #i97340#)" ) Active.ok() kontext "TextImport" diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 3df134d83d33..3df134d83d33 100755..100644 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 162f0cc040cd..162f0cc040cd 100755..100644 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc index e6e62995716c..e6e62995716c 100644..100755 --- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc index d4e327a21ad7..d4e327a21ad7 100755..100644 --- a/testautomation/framework/required/includes/smoketest.inc +++ b/testautomation/framework/required/includes/smoketest.inc diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc index fdfdb49fec97..fdfdb49fec97 100755..100644 --- a/testautomation/framework/required/includes/topten.inc +++ b/testautomation/framework/required/includes/topten.inc diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc index d423d2fd7c62..d423d2fd7c62 100755..100644 --- a/testautomation/framework/required/includes/wizard_agenda.inc +++ b/testautomation/framework/required/includes/wizard_agenda.inc diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc index b99cef0a9c6c..b99cef0a9c6c 100755..100644 --- a/testautomation/framework/required/includes/wizard_documentconverter.inc +++ b/testautomation/framework/required/includes/wizard_documentconverter.inc diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc index aeee35c59282..aeee35c59282 100755..100644 --- a/testautomation/framework/required/includes/wizard_euroconverter.inc +++ b/testautomation/framework/required/includes/wizard_euroconverter.inc diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc index 07fcc562dddc..07fcc562dddc 100755..100644 --- a/testautomation/framework/required/includes/wizard_fax.inc +++ b/testautomation/framework/required/includes/wizard_fax.inc diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc index 657a68ada3d0..657a68ada3d0 100755..100644 --- a/testautomation/framework/required/includes/wizard_firsttime.inc +++ b/testautomation/framework/required/includes/wizard_firsttime.inc diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc index 4f68a04cbd8b..4f68a04cbd8b 100755..100644 --- a/testautomation/framework/required/includes/wizard_letter.inc +++ b/testautomation/framework/required/includes/wizard_letter.inc diff --git a/testautomation/framework/required/includes/wizard_presentation.inc b/testautomation/framework/required/includes/wizard_presentation.inc index 53e2e0d3a50b..53e2e0d3a50b 100755..100644 --- a/testautomation/framework/required/includes/wizard_presentation.inc +++ b/testautomation/framework/required/includes/wizard_presentation.inc diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index 66c6c27982d0..66c6c27982d0 100755..100644 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc index 380f84141d34..380f84141d34 100755..100644 --- a/testautomation/framework/tools/includes/wizards.inc +++ b/testautomation/framework/tools/includes/wizards.inc diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc index 07c2dde3927d..07c2dde3927d 100644..100755 --- a/testautomation/global/required/includes/g_customize.inc +++ b/testautomation/global/required/includes/g_customize.inc diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 2f7b6aa33ac2..0c40d3c3d08e 100755..100644 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram Active.ok() else if ( NOT bImportDialogHasBeenDisplayed ) then - qaerrorlog( "#i97340# Show Data button enabled but no logged data found" ) + warnlog( "#i97340# Show Data button enabled but no logged data found" ) endif endif @@ -767,8 +767,13 @@ testcase tToolsOptionsImprovementProgram endif Kontext "OptionenDlg" - OptionenDlg.cancel() - + if OptionenDlg.Exists then + OptionenDlg.cancel() + endif + + if GetDocumentCount = 1 then + Call hCloseDocument + endif else ' hDeleteFile() returns FALSE if the file is still present for some weird reason ' We should warn about this because the test breaks at a later point then. diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc index c90d077db651..c90d077db651 100755..100644 --- a/testautomation/global/tools/includes/optional/t_listfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc diff --git a/testautomation/global/tools/includes/optional/t_locale_tools.inc b/testautomation/global/tools/includes/optional/t_locale_tools.inc index 75d18e2c5856..75d18e2c5856 100644..100755 --- a/testautomation/global/tools/includes/optional/t_locale_tools.inc +++ b/testautomation/global/tools/includes/optional/t_locale_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc index 8384edcc27d1..8384edcc27d1 100644..100755 --- a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc +++ b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc diff --git a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc index 55da2fc1c9aa..55da2fc1c9aa 100644..100755 --- a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc index 77c72a9ec2dc..77c72a9ec2dc 100644..100755 --- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc index 892dbd09bb36..892dbd09bb36 100644..100755 --- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc index e9c254ac07b4..e9c254ac07b4 100755..100644 --- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc +++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc index 7b9dd66e1a40..7b9dd66e1a40 100644..100755 --- a/testautomation/global/tools/includes/optional/t_ui_filters.inc +++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc index d4771be2e3c9..d4771be2e3c9 100644..100755 --- a/testautomation/global/tools/includes/optional/t_user_info.inc +++ b/testautomation/global/tools/includes/optional/t_user_info.inc diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc index 7ccab1c0db88..7ccab1c0db88 100644..100755 --- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc +++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc index 243483be9e7d..243483be9e7d 100755..100644 --- a/testautomation/global/tools/includes/required/t_filters.inc +++ b/testautomation/global/tools/includes/required/t_filters.inc diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc index 7e97c58d2848..7e97c58d2848 100644..100755 --- a/testautomation/global/tools/includes/required/t_option2.inc +++ b/testautomation/global/tools/includes/required/t_option2.inc diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index da1f30a7f696..7cd8e58ed94e 100755 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -114,91 +114,91 @@ Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS OKButton sym:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY CancelButton sym:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY -*Printing .HelpId:vcl:PrintDialog:Dialog -PreviewWindow .HelpId:vcl:PrintDialog:Preview -PreviewPageNumber .HelpId:vcl:PrintDialog:PageEdit -ScrollBackward .HelpId:vcl:PrintDialog:BackwardBtn -ScrollForward .HelpId:vcl:PrintDialog:ForwardBtn -Print .HelpId:vcl:PrintDialog:OK -Cancel .HelpId:vcl:PrintDialog:Cancel +*Printing .HelpID:vcl:PrintDialog:Dialog +PreviewWindow .HelpID:vcl:PrintDialog:Preview +PreviewPageNumber .HelpID:vcl:PrintDialog:PageEdit +ScrollBackward .HelpID:vcl:PrintDialog:BackwardBtn +ScrollForward .HelpID:vcl:PrintDialog:ForwardBtn +Print .HelpID:vcl:PrintDialog:OK +Cancel .HelpID:vcl:PrintDialog:Cancel -PrintingTabControl .HelpId:vcl:PrintDialog:TabPages -TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage -TabApplication .HelpId:vcl:PrintDialog:TabPage:10 -TabLayout .HelpId:vcl:PrintDialog:NUpPage -TabOptions .HelpId:vcl:PrintDialog:OptPage - -*TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage -PrinterList .HelpId:vcl:PrintDialog:JobPage:PrinterList -NumberOfCopies .HelpId:vcl:PrintDialog:JobPage:Copies -Collate .HelpId:vcl:PrintDialog:JobPage:Collate -PrintNotes .HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox -AllPages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 -AllSlides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 -AllSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0 -Pages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 -Slides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 -SelectedSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1 -PrintAllPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:0 -PrintPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:1 -PageRange .HelpId:vcl:PrintDialog:PageRange:Edit -Selection .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2 -SelectedCells .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2 -Details .HelpId:vcl:PrintDialog:JobPage:DetailsBtn -Properties .HelpId:vcl:PrintDialog:JobPage:Properties -PageCount .HelpId:vcl:PrintDialog:NumPagesText -PartsToPrint .HelpId:vcl:PrintDialog:PageContentType:ListBox -SlidesPerPage .HelpId:vcl:PrintDialog:SlidesPerPage:ListBox -ArrangeSlides .HelpId:vcl:PrintDialog:SlidesPerPageOrder:ListBox - -*TabApplication .HelpId:vcl:PrintDialog:TabPage:10 -PrintPageBackground .HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox -PrintGraphicsAndDiagrams .HelpId:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox -PrintPicturesAndObjects .HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox -PrintHiddenText .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox -PrintTextPlaceholder .HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox -PrintFormControls .HelpId:vcl:PrintDialog:PrintControls:CheckBox -PrintTextInBlack .HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox -PrintBlankPages .HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox -IncludeEmptyPages .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox -SlideName .HelpId:vcl:PrintDialog:IsPrintName:CheckBox -DateAndTime .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox -HiddenPages .HelpId:vcl:PrintDialog:IsPrintHidden:CheckBox -TilePaper .HelpId:vcl:PrintDialog:PageOptions:RadioButton:3 -OriginalColors .HelpId:vcl:PrintDialog:Quality:RadioButton:0 -Grayscale .HelpId:vcl:PrintDialog:Quality:RadioButton:1 -BlackAndWhite .HelpId:vcl:PrintDialog:Quality:RadioButton:2 -MultiplePages .HelpId:vcl:PrintDialog:PageOptions:RadioButton:2 -TitleRow .HelpId:vcl:PrintDialog:TitleRow:CheckBox -FormulaText .HelpId:vcl:PrintDialog:FormulaText:CheckBox -Borders .HelpId:vcl:PrintDialog:Border:CheckBox -OriginalSize .HelpId:vcl:PrintDialog:PageOptions:RadioButton:0 -OriginalSizeMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:0 -FitToPage .HelpId:vcl:PrintDialog:PageOptions:RadioButton:1 -FitToPageMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1 -Scaling .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2 -ScalingFactor .HelpId:vcl:PrintDialog:PrintScale:NumericField - -*TabLayout .HelpId:vcl:PrintDialog:NUpPage -PagesPerSheet .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet -NumberOfPages .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheetBox -NumberOfColumns .HelpId:vcl:PrintDialog:NUpPage:ColumnsBox -NumberOfRows .HelpId:vcl:PrintDialog:NUpPage:RowsBox -BorderAroundPages .HelpId:vcl:PrintDialog:NUpPage:BorderBox -Brochure .HelpId:vcl:PrintDialog:NUpPage:Brochure -DistanceBetweenPages .HelpId:vcl:PrintDialog:NUpPage:PageMarginBox -MarginToSheetBorder .HelpId:vcl:PrintDialog:NUpPage:SheetMarginBox -PaperOrientation .HelpId:vcl:PrintDialog:NUpPage:OrientationBox -PrintOrder .HelpId:vcl:PrintDialog:NUpPage:OrderBox -IncludePages .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox -PrintBrochureRTL .HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox -BrochurePageSides .HelpId:vcl:PrintDialog:PrintProspectInclude:ListBox - -*TabOptions .HelpId:vcl:PrintDialog:OptPage -PrintToFile .HelpId:vcl:PrintDialog:OptPage:ToFile -PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs -PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse -PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox +PrintingTabControl .HelpID:vcl:PrintDialog:TabPages +TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage +TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage +TabLayout .HelpID:vcl:PrintDialog:NUpPage +TabOptions .HelpID:vcl:PrintDialog:OptPage + +*TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage +PrinterList .HelpID:vcl:PrintDialog:JobPage:PrinterList +NumberOfCopies .HelpID:vcl:PrintDialog:JobPage:Copies +Collate .HelpID:vcl:PrintDialog:JobPage:Collate +PrintNotes .HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText +AllPages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0 +AllSlides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0 +AllSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0 +Pages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1 +Slides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1 +SelectedSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1 +PrintAllPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:0 +PrintPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:1 +PageRange .HelpID:vcl:PrintDialog:PageRange:Edit +Selection .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2 +SelectedCells .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2 +Details .HelpID:vcl:PrintDialog:JobPage:DetailsBtn +Properties .HelpID:vcl:PrintDialog:JobPage:Properties +PageCount .HelpID:vcl:PrintDialog:NumPagesText +PartsToPrint .HelpID:vcl:PrintDialog:PageContentType:ListBox +SlidesPerPage .HelpID:vcl:PrintDialog:SlidesPerPage:ListBox +ArrangeSlides .HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox + +*TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage +PrintPageBackground .HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox +PrintGraphicsAndDiagrams .HelpID:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox +PrintPicturesAndObjects .HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox +PrintHiddenText .HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox +PrintTextPlaceholder .HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox +PrintFormControls .HelpID:vcl:PrintDialog:PrintControls:CheckBox +PrintTextInBlack .HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox +PrintBlankPages .HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox +IncludeEmptyPages .HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox +SlideName .HelpID:vcl:PrintDialog:IsPrintName:CheckBox +DateAndTime .HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox +HiddenPages .HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox +TilePaper .HelpID:vcl:PrintDialog:PageOptions:RadioButton:3 +OriginalColors .HelpID:vcl:PrintDialog:Quality:RadioButton:0 +Grayscale .HelpID:vcl:PrintDialog:Quality:RadioButton:1 +BlackAndWhite .HelpID:vcl:PrintDialog:Quality:RadioButton:2 +MultiplePages .HelpID:vcl:PrintDialog:PageOptions:RadioButton:2 +TitleRow .HelpID:vcl:PrintDialog:TitleRow:CheckBox +FormulaText .HelpID:vcl:PrintDialog:FormulaText:CheckBox +Borders .HelpID:vcl:PrintDialog:Border:CheckBox +OriginalSize .HelpID:vcl:PrintDialog:PageOptions:RadioButton:0 +OriginalSizeMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0 +FitToPage .HelpID:vcl:PrintDialog:PageOptions:RadioButton:1 +FitToPageMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1 +Scaling .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2 +ScalingFactor .HelpID:vcl:PrintDialog:PrintScale:NumericField + +*TabLayout .HelpID:vcl:PrintDialog:NUpPage +PagesPerSheet .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet +NumberOfPages .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox +NumberOfColumns .HelpID:vcl:PrintDialog:NUpPage:ColumnsBox +NumberOfRows .HelpID:vcl:PrintDialog:NUpPage:RowsBox +BorderAroundPages .HelpID:vcl:PrintDialog:NUpPage:BorderBox +Brochure .HelpID:vcl:PrintDialog:NUpPage:Brochure +DistanceBetweenPages .HelpID:vcl:PrintDialog:NUpPage:PageMarginBox +MarginToSheetBorder .HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox +PaperOrientation .HelpID:vcl:PrintDialog:NUpPage:OrientationBox +PrintOrder .HelpID:vcl:PrintDialog:NUpPage:OrderBox +IncludePages .HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox +PrintBrochureRTL .HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox +BrochurePageSides .HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox + +*TabOptions .HelpID:vcl:PrintDialog:OptPage +PrintToFile .HelpID:vcl:PrintDialog:OptPage:ToFile +PrintAsSingleJobs .HelpID:vcl:PrintDialog:OptPage:SingleJobs +PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse +PaperTrayFromPrefs .HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox *PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG TabPurchase sym:TAB_HID_TP_PURCHASE diff --git a/testautomation/spreadsheet/optional/c_solver.bas b/testautomation/spreadsheet/optional/c_solver.bas index 60744c0ef319..60744c0ef319 100644..100755 --- a/testautomation/spreadsheet/optional/c_solver.bas +++ b/testautomation/spreadsheet/optional/c_solver.bas diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index 694c3dec0de4..694c3dec0de4 100755..100644 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index 4fca2bdbddb6..466b0c99ab15 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -868,7 +868,7 @@ testcase tTextframes_28 printlog "Insert a frame" Call fInsertFrame(30, 30, 60, 60) - + Sleep 2 printlog "Naming the frame" Call fFormatFrame("TabZusaetze") ObjektName.SetText sFrameName1 @@ -885,7 +885,7 @@ testcase tTextframes_28 printlog "Insert another frame" Call fInsertFrame(50, 50, 80, 80) - + Sleep 2 printlog "Naming the frame" Call fFormatFrame("TabZusaetze") ObjektName.SetText sFrameName2 diff --git a/testautomation/writer/optional/input/import/dostext.txt b/testautomation/writer/optional/input/import/dostext.txt index 7e6c1044cd3a..7e6c1044cd3a 100644..100755 --- a/testautomation/writer/optional/input/import/dostext.txt +++ b/testautomation/writer/optional/input/import/dostext.txt diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index b33751752512..b33751752512 100644..100755 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc diff --git a/testautomation/writer/required/includes/w_010_1.inc b/testautomation/writer/required/includes/w_010_1.inc index 5b746eaf4ad2..5b746eaf4ad2 100644..100755 --- a/testautomation/writer/required/includes/w_010_1.inc +++ b/testautomation/writer/required/includes/w_010_1.inc diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index 9235d1b83d7b..9235d1b83d7b 100755..100644 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc diff --git a/testautomation/writer/tools/includes/w_get_locale_strings.inc b/testautomation/writer/tools/includes/w_get_locale_strings.inc index 23cd09eedadb..23cd09eedadb 100644..100755 --- a/testautomation/writer/tools/includes/w_get_locale_strings.inc +++ b/testautomation/writer/tools/includes/w_get_locale_strings.inc diff --git a/testautomation/writer/tools/includes/w_tool5.inc b/testautomation/writer/tools/includes/w_tool5.inc index 6ac59f3f8365..6ac59f3f8365 100644..100755 --- a/testautomation/writer/tools/includes/w_tool5.inc +++ b/testautomation/writer/tools/includes/w_tool5.inc diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 33ddca87709e..9bc7ed688d9b 100755..100644 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc @@ -38,6 +38,10 @@ sub wOfficeRestart FileExit "SynchronMode", TRUE Call hStartTheOffice + + ' Open new document + Call hNewDocument + end sub '-------------------------------------------------------------- diff --git a/testautomation/writer/tools/includes/w_tool7.inc b/testautomation/writer/tools/includes/w_tool7.inc index 1079a4c3dbcc..1079a4c3dbcc 100644..100755 --- a/testautomation/writer/tools/includes/w_tool7.inc +++ b/testautomation/writer/tools/includes/w_tool7.inc diff --git a/testautomation/writer/tools/includes/w_tools_autocorrection.inc b/testautomation/writer/tools/includes/w_tools_autocorrection.inc index 0b745c207696..0b745c207696 100644..100755 --- a/testautomation/writer/tools/includes/w_tools_autocorrection.inc +++ b/testautomation/writer/tools/includes/w_tools_autocorrection.inc diff --git a/testautomation/writer/tools/includes/w_tools_drawing.inc b/testautomation/writer/tools/includes/w_tools_drawing.inc index 6fd3064f4d88..6fd3064f4d88 100644..100755 --- a/testautomation/writer/tools/includes/w_tools_drawing.inc +++ b/testautomation/writer/tools/includes/w_tools_drawing.inc diff --git a/testautomation/writer/tools/includes/w_tools_hyphenation.inc b/testautomation/writer/tools/includes/w_tools_hyphenation.inc index 8511197269db..8511197269db 100644..100755 --- a/testautomation/writer/tools/includes/w_tools_hyphenation.inc +++ b/testautomation/writer/tools/includes/w_tools_hyphenation.inc diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc index 8040b34dc841..8040b34dc841 100644..100755 --- a/testautomation/writer/tools/includes/w_tools_undo.inc +++ b/testautomation/writer/tools/includes/w_tools_undo.inc diff --git a/testautomation/xml/optional/includes/c_datapilot_pagefields.inc b/testautomation/xml/optional/includes/c_datapilot_pagefields.inc index c35cf7785f0b..c35cf7785f0b 100644..100755 --- a/testautomation/xml/optional/includes/c_datapilot_pagefields.inc +++ b/testautomation/xml/optional/includes/c_datapilot_pagefields.inc diff --git a/testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc b/testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc index f6a50d831649..f6a50d831649 100644..100755 --- a/testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc +++ b/testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc diff --git a/testautomation/xml/optional/includes/docbook_001.inc b/testautomation/xml/optional/includes/docbook_001.inc index aa2a2322f791..aa2a2322f791 100644..100755 --- a/testautomation/xml/optional/includes/docbook_001.inc +++ b/testautomation/xml/optional/includes/docbook_001.inc |