[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 1517 commits - qadevOOo/makefile.mk qadevOOo/prj qadevOOo/qa qadevOOo/runner qadevOOo/tests smoketestoo_native/data smoketestoo_native/makefile.mk smoketestoo_native/smoketest.cxx testautomation/chart2 testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global testautomation/graphics testautomation/math testautomation/spreadsheet testautomation/tools testautomation/writer testautomation/xml testgraphical/prj test/inc test/prj test/source testtools/com testtools/prj testtools/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Mar 3 05:49:27 PST 2011
dev/null |binary
qadevOOo/makefile.mk | 2
qadevOOo/prj/build.lst | 3
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 194
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 41
qadevOOo/qa/complex/junitskeleton/justatest.java | 38
qadevOOo/qa/complex/junitskeleton/makefile.mk | 63
qadevOOo/qa/complex/junitskeleton/test_documents/README.txt | 1
qadevOOo/runner/graphical/EnhancedComplexTestCase.java | 22
qadevOOo/runner/graphical/JPEGCreator.java | 3
qadevOOo/runner/graphical/JPEGEvaluator.java | 2
qadevOOo/runner/graphical/Office.java | 1
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 21
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 3
qadevOOo/runner/graphical/ParameterHelper.java | 3
qadevOOo/runner/graphical/PostscriptCreator.java | 3
qadevOOo/runner/helper/OfficeProvider.java | 6
qadevOOo/runner/helper/ProcessHandler.java | 210
qadevOOo/runner/org/openoffice/Runner.java | 2
qadevOOo/runner/stats/Summarizer.java | 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 28
smoketestoo_native/data/Events.xml | 22
smoketestoo_native/data/Global.xml | 36
smoketestoo_native/data/OptionsDlg.xml | 19
smoketestoo_native/data/Test_10er.xml | 161
smoketestoo_native/data/content.xml | 2
smoketestoo_native/makefile.mk | 3
smoketestoo_native/smoketest.cxx | 24
test/inc/test/gettestargument.hxx | 46
test/inc/test/officeconnection.hxx | 12
test/inc/test/uniquepipename.hxx | 44
test/prj/build.lst | 2
test/prj/d.lst | 3
test/source/cpp/getargument.cxx | 6
test/source/cpp/getargument.hxx | 44
test/source/cpp/gettestargument.cxx | 43
test/source/cpp/makefile.mk | 4
test/source/cpp/officeconnection.cxx | 54
test/source/cpp/uniquepipename.cxx | 48
test/source/java/org/openoffice/test/Argument.java | 36
test/source/java/org/openoffice/test/FileHelper.java | 62
test/source/java/org/openoffice/test/OfficeConnection.java | 222
test/source/java/org/openoffice/test/OfficeFileUrl.java | 42
test/source/java/org/openoffice/test/TestArgument.java | 39
test/source/java/org/openoffice/test/makefile.mk | 54
testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc | 4
testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 2
testautomation/chart2/tools/ch_tools_common.inc | 8
testautomation/dbaccess/optional/includes/ctrl_General.inc | 92
testautomation/dbaccess/optional/includes/ctrl_Several2.inc | 4
testautomation/dbaccess/optional/includes/ctrl_Wizards.inc | 8
testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc | 32
testautomation/dbaccess/tools/dbcreatetools.inc | 11
testautomation/extensions/optional/includes/online_update.inc | 2
testautomation/extensions/optional/includes/platforms.inc | 2
testautomation/extensions/optional/includes/publisher.inc | 4
testautomation/extensions/optional/input/dependencies/version34.oxt |binary
testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl | 2
testautomation/extensions/required/includes/e_update.inc | 14
testautomation/framework/optional/f_basic_gridcontrol.bas | 14
testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc | 19
testautomation/framework/optional/includes/basic_formcontrols.inc | 2
testautomation/framework/optional/includes/basic_gridcontrol.inc | 67
testautomation/framework/optional/includes/basic_package_import.inc | 4
testautomation/framework/optional/includes/basic_shared_modules.inc | 2
testautomation/framework/optional/includes/basic_spectemplate.inc | 4
testautomation/framework/optional/includes/basic_vba-compat_application-union.inc | 8
testautomation/framework/optional/includes/extras_modify_objects.inc | 100
testautomation/framework/optional/includes/f_usage_tracking.inc | 2
testautomation/framework/optional/includes/options_loadsave_general.inc | 103
testautomation/framework/optional/includes/options_ooo_colors.inc | 15
testautomation/framework/optional/includes/options_ooo_general.inc | 252
testautomation/framework/optional/includes/security_incorrect_password.inc | 8
testautomation/framework/optional/includes/w_grid_layout1.inc | 21
testautomation/framework/optional/input/filternames/OpenOffice.org_Filternames_en-US.txt | 2
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_add_en-US.txt | 2
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_en-US.txt | 2
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt |21694 +++++-----
testautomation/framework/required/includes/window_functions.inc | 8
testautomation/framework/tools/includes/template_tools.inc | 36
testautomation/global/hid/hid.lst | 6
testautomation/global/hid/readme.txt | 130
testautomation/global/input/officeinfo.txt | 6
testautomation/global/required/includes/g_option.inc | 11
testautomation/global/required/includes/g_printing.inc | 2
testautomation/global/sid/all.sid | 989
testautomation/global/sid/bars.sid | 1115
testautomation/global/sid/context.sid | 36
testautomation/global/sid/e_all.sid | 1014
testautomation/global/sid/others.sid | 41
testautomation/global/system/includes/gvariabl.inc | 11
testautomation/global/system/includes/master.inc | 102
testautomation/global/tools/includes/optional/t_control_objects.inc | 2
testautomation/global/tools/includes/optional/t_filetools.inc | 93
testautomation/global/tools/includes/optional/t_macro_tools.inc | 40
testautomation/global/tools/includes/required/t_dir.inc | 51
testautomation/global/tools/includes/required/t_doc1.inc | 19
testautomation/global/tools/includes/required/t_doc2.inc | 129
testautomation/global/tools/includes/required/t_files.inc | 165
testautomation/global/tools/includes/required/t_menu.inc | 6
testautomation/global/tools/includes/required/t_tools2.inc | 26
testautomation/global/win/bars.win | 362
testautomation/global/win/dial_a_c.win | 522
testautomation/global/win/dial_d_h.win | 1119
testautomation/global/win/dial_i_o.win | 851
testautomation/global/win/dial_p_s.win | 756
testautomation/global/win/dial_t_z.win | 648
testautomation/global/win/dokument.win | 98
testautomation/global/win/e_mathop.win | 386
testautomation/global/win/edia_a_c.win | 930
testautomation/global/win/edia_d_h.win | 1005
testautomation/global/win/edia_i_o.win | 613
testautomation/global/win/edia_p_s.win | 1295
testautomation/global/win/edia_t_z.win | 550
testautomation/global/win/etab_a_d.win | 910
testautomation/global/win/etab_e_g.win | 678
testautomation/global/win/etab_h_o.win | 464
testautomation/global/win/etab_p_s.win | 216
testautomation/global/win/etab_t_z.win | 292
testautomation/global/win/etoolbox.win | 90
testautomation/global/win/mathop.win | 382
testautomation/global/win/piloten.win | 130
testautomation/global/win/reportdesigner.win | 126
testautomation/global/win/spadmin.win | 210
testautomation/global/win/sys_dial.win | 184
testautomation/global/win/tab_a_d.win | 724
testautomation/global/win/tab_e_g.win | 540
testautomation/global/win/tab_h_o.win | 946
testautomation/global/win/tab_p_s.win | 524
testautomation/global/win/tab_t_z.win | 738
testautomation/global/win/w_autop.win | 56
testautomation/graphics/optional/d_export_graphic_a.bas | 20
testautomation/graphics/optional/d_export_graphic_b.bas | 20
testautomation/graphics/optional/export_graphic_a.bas | 20
testautomation/graphics/optional/export_graphic_b.bas | 20
testautomation/graphics/optional/g_spellcheck.bas | 17
testautomation/graphics/optional/i_only_updt_1.bas | 77
testautomation/graphics/optional/i_only_updt_2.bas | 76
testautomation/graphics/optional/i_slideshow.bas | 2
testautomation/graphics/optional/i_us_presentation.bas | 9
testautomation/graphics/optional/includes/draw/d_002_.inc | 109
testautomation/graphics/optional/includes/draw/d_003_.inc | 82
testautomation/graphics/optional/includes/draw/d_005_.inc | 51
testautomation/graphics/optional/includes/draw/d_007.inc | 47
testautomation/graphics/optional/includes/global/export_graphic.inc | 287
testautomation/graphics/optional/includes/global/export_graphic_2.inc | 833
testautomation/graphics/optional/includes/global/g_area.inc | 664
testautomation/graphics/optional/includes/global/g_arrangealign.inc | 150
testautomation/graphics/optional/includes/global/g_autocorrection.inc | 22
testautomation/graphics/optional/includes/global/g_character.inc | 191
testautomation/graphics/optional/includes/global/g_clipboard.inc | 299
testautomation/graphics/optional/includes/global/g_clipexport.inc | 209
testautomation/graphics/optional/includes/global/g_clipexport2.inc | 20
testautomation/graphics/optional/includes/global/g_clipexport3.inc | 51
testautomation/graphics/optional/includes/global/g_convertto.inc | 221
testautomation/graphics/optional/includes/global/g_crossfading.inc | 259
testautomation/graphics/optional/includes/global/g_customshapes.inc | 138
testautomation/graphics/optional/includes/global/g_demoguide.inc | 119
testautomation/graphics/optional/includes/global/g_edit.inc | 322
testautomation/graphics/optional/includes/global/g_find_replace.inc | 100
testautomation/graphics/optional/includes/global/g_format.inc | 1507
testautomation/graphics/optional/includes/global/g_group.inc | 143
testautomation/graphics/optional/includes/global/g_imagemap.inc | 131
testautomation/graphics/optional/includes/global/g_line.inc | 244
testautomation/graphics/optional/includes/global/g_load_save.inc | 357
testautomation/graphics/optional/includes/global/g_mediaplayer.inc | 103
testautomation/graphics/optional/includes/global/g_paneview.inc | 4
testautomation/graphics/optional/includes/global/g_shaddow.inc | 192
testautomation/graphics/optional/includes/global/g_spellcheck.inc | 985
testautomation/graphics/optional/includes/global/g_stylist.inc | 89
testautomation/graphics/optional/includes/global/g_tables.inc | 15
testautomation/graphics/optional/includes/global/g_tools.inc | 310
testautomation/graphics/optional/includes/global/g_zoom.inc | 34
testautomation/graphics/optional/includes/global/id_001.inc | 725
testautomation/graphics/optional/includes/global/id_002.inc | 440
testautomation/graphics/optional/includes/global/id_003.inc | 264
testautomation/graphics/optional/includes/global/id_004.inc | 370
testautomation/graphics/optional/includes/global/id_005.inc | 808
testautomation/graphics/optional/includes/global/id_006.inc | 362
testautomation/graphics/optional/includes/global/id_007.inc | 426
testautomation/graphics/optional/includes/global/id_008.inc | 71
testautomation/graphics/optional/includes/global/id_009.inc | 243
testautomation/graphics/optional/includes/global/id_011.inc | 995
testautomation/graphics/optional/includes/impress/i_animation.inc | 309
testautomation/graphics/optional/includes/impress/i_headerfooter.inc | 220
testautomation/graphics/optional/includes/impress/i_pengine.inc | 884
testautomation/graphics/optional/includes/impress/i_pengine1.inc | 336
testautomation/graphics/optional/includes/impress/i_pengine2.inc | 163
testautomation/graphics/optional/includes/impress/i_slidecopy.inc | 151
testautomation/graphics/optional/includes/impress/i_slidelayer.inc | 181
testautomation/graphics/optional/includes/impress/i_slideshow.inc | 537
testautomation/graphics/optional/includes/impress/i_slideshow2.inc | 227
testautomation/graphics/optional/includes/impress/i_slideshow3.inc | 1939
testautomation/graphics/optional/includes/impress/i_stylist.inc | 39
testautomation/graphics/optional/includes/impress/i_us2_present.inc | 86
testautomation/graphics/optional/includes/impress/i_us_present.inc | 397
testautomation/graphics/optional/includes/impress/i_view.inc | 142
testautomation/graphics/optional/includes/impress/im_002_.inc | 52
testautomation/graphics/optional/includes/impress/im_003_.inc | 254
testautomation/graphics/optional/includes/impress/im_004_.inc | 58
testautomation/graphics/optional/includes/impress/im_005_.inc | 50
testautomation/graphics/optional/includes/impress/im_007_.inc | 693
testautomation/graphics/optional/includes/impress/im_011_.inc | 173
testautomation/graphics/optional/includes/impress/options.inc | 24
testautomation/graphics/required/includes/global/gallery.inc | 987
testautomation/graphics/required/includes/global/gallery2.inc | 290
testautomation/graphics/required/includes/global/id_001.inc | 37
testautomation/graphics/required/includes/global/id_002.inc | 21
testautomation/graphics/required/includes/global/id_003.inc | 15
testautomation/graphics/required/includes/global/id_004.inc | 60
testautomation/graphics/required/includes/global/id_005.inc | 31
testautomation/graphics/required/includes/global/id_006.inc | 447
testautomation/graphics/required/includes/global/id_007.inc | 514
testautomation/graphics/required/includes/global/id_008.inc | 61
testautomation/graphics/required/includes/global/id_009.inc | 408
testautomation/graphics/required/includes/global/id_011.inc | 1863
testautomation/graphics/required/includes/global/id_opt_1.inc | 1437
testautomation/graphics/required/includes/global/id_opt_2.inc | 48
testautomation/graphics/required/includes/impress/im_003_.inc | 64
testautomation/graphics/required/includes/impress/im_004_.inc | 31
testautomation/graphics/required/includes/impress/im_005_.inc | 4
testautomation/graphics/required/includes/impress/im_007_.inc | 26
testautomation/graphics/required/includes/impress/im_011_.inc | 2
testautomation/graphics/required/input/recht_1.odg |binary
testautomation/graphics/required/input/recht_1.odp |binary
testautomation/graphics/required/input/recht_3.odg |binary
testautomation/graphics/required/input/recht_3.odp |binary
testautomation/graphics/required/input/recht_31.odg |binary
testautomation/graphics/required/input/recht_31.odp |binary
testautomation/graphics/required/input/recht_33.odg |binary
testautomation/graphics/required/input/recht_33.odp |binary
testautomation/graphics/required/input/recht_34.odg |binary
testautomation/graphics/required/input/recht_34.odp |binary
testautomation/graphics/required/input/recht_36.odg |binary
testautomation/graphics/required/input/recht_36.odp |binary
testautomation/graphics/required/input/recht_39.odg |binary
testautomation/graphics/required/input/recht_39.odp |binary
testautomation/graphics/required/input/recht_46.odg |binary
testautomation/graphics/required/input/recht_46.odp |binary
testautomation/graphics/required/input/recht_48.odg |binary
testautomation/graphics/required/input/recht_48.odp |binary
testautomation/graphics/required/input/recht_49.odg |binary
testautomation/graphics/required/input/recht_49.odp |binary
testautomation/graphics/required/input/recht_55.odg |binary
testautomation/graphics/required/input/recht_55.odp |binary
testautomation/graphics/tools/id_tools.inc | 76
testautomation/graphics/tools/id_tools_2.inc | 256
testautomation/graphics/tools/makeLokaleTxt.bas | 20
testautomation/math/optional/includes/m_101_.inc | 27
testautomation/math/optional/includes/m_105.inc | 2
testautomation/math/required/includes/m_005_.inc | 11
testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc | 14
testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc | 12
testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc | 27
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc | 101
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc | 156
testautomation/spreadsheet/optional/includes/solver/c_solver.inc | 8
testautomation/spreadsheet/optional/includes/validity/c_validity.inc | 574
testautomation/spreadsheet/required/includes/c_upd_datamenu.inc | 10
testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc | 5
testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 17
testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc | 4
testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc | 29
testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc | 39
testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc | 34
testautomation/spreadsheet/tools/includes/c_l10n_tools.inc | 221
testautomation/spreadsheet/tools/input/Functionnames.ods |binary
testautomation/tools/hid/cons.txt | 83
testautomation/tools/hid/hid.bat | 2
testautomation/tools/hid/hid.pl | 92
testautomation/tools/hid/hid.sh | 2
testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc | 9
testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc | 32
testautomation/writer/optional/includes/clipboard/clipbrd_func.inc | 4
testautomation/writer/optional/includes/clipboard/w_210_.inc | 12
testautomation/writer/optional/includes/clipboard/w_211_.inc | 18
testautomation/writer/optional/includes/clipboard/w_212_.inc | 18
testautomation/writer/optional/includes/clipboard/w_213_.inc | 18
testautomation/writer/optional/includes/clipboard/w_214_.inc | 18
testautomation/writer/optional/includes/clipboard/w_215_.inc | 36
testautomation/writer/optional/includes/clipboard/w_216_.inc | 30
testautomation/writer/optional/includes/clipboard/w_217_.inc | 34
testautomation/writer/optional/includes/clipboard/w_218_.inc | 34
testautomation/writer/optional/includes/clipboard/w_219_.inc | 34
testautomation/writer/optional/includes/clipboard/w_220_.inc | 36
testautomation/writer/optional/includes/clipboard/w_221_.inc | 42
testautomation/writer/optional/includes/clipboard/w_222_.inc | 42
testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc | 32
testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc | 67
testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc | 4
testautomation/writer/optional/includes/fields/w_fields1.inc | 12
testautomation/writer/optional/includes/fields/w_fields2.inc | 179
testautomation/writer/optional/includes/fields/w_fields3.inc | 20
testautomation/writer/optional/includes/fields/w_fields4.inc | 114
testautomation/writer/optional/includes/fields/w_fields5.inc | 4
testautomation/writer/optional/includes/fields/w_fields6.inc | 4
testautomation/writer/optional/includes/fields/w_fields7.inc | 35
testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc | 163
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc | 18
testautomation/writer/optional/includes/formatpage/w_formatpage2.inc | 32
testautomation/writer/optional/includes/formatpage/w_formatpage3.inc | 38
testautomation/writer/optional/includes/formatpage/w_formatpage4.inc | 8
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc | 56
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc | 107
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc | 44
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc | 42
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc | 60
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc | 39
testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc | 16
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc | 12
testautomation/writer/optional/includes/loadsave/w_loadsave.inc | 415
testautomation/writer/optional/includes/navigator/w_navigator.inc | 18
testautomation/writer/optional/includes/number/w_205_.inc | 8
testautomation/writer/optional/includes/number/w_205a_.inc | 18
testautomation/writer/optional/includes/number/w_206_.inc | 4
testautomation/writer/optional/includes/number/w_207_.inc | 10
testautomation/writer/optional/includes/option/wh_o_1.inc | 12
testautomation/writer/optional/includes/option/wh_o_2.inc | 22
testautomation/writer/optional/includes/option/wr_o_1.inc | 16
testautomation/writer/optional/includes/option/wr_o_2.inc | 38
testautomation/writer/optional/includes/option/wr_o_3.inc | 16
testautomation/writer/optional/includes/option/wr_o_4.inc | 5
testautomation/writer/optional/includes/option/wr_o_a.inc | 4
testautomation/writer/optional/includes/redlining/w_redlining1.inc | 4
testautomation/writer/optional/includes/regexp/regular.inc | 4
testautomation/writer/optional/includes/regexp/search.inc | 12
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 22
testautomation/writer/optional/includes/section/w_section_3.inc | 4
testautomation/writer/optional/includes/section/w_section_4.inc | 12
testautomation/writer/optional/includes/shortcut/w_shortcuts.inc | 3
testautomation/writer/optional/includes/sorting/w_sorting1.inc | 39
testautomation/writer/optional/includes/sorting/w_sorting2.inc | 8
testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 48
testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc | 2
testautomation/writer/optional/includes/textframes/w_textframes1.inc | 36
testautomation/writer/optional/includes/textframes/w_textframes2.inc | 24
testautomation/writer/optional/includes/textframes/w_textframes3.inc | 12
testautomation/writer/optional/includes/textframes/w_textframes4.inc | 80
testautomation/writer/optional/includes/textframes/w_textframes5.inc | 40
testautomation/writer/optional/includes/tools/tools1.inc | 4
testautomation/writer/optional/includes/undo/w_undo_history_4.inc | 4
testautomation/writer/optional/w_clipbrd.bas | 48
testautomation/writer/required/includes/w_001_.inc | 6
testautomation/writer/required/includes/w_001b_.inc | 25
testautomation/writer/required/includes/w_007_.inc | 18
testautomation/writer/tools/includes/w_tool3.inc | 2
testautomation/writer/tools/includes/w_tool6.inc | 4
testautomation/writer/tools/includes/w_tools.inc | 26
testgraphical/prj/build.lst | 4
testtools/com/sun/star/comp/bridge/TestComponent.java | 19
testtools/prj/build.lst | 4
testtools/source/bridgetest/bridgetest.component | 34
testtools/source/bridgetest/bridgetest.cxx | 1116
testtools/source/bridgetest/constructors.component | 37
testtools/source/bridgetest/constructors.cxx | 7
testtools/source/bridgetest/cppobj.component | 34
testtools/source/bridgetest/cppobj.cxx | 24
testtools/source/bridgetest/currentcontextchecker.cxx | 12
testtools/source/bridgetest/makefile.mk | 93
testtools/source/bridgetest/pyuno/makefile.mk | 25
testtools/source/bridgetest/testComponent.component | 38
361 files changed, 34914 insertions(+), 42030 deletions(-)
New commits:
commit 8a454883914eec595e170f71a97acac6bcbe24f4
Merge: a43431f... 6b204e9...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Mar 3 13:36:36 2011 +0000
Merge remote branch 'stage/ooo/dev300_m98_fixed' into integration/dev300_m98
Conflicts:
qadevOOo/prj/build.lst
qadevOOo/qa/complex/junitskeleton/makefile.mk
qadevOOo/runner/graphical/EnhancedComplexTestCase.java
qadevOOo/runner/graphical/Office.java
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
qadevOOo/runner/graphical/ParameterHelper.java
qadevOOo/runner/org/openoffice/Runner.java
qadevOOo/runner/stats/Summarizer.java
qadevOOo/runner/util/utils.java
qadevOOo/tests/java/ifc/beans/_XPropertySet.java
smoketestoo_native/data/Events.xml
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/Test_DB.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
smoketestoo_native/smoketest.cxx
test/inc/pch/precompiled_test.cxx
test/inc/pch/precompiled_test.hxx
test/inc/test/detail/testdllapi.hxx
test/inc/test/officeconnection.hxx
test/inc/test/oustringostreaminserter.hxx
test/inc/test/toabsolutefileurl.hxx
test/prj/build.lst
test/prj/d.lst
test/source/cpp/getargument.cxx
test/source/cpp/makefile.mk
test/source/cpp/officeconnection.cxx
test/source/cpp/toabsolutefileurl.cxx
test/source/java/makefile.mk
testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
testautomation/chart2/tools/ch_tools_common.inc
testautomation/extensions/optional/includes/publisher.inc
testautomation/extensions/optional/input/dependencies/version34.oxt
testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl
testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
testautomation/framework/optional/includes/basic_formcontrols.inc
testautomation/framework/optional/includes/basic_gridcontrol.inc
testautomation/framework/optional/includes/basic_package_import.inc
testautomation/framework/optional/includes/basic_shared_modules.inc
testautomation/framework/optional/includes/basic_vba-compat_application-union.inc
testautomation/framework/optional/includes/extras_modify_objects.inc
testautomation/framework/optional/includes/options_ooo_general.inc
testautomation/framework/optional/includes/security_incorrect_password.inc
testautomation/framework/optional/includes/w_grid_layout1.inc
testautomation/framework/optional/input/filternames/OpenOffice.org_Filternames_en-US.txt
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_add_en-US.txt
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_en-US.txt
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
testautomation/framework/required/includes/window_functions.inc
testautomation/global/input/officeinfo.txt
testautomation/global/required/includes/g_printing.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/context.sid
testautomation/global/sid/e_all.sid
testautomation/global/system/includes/iniinfo.inc
testautomation/global/tools/includes/optional/t_control_objects.inc
testautomation/global/tools/includes/optional/t_filetools.inc
testautomation/global/tools/includes/optional/t_macro_tools.inc
testautomation/global/tools/includes/optional/t_security_tools.inc
testautomation/global/tools/includes/required/t_doc1.inc
testautomation/global/tools/includes/required/t_doc2.inc
testautomation/global/tools/includes/required/t_files.inc
testautomation/global/win/bars.win
testautomation/global/win/dial_a_c.win
testautomation/global/win/dial_d_h.win
testautomation/global/win/dial_i_o.win
testautomation/global/win/dial_p_s.win
testautomation/global/win/dial_t_z.win
testautomation/global/win/edia_a_c.win
testautomation/global/win/edia_d_h.win
testautomation/global/win/edia_i_o.win
testautomation/global/win/edia_p_s.win
testautomation/global/win/edia_t_z.win
testautomation/global/win/etab_a_d.win
testautomation/global/win/etab_e_g.win
testautomation/global/win/etab_h_o.win
testautomation/global/win/etab_p_s.win
testautomation/global/win/etab_t_z.win
testautomation/global/win/spadmin.win
testautomation/global/win/sys_dial.win
testautomation/global/win/tab_a_d.win
testautomation/global/win/tab_e_g.win
testautomation/global/win/tab_h_o.win
testautomation/global/win/tab_p_s.win
testautomation/global/win/tab_t_z.win
testautomation/graphics/optional/i_only_updt_1.bas
testautomation/graphics/optional/i_only_updt_2.bas
testautomation/graphics/optional/includes/draw/d_002_.inc
testautomation/graphics/optional/includes/draw/d_003_.inc
testautomation/graphics/optional/includes/draw/d_005_.inc
testautomation/graphics/optional/includes/draw/d_007.inc
testautomation/graphics/optional/includes/global/export_graphic.inc
testautomation/graphics/optional/includes/global/export_graphic_2.inc
testautomation/graphics/optional/includes/global/g_arrangealign.inc
testautomation/graphics/optional/includes/global/g_convertto.inc
testautomation/graphics/optional/includes/global/g_crossfading.inc
testautomation/graphics/optional/includes/global/g_customshapes.inc
testautomation/graphics/optional/includes/global/g_demoguide.inc
testautomation/graphics/optional/includes/global/g_edit.inc
testautomation/graphics/optional/includes/global/g_find_replace.inc
testautomation/graphics/optional/includes/global/g_format.inc
testautomation/graphics/optional/includes/global/g_group.inc
testautomation/graphics/optional/includes/global/g_line.inc
testautomation/graphics/optional/includes/global/g_spellcheck.inc
testautomation/graphics/optional/includes/global/g_stylist.inc
testautomation/graphics/optional/includes/global/g_tables.inc
testautomation/graphics/optional/includes/global/g_tools.inc
testautomation/graphics/optional/includes/global/id_001.inc
testautomation/graphics/optional/includes/global/id_002.inc
testautomation/graphics/optional/includes/global/id_003.inc
testautomation/graphics/optional/includes/global/id_004.inc
testautomation/graphics/optional/includes/global/id_005.inc
testautomation/graphics/optional/includes/global/id_006.inc
testautomation/graphics/optional/includes/global/id_007.inc
testautomation/graphics/optional/includes/global/id_008.inc
testautomation/graphics/optional/includes/global/id_009.inc
testautomation/graphics/optional/includes/global/id_011.inc
testautomation/graphics/optional/includes/impress/i_animation.inc
testautomation/graphics/optional/includes/impress/i_slidecopy.inc
testautomation/graphics/optional/includes/impress/i_slidelayer.inc
testautomation/graphics/optional/includes/impress/i_slideshow.inc
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testautomation/graphics/optional/includes/impress/i_us2_present.inc
testautomation/graphics/optional/includes/impress/i_us_present.inc
testautomation/graphics/optional/includes/impress/im_002_.inc
testautomation/graphics/optional/includes/impress/im_003_.inc
testautomation/graphics/optional/includes/impress/im_004_.inc
testautomation/graphics/optional/includes/impress/im_005_.inc
testautomation/graphics/optional/includes/impress/im_007_.inc
testautomation/graphics/optional/includes/impress/im_011_.inc
testautomation/graphics/required/includes/global/gallery.inc
testautomation/graphics/required/includes/global/gallery2.inc
testautomation/graphics/required/includes/global/id_001.inc
testautomation/graphics/required/includes/global/id_002.inc
testautomation/graphics/required/includes/global/id_003.inc
testautomation/graphics/required/includes/global/id_004.inc
testautomation/graphics/required/includes/global/id_005.inc
testautomation/graphics/required/includes/global/id_006.inc
testautomation/graphics/required/includes/global/id_007.inc
testautomation/graphics/required/includes/global/id_009.inc
testautomation/graphics/required/includes/global/id_011.inc
testautomation/graphics/required/includes/impress/im_003_.inc
testautomation/graphics/required/includes/impress/im_004_.inc
testautomation/graphics/required/includes/impress/im_005_.inc
testautomation/graphics/required/includes/impress/im_007_.inc
testautomation/graphics/required/includes/impress/im_011_.inc
testautomation/graphics/required/input/recht_3.odp
testautomation/graphics/required/input/recht_31.odp
testautomation/graphics/required/input/recht_33.odp
testautomation/graphics/required/input/recht_34.odp
testautomation/graphics/required/input/recht_36.odp
testautomation/graphics/required/input/recht_39.odp
testautomation/graphics/required/input/recht_46.odp
testautomation/graphics/required/input/recht_48.odp
testautomation/graphics/required/input/recht_49.odp
testautomation/graphics/required/input/recht_55.odp
testautomation/graphics/tools/id_tools.inc
testautomation/graphics/tools/id_tools_2.inc
testautomation/math/optional/includes/m_105.inc
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
testautomation/spreadsheet/optional/includes/validity/c_validity.inc
testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc
testautomation/tools/hid/hid.pl
testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc
testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
testautomation/writer/optional/includes/fields/w_fields2.inc
testautomation/writer/optional/includes/fields/w_fields4.inc
testautomation/writer/optional/includes/fields/w_fields5.inc
testautomation/writer/optional/includes/fields/w_fields7.inc
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
testautomation/writer/optional/includes/formatpage/w_formatpage3.inc
testautomation/writer/optional/includes/formatpage/w_formatpage4.inc
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc
testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc
testautomation/writer/optional/includes/loadsave/w_loadsave.inc
testautomation/writer/optional/includes/option/wh_o_2.inc
testautomation/writer/optional/includes/option/wr_o_3.inc
testautomation/writer/optional/includes/regexp/search.inc
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
testautomation/writer/optional/includes/tools/tools1.inc
testautomation/writer/optional/includes/undo/w_undo_history_1.inc
testautomation/writer/optional/includes/undo/w_undo_history_4.inc
testautomation/writer/tools/includes/w_tools_hyphenation.inc
testgraphical/prj/build.lst
testgraphical/source/CallExternals.pm
testgraphical/source/fill_documents_loop.pl
testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java
testshl2/source/testshlrunner/makefile.mk
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/pyuno/makefile.mk
diff --cc qadevOOo/qa/complex/junitskeleton/Skeleton.java
index 0000000,a8486f7..3ae5d3d
mode 000000,100644..100644
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@@ -1,0 -1,194 +1,194 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
++ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ package complex.junitskeleton;
+
+ import com.sun.star.io.IOException;
+ import com.sun.star.lang.IllegalArgumentException;
+ import com.sun.star.lang.XComponent;
+ import com.sun.star.lang.XMultiServiceFactory;
+ import com.sun.star.uno.UnoRuntime;
+ import com.sun.star.util.XCloseable;
+ import java.io.File;
+ import java.io.RandomAccessFile;
+
+ import lib.TestParameters;
+
+ import util.SOfficeFactory;
+
+ // ---------- junit imports -----------------
+ import org.junit.After;
+ import org.junit.AfterClass;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ import org.openoffice.test.OfficeConnection;
+ import static org.junit.Assert.*;
+ // ------------------------------------------
+
+ public class Skeleton
+ {
+ /**
+ * The test parameters
+ */
+ private static TestParameters param = null;
+
+ @Test public void check() {
+ assertTrue("Couldn't open document", open());
+ System.out.println("check");
+ assertTrue("Couldn't close document", close());
+ String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+ System.out.println("temp dir URL is: " + tempDirURL);
+ String tempDir = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
+ assertTrue("Temp directory doesn't exist.", new File(tempDir).exists());
+ }
+
+ private boolean open()
+ {
+ System.out.println("open()");
+ // get multiservicefactory -----------------------------------------
+ final XMultiServiceFactory xMsf = getMSF();
+
+ SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf);
+
+ // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
+ param = new TestParameters();
+ param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
+
+ return true;
+ }
+
+ private boolean close()
+ {
+ System.out.println("close()");
+ return true;
+ }
+
+ // marked as test
+ @Test public void checkDocument()
+ {
+ System.out.println("checkDocument()");
+ final String sREADME = TestDocument.getUrl("README.txt");
+ System.out.println("README is in:" + sREADME);
+ File aFile = new File(sREADME);
+ if (! aFile.exists())
+ {
+ // It is a little bit stupid that office urls not compatible to java file urls
+ System.out.println("java.io.File can't access Office file urls.");
+ String sREADMESystemPath = graphical.FileHelper.getSystemPathFromFileURL(sREADME);
+ aFile = new File(sREADMESystemPath);
+ assertTrue("File '" + sREADMESystemPath + "' doesn't exists.", aFile.exists());
+ }
+
+ try
+ {
+ RandomAccessFile aAccess = new RandomAccessFile(aFile, "r");
+ long nLength = aAccess.length();
+ System.out.println("File length: " + nLength);
+ assertTrue("File length wrong", nLength > 0);
+ String sLine = aAccess.readLine();
+ assertTrue("Line must not be empty", sLine.length() > 0);
+ System.out.println(" Line: '" + sLine + "'");
+ System.out.println(" length: " + sLine.length());
+ assertTrue("File length not near equal to string length", sLine.length() + 2 >= nLength);
+ aAccess.close();
+ }
+ catch (java.io.FileNotFoundException e)
+ {
+ fail("Can't find file: " + sREADME + " - " + e.getMessage());
+ }
+ catch (java.io.IOException e)
+ {
+ fail("IO Exception: " + e.getMessage());
+ }
+
+ }
-
++
+ @Test public void checkOpenDocumentWithOffice()
+ {
+ // SOfficeFactory aFactory = new SOfficeFactory(getMSF());
+ SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
+ final String sREADME = TestDocument.getUrl("README.txt");
+ try
+ {
+ XComponent aDocument = SOF.loadDocument(sREADME);
+ complex.junitskeleton.justatest.shortWait();
+ XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument);
+ xClose.close(true);
+ }
+ catch (com.sun.star.lang.IllegalArgumentException ex)
+ {
+ fail("Illegal argument exception caught: " + ex.getMessage());
+ }
+ catch (com.sun.star.io.IOException ex)
+ {
+ fail("IOException caught: " + ex.getMessage());
+ }
+ catch (com.sun.star.uno.Exception ex)
+ {
+ fail("Exception caught: " + ex.getMessage());
+ }
+ }
+
+ // marked as prepare for test, will call before every test
+ @Before public void before()
+ {
+ System.out.println("before()");
+ System.setProperty("THIS IS A TEST", "Hallo");
+ }
-
++
+
+ // marked as post for test, will call after every test
+ @After public void after()
+ {
+ System.out.println("after()");
+ String sValue = System.getProperty("THIS IS A TEST");
+ assertEquals(sValue, "Hallo");
+ }
+
+
+ private XMultiServiceFactory getMSF()
+ {
+ final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+ return xMSF1;
+ }
+
+ // setup and close connections
+ @BeforeClass public static void setUpConnection() throws Exception {
+ System.out.println("setUpConnection()");
+ connection.setUp();
+ }
+
+ @AfterClass public static void tearDownConnection()
+ throws InterruptedException, com.sun.star.uno.Exception
+ {
+ System.out.println("tearDownConnection()");
+ connection.tearDown();
+ }
+
+ private static final OfficeConnection connection = new OfficeConnection();
+
+ }
diff --cc qadevOOo/runner/graphical/EnhancedComplexTestCase.java
index 0200161,2905e0d..e1894a9
--- a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/graphical/EnhancedComplexTestCase.java
@@@ -292,6 -299,6 +299,7 @@@ private void callEntry(String _sEntry,
{
assure("File '" + sIndexFile + "' doesn't exists.", aIndexFile.exists(), true);
}
++ }
}
private String getPSorPDFNameFromIniFile(IniFile _aIniFile, String _sName)
diff --cc smoketestoo_native/data/Global.xml
index 42f4287,588b4df..c4dc766
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
@@@ -35,7 -35,7 +35,7 @@@ const cParagraphBreak =
global const cExtensionFileName = "TestExtension.oxt"
- global const cDocNew = 0, cDocCut = 1, cDocPaste = 2, cDocSaveOpen8 = 3, cDocSaveOpenXML = 4, cDocOpen50 = 5, cDocClose = 6, cDocWrite = 7
-global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocSaveOpen50 = 3, cDocClose = 4, cDocWrite = 5
++global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocWrite = 5
global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
global const cLogfileFailed = 255
@@@ -83,8 -83,8 +83,8 @@@ Global const cUserFieldTestWriter = &qu
Global const cUserFieldTestDraw = "Draw", cUserFieldTestMath = "Math", cUserFieldTestChart = "Chart"
Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "Java", cUserFieldTestDatabase = "Database"
Global const cUserFieldTestExtension = "Extension"
- Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpen50 = "Open50", cUserFieldTestCut = "Cut"
- Global const cUserFieldTestPaste = "Paste", cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
-Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpenSave50 = "SaveOpen50"
++Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpen50 = "Open50"
+ Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
@@@ -100,8 -100,8 +100,8 @@@ Global bMakeWriterTest as boolean, bMak
Global bMakeDrawTest as Boolean, bMakeMathTest as boolean, bMakeChartTest as boolean
Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolean
Global bMakeExtensionTest as boolean
- Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean, bMakeCutTest as boolean
- Global bMakePasteTest as boolean, bMakeTerminateAfterTest as boolean, bShowTable as boolean
-Global bMakeSaveOpenXMLTest as boolean, bMakeSaveOpen50Test as boolean
++Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean
+ Global bMakeTerminateAfterTest as boolean, bShowTable as boolean
Global bMakeSaveOpen8Test as boolean
global sExtensionURL as string
@@@ -156,13 -156,11 +156,11 @@@ Sub CreateStatusTabl
tableHeaders(cStHTML) = "HTML"
tableHeaders(cStJava) = "Java"
- dim tableColums(5) as string
+ dim tableColums(3) as string
tableColums(cDocNew) = "new"
- tableColums(cDocCut) = "cut"
- tableColums(cDocPaste) = "paste"
tableColums(cDocSaveOpen8) = "V8.0"
tableColums(cDocSaveOpenXML) = "XML"
- tableColums(cDocSaveOpen50) = "V5.0"
+ tableColums(cDocOpen50) = "V5.0"
' tableColums(cDocClose) = "close"
aDoc = gOutPutDoc
@@@ -507,10 -505,8 +505,8 @@@ Sub SetOption
SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestOpenSave50, -(gOptionsDialog.getControl("cbSaveOpen50Test").getState), gOutPutDoc)
+ SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestCut, -(gOptionsDialog.getControl("cbCutTest").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestPaste, -(gOptionsDialog.getControl("cbPasteTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutPutDoc)
end Sub
@@@ -527,10 -523,8 +523,8 @@@ Sub GetOption
gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc)))
gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutPutDoc)))
gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc)))
- gOptionsDialog.getControl("cbSaveOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)))
+ gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)))
- gOptionsDialog.getControl("cbCutTest").setState( -( GetUserFieldState (cUserFieldTestCut, gOutPutDoc)))
- gOptionsDialog.getControl("cbPasteTest").setState( -( GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc)))
End Sub
@@@ -547,10 -541,8 +541,8 @@@ Sub ReadOption
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutPutDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc)
- bMakeSaveOpen50Test = GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)
+ bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)
- bMakeCutTest = GetUserFieldState (cUserFieldTestCut, gOutPutDoc)
- bMakePasteTest = GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)
bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc)
end Sub
@@@ -574,13 -566,11 +566,11 @@@ Sub SetDefaultOption
bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included
if Environ("WITH_BINFILTER") = "NO" then
- bMakeSaveOpen50Test = false
+ bMakeOpen50Test = false
else
- bMakeSaveOpen50Test = true
+ bMakeOpen50Test = true
End If
bMakeSaveOpen8Test = true
- bMakeCutTest = true
- bMakePasteTest = true
bMakeTerminateAfterTest = false
end Sub
@@@ -614,13 -604,11 +604,11 @@@ Function StartTestWithDefaultOption
component(cStJava) = "Java"
component(cStDataBase) = "Base"
component(cStExtension) = "Extensions"
- dim action(5) as string
+ dim action(3) as string
action(cDocNew) = "new"
- action(cDocCut) = "cut"
- action(cDocPaste) = "paste"
action(cDocSaveOpen8) = "V8.0"
action(cDocSaveOpenXML) = "XML"
- action(cDocSaveOpen50) = "V5.0"
+ action(cDocOpen50) = "V5.0"
dim baseAction(5) as string
baseAction(cDBService) = "services"
baseAction(cDBOpen) = "open"
diff --cc smoketestoo_native/data/OptionsDlg.xml
index 716133e,213c880..bb81112
--- a/smoketestoo_native/data/OptionsDlg.xml
+++ b/smoketestoo_native/data/OptionsDlg.xml
@@@ -42,23 -42,21 +42,20 @@@
<dlg:checkbox dlg:id="cbMathTest" dlg:tab-index="7" dlg:left="126" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Math" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbChartTest" dlg:tab-index="8" dlg:left="126" dlg:top="105" dlg:width="80" dlg:height="8" dlg:value="Chart" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbSaveOpenXMLTest" dlg:tab-index="9" dlg:left="19" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Save / Open XML" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbSaveOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Save / Open V5.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="11" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>
- <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="12" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
- <dlg:button dlg:id="btOk" dlg:tab-index="13" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
+ <dlg:checkbox dlg:id="cbOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Open V5.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbCutTest" dlg:tab-index="11" dlg:left="19" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="Cut" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbPasteTest" dlg:tab-index="12" dlg:left="19" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Paste" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="13" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>
- <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="14" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
- <dlg:button dlg:id="btOk" dlg:tab-index="15" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
++ <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="9" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
++ <dlg:button dlg:id="btOk" dlg:tab-index="10" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
<script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressOk" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="btCancel" dlg:tab-index="16" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok">
- <dlg:button dlg:id="btCancel" dlg:tab-index="14" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok">
++ <dlg:button dlg:id="btCancel" dlg:tab-index="11" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok">
<script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressCancel" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="btStart" dlg:tab-index="17" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest">
- <dlg:button dlg:id="btStart" dlg:tab-index="15" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest">
++ <dlg:button dlg:id="btStart" dlg:tab-index="12" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest">
<script:event script:event-name="on-performaction" script:location="vnd.sun.star.script" script:macro-name="Standard.Events.PressTest?language=Basic&location=document" script:language="Script"/>
</dlg:button>
- <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="18" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="19" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="20" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="21" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="16" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="17" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="18" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="19" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/>
++ <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="13" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/>
++ <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="14" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
++ <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="15" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/>
++ <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="16" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/>
</dlg:bulletinboard>
</dlg:window>
diff --cc smoketestoo_native/data/Test_10er.xml
index f92d51d,e19f0c7..0a7c885
--- a/smoketestoo_native/data/Test_10er.xml
+++ b/smoketestoo_native/data/Test_10er.xml
@@@ -39,11 -39,9 +39,9 @@@ const cTempFileName = "ttt"
const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)"
const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)"
-const cMessageSaveOpen50Doc = "Save/Open Document 5.0"
+const cMessageOpen50Doc = "Open Document 5.0"
const cMessageNewDoc = "New Document"
const cMessageCloseDoc = "Close Document"
- const cMessageCutObj = "Cut Object"
- const cMessagePasteObj = "Paste Object"
Global sWorkPath$
Global sWorkPathURL$
diff --cc smoketestoo_native/data/content.xml
index f137efb,dcd31b1..021be89
--- a/smoketestoo_native/data/content.xml
+++ b/smoketestoo_native/data/content.xml
@@@ -25,4 -25,4 +25,4 @@@
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
- <office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Open50"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Cut"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Paste"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-val
ue="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
-<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen50"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:s
tring-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
++<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Open50"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:strin
g-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
diff --cc smoketestoo_native/makefile.mk
index 75ebd95,18f3a42..d9c4dac
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@@ -56,12 -56,18 +56,13 @@@ ALLTAR : cpptes
cpptest : $(SHL1TARGETN)
- OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw
+ TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
+ CPPTEST_LIBRARY = $(SHL1TARGETN)
.IF "$(OS)" != "WNT"
-$(installationtest_instpath).flag : $(shell ls \
- $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz)
+localinstall :
$(RM) -r $(installationtest_instpath)
$(MKDIRHIER) $(installationtest_instpath)
- cd $(installationtest_instpath) && $(GNUTAR) xfz \
- $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz
- $(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \
- $(installationtest_instpath)/opt
- $(TOUCH) $@
-cpptest : $(installationtest_instpath).flag
+ ooinstall $(installationtest_instpath)/opt
+cpptest : localinstall
.END
diff --cc smoketestoo_native/smoketest.cxx
index 1f429b5,a4e5321..37d5e78
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@@ -29,8 -28,8 +29,9 @@@
#include "sal/config.h"
#include "boost/noncopyable.hpp"
+ #include "com/sun/star/awt/AsyncCallback.hpp"
#include "com/sun/star/awt/XCallback.hpp"
+#include "com/sun/star/awt/XRequestCallback.hpp"
#include "com/sun/star/beans/PropertyState.hpp"
#include "com/sun/star/beans/PropertyValue.hpp"
#include "com/sun/star/document/MacroExecMode.hpp"
diff --cc test/source/cpp/getargument.cxx
index d8c33b2,0db1446..bcee5a4
--- a/test/source/cpp/getargument.cxx
+++ b/test/source/cpp/getargument.cxx
@@@ -42,4 -44,4 +45,5 @@@ bool getArgument(rtl::OUString const &
}
+ }
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc test/source/cpp/officeconnection.cxx
index 93de7f7,ca62a5c..137e7c7
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@@ -40,10 -39,11 +40,12 @@@
#include "osl/process.h"
#include "osl/time.h"
#include "sal/types.h"
+#include <sal/macros.h>
- #include "test/getargument.hxx"
#include "test/officeconnection.hxx"
#include "test/toabsolutefileurl.hxx"
+ #include "test/uniquepipename.hxx"
+
+ #include "getargument.hxx"
namespace {
@@@ -92,15 -86,12 +94,15 @@@ void OfficeConnection::setUp()
toAbsoluteFileUrl(argUser));
rtl::OUString jreArg(
RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_JREHOME=true"));
+ rtl::OUString classpathArg(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"));
rtl_uString * args[] = {
- noquickArg.pData, nofirstArg.pData, norestoreArg.pData,
- acceptArg.pData, userArg.pData, jreArg.pData };
+ noquickArg.pData, nofirstArg.pData, norestoreArg.pData, noSplashArg.pData,
+ acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData };
rtl_uString ** envs = 0;
rtl::OUString argEnv;
- if (getArgument(
+ if (detail::getArgument(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")), &argEnv))
{
envs = &argEnv.pData;
diff --cc testautomation/global/sid/e_all.sid
index d7215aa,4770eab..72450d0
mode 100644,100755..100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@@ -27,22 -27,21 +27,22 @@@ FileSaveCopy SID_SAVEASDO
FileClose .uno:CloseDoc
FileSave SID_SAVEDOC
FileSaveAs SID_SAVEASDOC
- FileSaveAll SID_SAVEDOCS
- FileExport SID_EXPORTDOC
- FileExportAsPDF SID_EXPORTDOCASPDF
- FileSendDocumentAsEmail SID_MAIL_SENDDOC
- FileSendDocumentAsPDF SID_MAIL_SENDDOCASPDF
- FileVersions SID_VERSION
- FileReload SID_RELOAD SID_LASTVERSIONDOC
- FileProperties SID_DOCINFO
+ FileSaveAll .uno:SaveAll
+ FileExport .uno:ExportTo
+ FileExportAsPDF .uno:ExportToPDF
+ FileSendDocumentAsEmail .uno:SendMail
+ FileSendDocumentAsPDF .uno:SendMailDocAsPDF
+ FileVersions .uno:VersionDialog
+ FileReload SID_RELOAD
+FileDigitalSignatures .uno:Signature
- FileTemplatesOrganize SID_ORGANIZER
- FileTemplatesSave SID_DOCTEMPLATE
- FileTemplatesEdit SID_OPENTEMPLATE
- FileTemplatesAddressbookSource SID_TEMPLATE_ADDRESSBOKSOURCE
- FilePageView SID_PRINTPREVIEW
- FilePrint SID_PRINTDOC
- FilePrintersettings SID_SETUPPRINTER
+ FileProperties .uno:SetDocumentProperties
+ FileTemplatesOrganize .uno:Organizer
+ FileTemplatesSave .uno:SaveAsTemplate
+ FileTemplatesEdit .uno:OpenTemplate
+ FileTemplatesAddressbookSource .uno:AddressBookSource
+ FilePageView .uno:PrintPreview
+ FilePrint .uno:Print
+ FilePrintersettings .uno:PrinterSetup
FileExit SID_QUITAPP
' **** Writer
diff --cc testautomation/global/system/includes/master.inc
index ef9cda2,40a1f50..22c7e62
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@@ -725,10 -626,9 +632,9 @@@ sub hFirstOutpu
printlog "** Build type : CWS"
end if
if isStatusEnabled() then
- 'http://wiki.services.openoffice.org/wiki/QUASTe
+ 'http://wiki.services.openoffice.org/wiki/QUASTe
printlog "** Status feature (QUASTe) : Enabled " + gLocalStatusDatabase
end if
- printlog "** HID.LST based on milestone : " + sHidVersion
printlog "----------------------------------------------------------------------------------------------------"
printlog "** Application installation path : " + gNetzOfficePath
printlog "** User configuration path : " + gOfficePath
diff --cc testautomation/graphics/optional/includes/impress/i_slideshow2.inc
index 4de68a2,2df3326..38a8480
--- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
@@@ -909,10 -942,10 +942,10 @@@ testcase tSlideshowBackgroundAllSlide
Dim Background$ as string
Dim i as integer
Dim Zaehler as integer
- Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+ Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
- '/// Create a new document ///'
+ printlog "Create a new document"
Printlog "- SlideshowBackground"
Call hNewDocument
@@@ -962,10 -996,11 +996,11 @@@ testcase tSlideshowBackgroundSelectedSl
Dim Background$ as string
Dim i as integer
Dim Zaehler as integer
+
- Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+ Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
- '/// Create a new document ///'
+ printlog "Create a new document"
Printlog "- SlideshowBackground"
Call hNewDocument
diff --cc testtools/source/bridgetest/bridgetest.cxx
index b84e6c4,a8850e6..5614d1f
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@@ -413,564 -380,545 +381,560 @@@ static sal_Bool performTest
const Reference<XBridgeTest > & xLBT,
bool noCurrentContext )
{
- check( xLBT.is(), "### no test interface!" );
+ check(xLBT.is(), "### no test interface!");
bool bRet = true;
- if (xLBT.is())
- {
- // this data is never ever granted access to by calls other than equals(), assign()!
+ if (xLBT.is()) {
+ // this data is never ever granted access to by calls other than
+ // equals(), assign()!
TestData aData; // test against this data
-
- Reference<XInterface > xI( new MyClass );
-
- assign( (TestElement &)aData,
- sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
- SAL_CONST_INT64(0x123456789abcdef0),
- SAL_CONST_UINT64(0xfedcba9876543210),
- (float)17.0815, 3.1415926359, TestEnum_LOLA,
- OUSTR(STRING_TEST_CONSTANT), xI,
- Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
-
- bRet = check( aData.Any == xI, "### unexpected any!" ) && bRet;
- bRet = check( !(aData.Any != xI), "### unexpected any!" ) && bRet;
-
- aData.Sequence.realloc( 2 );
- aData.Sequence[ 0 ] = *(const TestElement *)&aData;
- // aData.Sequence[ 1 ] is empty
-
- // aData complete
- //================================================================================
-
- // this is a manually copy of aData for first setting...
+ Reference< XInterface > xI(new MyClass);
+ assign(
+ (TestElement &) aData, true, '@', 17, 0x1234, 0xFEDC, 0x12345678,
+ 0xFEDCBA98, SAL_CONST_INT64(0x123456789ABCDEF0),
+ SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359,
+ TestEnum_LOLA, OUSTR(STRING_TEST_CONSTANT), xI,
+ Any(&xI, getCppuType((Reference< XInterface > const *) 0)));
+ bRet &= check(aData.Any == xI, "### unexpected any!");
+ bRet &= check(!(aData.Any != xI), "### unexpected any!");
+ aData.Sequence.realloc(2);
+ aData.Sequence[0] = *(TestElement const *) &aData;
+ // aData.Sequence[1] is empty
+ // aSetData is a manually copy of aData for first setting:
TestData aSetData;
-
- assign( (TestElement &)aSetData,
- aData.Bool, aData.Char, aData.Byte, aData.Short, aData.UShort,
- aData.Long, aData.ULong, aData.Hyper, aData.UHyper, aData.Float, aData.Double,
- aData.Enum, aData.String, xI,
- Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
-
- aSetData.Sequence.realloc( 2 );
- aSetData.Sequence[ 0 ] = *(const TestElement *)&aSetData;
- // aSetData.Sequence[ 1 ] is empty
-
+ assign(
+ (TestElement &) aSetData, aData.Bool, aData.Char, aData.Byte,
+ aData.Short, aData.UShort, aData.Long, aData.ULong, aData.Hyper,
+ aData.UHyper, aData.Float, aData.Double, aData.Enum, aData.String,
+ xI, Any(&xI, getCppuType((Reference< XInterface > const *) 0)));
+ aSetData.Sequence.realloc(2);
+ aSetData.Sequence[0] = *(TestElement const *) &aSetData;
+ // aSetData.Sequence[1] is empty
xLBT->setValues(
- aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short, aSetData.UShort,
- aSetData.Long, aSetData.ULong, aSetData.Hyper, aSetData.UHyper, aSetData.Float, aSetData.Double,
- aSetData.Enum, aSetData.String, aSetData.Interface, aSetData.Any, aSetData.Sequence, aSetData );
-
- {
- TestData aRet, aRet2;
- xLBT->getValues(
- aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
- aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
- aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
-
- bRet = check( equals( aData, aRet ) && equals( aData, aRet2 ) , "getValues test") && bRet;
-
- // set last retrieved values
- TestData aSV2ret = xLBT->setValues2(
- aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
- aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
- aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
- // check inout sequence order
- // => inout sequence parameter was switched by test objects
- TestElement temp = aRet.Sequence[ 0 ];
- aRet.Sequence[ 0 ] = aRet.Sequence[ 1 ];
- aRet.Sequence[ 1 ] = temp;
-
- bRet = check(
- equals( aData, aSV2ret ) && equals( aData, aRet2 ),
- "getValues2 test") && bRet;
- }
- {
- TestData aRet, aRet2;
- TestData aGVret = xLBT->getValues(
- aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
- aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
- aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
-
- bRet = check( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ), "getValues test" ) && bRet;
-
- // set last retrieved values
- xLBT->setBool( aRet.Bool );
- xLBT->setChar( aRet.Char );
- xLBT->setByte( aRet.Byte );
- xLBT->setShort( aRet.Short );
- xLBT->setUShort( aRet.UShort );
- xLBT->setLong( aRet.Long );
- xLBT->setULong( aRet.ULong );
- xLBT->setHyper( aRet.Hyper );
- xLBT->setUHyper( aRet.UHyper );
- xLBT->setFloat( aRet.Float );
- xLBT->setDouble( aRet.Double );
- xLBT->setEnum( aRet.Enum );
- xLBT->setString( aRet.String );
- xLBT->setInterface( aRet.Interface );
- xLBT->setAny( aRet.Any );
- xLBT->setSequence( aRet.Sequence );
- xLBT->setStruct( aRet2 );
- }
- {
- TestData aRet, aRet2;
- aRet.Hyper = xLBT->getHyper();
- aRet.UHyper = xLBT->getUHyper();
- aRet.Float = xLBT->getFloat();
- aRet.Double = xLBT->getDouble();
- aRet.Byte = xLBT->getByte();
- aRet.Char = xLBT->getChar();
- aRet.Bool = xLBT->getBool();
- aRet.Short = xLBT->getShort();
- aRet.UShort = xLBT->getUShort();
- aRet.Long = xLBT->getLong();
- aRet.ULong = xLBT->getULong();
- aRet.Enum = xLBT->getEnum();
- aRet.String = xLBT->getString();
- aRet.Interface = xLBT->getInterface();
- aRet.Any = xLBT->getAny();
- aRet.Sequence = xLBT->getSequence();
- aRet2 = xLBT->getStruct();
-
- bRet = check( equals( aData, aRet ) && equals( aData, aRet2 ) , "struct comparison test") && bRet;
-
- {
- SmallStruct aIn(1, 2);
- SmallStruct aOut = xLBT->echoSmallStruct(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(SmallStruct)) == 0, "small struct test" ) && bRet;
- }
- {
- MediumStruct aIn(1, 2, 3, 4);
- MediumStruct aOut = xLBT->echoMediumStruct(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(MediumStruct)) == 0, "medium struct test" ) && bRet;
- }
- {
- BigStruct aIn(1, 2, 3, 4, 5, 6, 7, 8);
- BigStruct aOut = xLBT->echoBigStruct(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(BigStruct)) == 0, "big struct test" ) && bRet;
- }
- {
- TwoFloats aIn(1.1f, 2.2f);
- TwoFloats aOut = xLBT->echoTwoFloats(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(TwoFloats)) == 0, "two floats struct test" ) && bRet;
- }
+ aSetData.Bool, aSetData.Char, aSetData.Byte, aSetData.Short,
+ aSetData.UShort, aSetData.Long, aSetData.ULong, aSetData.Hyper,
+ aSetData.UHyper, aSetData.Float, aSetData.Double, aSetData.Enum,
+ aSetData.String, aSetData.Interface, aSetData.Any,
+ aSetData.Sequence, aSetData);
{
- FourFloats aIn(3.3f, 4.4f, 5.5f, 6.6f);
- FourFloats aOut = xLBT->echoFourFloats(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0, "four floats struct test" ) && bRet;
+ TestData aRet;
+ TestData aRet2;
+ xLBT->getValues(
+ aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
+ aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
+ aRet.Double, aRet.Enum, aRet.String, aRet.Interface, aRet.Any,
+ aRet.Sequence, aRet2);
+ bRet &= check(
+ equals(aData, aRet) && equals(aData, aRet2), "getValues test");
+ // Set last retrieved values:
+ TestData aSV2ret(
+ xLBT->setValues2(
+ aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
+ aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
+ aRet.Double, aRet.Enum, aRet.String, aRet.Interface,
+ aRet.Any, aRet.Sequence, aRet2));
+ // Check inout sequence order (=> inout sequence parameter was
+ // switched by test objects):
+ TestElement temp(aRet.Sequence[0]);
+ aRet.Sequence[0] = aRet.Sequence[1];
+ aRet.Sequence[1] = temp;
+ bRet &= check(
+ equals(aData, aSV2ret) && equals(aData, aRet2),
+ "getValues2 test");
}
{
- MixedFloatAndInteger aIn(7.7f, 8);
- MixedFloatAndInteger aOut = xLBT->echoMixedFloatAndInteger(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(MixedFloatAndInteger)) == 0, "mixed float and integer struct test" ) && bRet;
- }
- {
- ThreeByteStruct aIn(9, 10, 11);
- ThreeByteStruct aOut = xLBT->echoThreeByteStruct(aIn);
- bRet = check( memcmp(&aIn, &aOut, sizeof(ThreeByteStruct)) == 0, "three byte struct test" ) && bRet;
- }
- {
- sal_Int32 i2 = xLBT->testPPCAlignment( 0, 0, 0, 0, 0xbeaf );
- bRet = check( i2 == 0xbeaf, "ppc-style alignment test" ) && bRet;
- }
-
- // Test extended attributes that raise exceptions:
- try {
- xLBT->getRaiseAttr1();
- bRet &= check(false, "getRaiseAttr1 did not throw");
- } catch (RuntimeException &) {
- } catch (...) {
- bRet &= check(false, "getRaiseAttr1 threw wrong type");
- }
- try {
- xLBT->setRaiseAttr1(0);
- bRet &= check(false, "setRaiseAttr1 did not throw");
- } catch (IllegalArgumentException &) {
- } catch (...) {
- bRet &= check(false, "setRaiseAttr1 threw wrong type");
- }
- try {
- xLBT->getRaiseAttr2();
- bRet &= check(false, "getRaiseAttr2 did not throw");
- } catch (IllegalArgumentException &) {
- } catch (...) {
- bRet &= check(false, "getRaiseAttr2 threw wrong type");
+ TestData aRet;
+ TestData aRet2;
+ TestData aGVret(
+ xLBT->getValues(
+ aRet.Bool, aRet.Char, aRet.Byte, aRet.Short, aRet.UShort,
+ aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float,
+ aRet.Double, aRet.Enum, aRet.String, aRet.Interface,
+ aRet.Any, aRet.Sequence, aRet2));
+ bRet &= check(
+ (equals(aData, aRet) && equals(aData, aRet2) &&
+ equals(aData, aGVret)),
+ "getValues test");
+ // Set last retrieved values:
+ xLBT->setBool(aRet.Bool);
+ xLBT->setChar(aRet.Char);
+ xLBT->setByte(aRet.Byte);
+ xLBT->setShort(aRet.Short);
+ xLBT->setUShort(aRet.UShort);
+ xLBT->setLong(aRet.Long);
+ xLBT->setULong(aRet.ULong);
+ xLBT->setHyper(aRet.Hyper);
+ xLBT->setUHyper(aRet.UHyper);
+ xLBT->setFloat(aRet.Float);
+ xLBT->setDouble(aRet.Double);
+ xLBT->setEnum(aRet.Enum);
+ xLBT->setString(aRet.String);
+ xLBT->setInterface(aRet.Interface);
+ xLBT->setAny(aRet.Any);
+ xLBT->setSequence(aRet.Sequence);
+ xLBT->setStruct(aRet2);
}
-
- // Test instantiated polymorphic struct types:
{
- bRet &= check(
- xLBT->transportPolyBoolean(TestPolyStruct< sal_Bool >(true)).member,
- "transportPolyBoolean");
- TestPolyStruct< sal_Int64 > tps1(12345);
- xLBT->transportPolyHyper(tps1);
- bRet &= check(tps1.member == 12345, "transportPolyHyper");
- Sequence< Any > seq(2);
- seq[0] <<= static_cast< sal_uInt32 >(33);
- seq[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABC"));
- TestPolyStruct< Sequence< Any > > tps2(seq);
- TestPolyStruct< Sequence< Any > > tps3;
- xLBT->transportPolySequence(tps2, tps3);
- bRet &= check(
- tps3.member.getLength() == 2, "transportPolySequence, length");
- sal_uInt32 v0 = sal_uInt32();
- tps3.member[0] >>= v0;
- bRet &= check(v0 == 33, "transportPolySequence, element 0");
- rtl::OUString v1;
- tps3.member[1] >>= v1;
- bRet &= check(
- v1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ABC")),
- "transportPolySequence, element 1");
- bRet &= check(xLBT->getNullPolyLong().member == 0, "getNullPolyLong");
- bRet &= check(
- xLBT->getNullPolyString().member.getLength() == 0,
- "getNullPolyString");
- bRet &= check(
- xLBT->getNullPolyType().member == Type(), "getNullPolyType");
- Any nullAny(xLBT->getNullPolyAny().member);
- bRet &= check(
- (((nullAny.getValueTypeName()
- == rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")))
- && !static_cast< Reference< XInterface > const * >(
- nullAny.getValue())->is())
- || nullAny == Any()),
- "getNullPolyAny");
- bRet &= check(
- xLBT->getNullPolySequence().member.getLength() == 0,
- "getNullPolySequence");
- bRet &= check(
- xLBT->getNullPolyEnum().member == TestEnum_TEST, "getNullPolyEnum");
- bRet &= check(
- xLBT->getNullPolyBadEnum().member == TestBadEnum_M,
- "getNullPolyBadEnum");
- bRet &= check(
- xLBT->getNullPolyStruct().member.member == 0, "getNullPolyStruct");
- bRet &= check(
- !xLBT->getNullPolyInterface().member.is(), "getNullPolyInterface");
- }
-
- // any test
- bRet = check( performAnyTest( xLBT , aData ) , "any test" ) && bRet;
-
- // sequence of call test
- bRet = check( performSequenceOfCallTest( xLBT ) , "sequence of call test" ) && bRet;
-
- // recursive call test
- bRet = check( performRecursiveCallTest( xLBT ) , "recursive test" ) && bRet;
-
- bRet = (equals( aData, aRet ) && equals( aData, aRet2 )) && bRet ;
-
- // multiple inheritance test
- bRet &= checkEmpty(
- testtools::bridgetest::testMulti(xLBT->getMulti()), "remote multi");
- bRet &= checkEmpty(
- xLBT->testMulti(new testtools::bridgetest::Multi), "local multi");
+ TestData aRet;
+ aRet.Hyper = xLBT->getHyper();
+ aRet.UHyper = xLBT->getUHyper();
+ aRet.Float = xLBT->getFloat();
+ aRet.Double = xLBT->getDouble();
+ aRet.Byte = xLBT->getByte();
+ aRet.Char = xLBT->getChar();
+ aRet.Bool = xLBT->getBool();
+ aRet.Short = xLBT->getShort();
+ aRet.UShort = xLBT->getUShort();
+ aRet.Long = xLBT->getLong();
+ aRet.ULong = xLBT->getULong();
+ aRet.Enum = xLBT->getEnum();
+ aRet.String = xLBT->getString();
+ aRet.Interface = xLBT->getInterface();
+ aRet.Any = xLBT->getAny();
+ aRet.Sequence = xLBT->getSequence();
+ TestData aRet2(xLBT->getStruct());
+ bRet &= check(
+ equals(aData, aRet) && equals(aData, aRet2),
+ "struct comparison test");
+ {
+ SmallStruct aIn(1, 2);
+ SmallStruct aOut(xLBT->echoSmallStruct(aIn));
+ bRet &= check(
+ memcmp(&aIn, &aOut, sizeof(SmallStruct)) == 0,
+ "small struct test");
+ }
+ {
+ MediumStruct aIn(1, 2, 3, 4);
+ MediumStruct aOut(xLBT->echoMediumStruct(aIn));
+ bRet &= check(
+ memcmp(&aIn, &aOut, sizeof(MediumStruct)) == 0,
+ "medium struct test");
+ }
+ {
+ BigStruct aIn(1, 2, 3, 4, 5, 6, 7, 8);
+ BigStruct aOut(xLBT->echoBigStruct(aIn));
+ bRet &= check(
+ memcmp(&aIn, &aOut, sizeof(BigStruct)) == 0,
+ "big struct test");
+ }
+ {
- AllFloats aIn(1.1f, 2.2f, 3.3f, 4.4f);
- AllFloats aOut(xLBT->echoAllFloats(aIn));
++ TwoFloats aIn(1.1f, 2.2f);
++ TwoFloats aOut = xLBT->echoTwoFloats(aIn);
++ bRet = check( memcmp(&aIn, &aOut, sizeof(TwoFloats)) == 0, "two floats struct test" ) && bRet;
++ }
++ {
++ FourFloats aIn(1.1f, 2.2f, 3.3f, 4.4f);
++ FourFloats aOut(xLBT->echoFourFloats(aIn));
+ bRet &= check(
- memcmp(&aIn, &aOut, sizeof(AllFloats)) == 0,
- "all floats struct test");
++ memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0,
++ "four floats struct test");
++ }
++ {
++ MixedFloatAndInteger aIn(7.7f, 8);
++ MixedFloatAndInteger aOut = xLBT->echoMixedFloatAndInteger(aIn);
++ bRet = check( memcmp(&aIn, &aOut, sizeof(MixedFloatAndInteger)) == 0, "mixed float and integer struct test" ) && bRet;
++ }
++ {
++ ThreeByteStruct aIn(9, 10, 11);
++ ThreeByteStruct aOut = xLBT->echoThreeByteStruct(aIn);
++ bRet = check( memcmp(&aIn, &aOut, sizeof(ThreeByteStruct)) == 0, "three byte struct test" ) && bRet;
+ }
+ {
+ sal_Int32 i2 = xLBT->testPPCAlignment(0, 0, 0, 0, 0xBEAF);
+ bRet &= check(i2 == 0xBEAF, "ppc-style alignment test");
+ }
+ // Test extended attributes that raise exceptions:
+ try {
+ xLBT->getRaiseAttr1();
+ bRet &= check(false, "getRaiseAttr1 did not throw");
+ } catch (RuntimeException &) {
+ } catch (...) {
+ bRet &= check(false, "getRaiseAttr1 threw wrong type");
+ }
+ try {
+ xLBT->setRaiseAttr1(0);
+ bRet &= check(false, "setRaiseAttr1 did not throw");
+ } catch (IllegalArgumentException &) {
+ } catch (...) {
+ bRet &= check(false, "setRaiseAttr1 threw wrong type");
+ }
+ try {
+ xLBT->getRaiseAttr2();
+ bRet &= check(false, "getRaiseAttr2 did not throw");
+ } catch (IllegalArgumentException &) {
+ } catch (...) {
+ bRet &= check(false, "getRaiseAttr2 threw wrong type");
+ }
+ // Test instantiated polymorphic struct types:
+ {
+ bRet &= check(
+ (xLBT->transportPolyBoolean(
+ TestPolyStruct< sal_Bool >(true)).
+ member),
+ "transportPolyBoolean");
+ TestPolyStruct< sal_Int64 > tps1(12345);
+ xLBT->transportPolyHyper(tps1);
+ bRet &= check(tps1.member == 12345, "transportPolyHyper");
+ Sequence< Any > seq(2);
+ seq[0] <<= static_cast< sal_uInt32 >(33);
+ seq[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ABC"));
+ TestPolyStruct< Sequence< Any > > tps2(seq);
+ TestPolyStruct< Sequence< Any > > tps3;
+ xLBT->transportPolySequence(tps2, tps3);
+ bRet &= check(
+ tps3.member.getLength() == 2,
+ "transportPolySequence, length");
+ sal_uInt32 v0 = sal_uInt32();
+ tps3.member[0] >>= v0;
+ bRet &= check(v0 == 33, "transportPolySequence, element 0");
+ rtl::OUString v1;
+ tps3.member[1] >>= v1;
+ bRet &= check(
+ v1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ABC")),
+ "transportPolySequence, element 1");
+ bRet &= check(
+ xLBT->getNullPolyLong().member == 0, "getNullPolyLong");
+ bRet &= check(
+ xLBT->getNullPolyString().member.getLength() == 0,
+ "getNullPolyString");
+ bRet &= check(
+ xLBT->getNullPolyType().member == Type(),
+ "getNullPolyType");
+ Any nullAny(xLBT->getNullPolyAny().member);
+ bRet &= check(
+ (((nullAny.getValueTypeName() ==
+ rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "com.sun.star.uno.XInterface"))) &&
+ !static_cast< Reference< XInterface > const * >(
+ nullAny.getValue())->is())
+ || nullAny == Any()),
+ "getNullPolyAny");
+ bRet &= check(
+ xLBT->getNullPolySequence().member.getLength() == 0,
+ "getNullPolySequence");
+ bRet &= check(
+ xLBT->getNullPolyEnum().member == TestEnum_TEST,
+ "getNullPolyEnum");
+ bRet &= check(
+ xLBT->getNullPolyBadEnum().member == TestBadEnum_M,
+ "getNullPolyBadEnum");
+ bRet &= check(
+ xLBT->getNullPolyStruct().member.member == 0,
+ "getNullPolyStruct");
+ bRet &= check(
+ !xLBT->getNullPolyInterface().member.is(),
+ "getNullPolyInterface");
+ }
+ // Any test:
+ bRet &= check(performAnyTest(xLBT , aData), "any test");
+ // Sequence of call test:
+ bRet &= check(
+ performSequenceOfCallTest(xLBT), "sequence of call test");
+ // Recursive call test:
+ bRet &= check(performRecursiveCallTest(xLBT), "recursive test");
+ bRet &= check(
+ equals(aData, aRet) && equals(aData, aRet2),
+ "recursive test results");
+ // Multiple inheritance test:
+ bRet &= checkEmpty(
+ testtools::bridgetest::testMulti(xLBT->getMulti()),
+ "remote multi");
+ bRet &= checkEmpty(
+ xLBT->testMulti(new testtools::bridgetest::Multi),
+ "local multi");
}
-
}
{
- Reference<XBridgeTest2> xBT2(xLBT, UNO_QUERY);
- if ( ! xBT2.is())
- return bRet;
-
- // perform sequence tests (XBridgeTest2)
- // create the sequence which are compared with the results
- sal_Bool _arBool[] = {sal_True, sal_False, sal_True};
- sal_Unicode _arChar[] = {0x0065, 0x0066, 0x0067};
- sal_Int8 _arByte[] = { 1, 2, -1 };
- sal_Int16 _arShort[] = { -0x8000, 1, 0x7fff };
- sal_uInt16 _arUShort[] = {0 , 1, 0xffff};
- sal_Int32 _arLong[] = {0x80000000, 1, 0x7fffffff};
- sal_uInt32 _arULong[] = {0, 1, 0xffffffff};
- sal_Int64 _arHyper[] = {
- SAL_CONST_INT64(0x8000000000000000), 1,
- SAL_CONST_INT64(0x7fffffffffffffff)};
- sal_uInt64 _arUHyper[] = {0, 1, SAL_CONST_UINT64(0xffffffffffffffff)};
- float _arFloat[] = {1.1f, 2.2f, 3.3f};
- double _arDouble[] = {1.11, 2.22, 3.33};
- OUString _arString[] = {
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")),
- OUString(RTL_CONSTASCII_USTRINGPARAM("String 3"))
- };
-
- sal_Bool _aBool = sal_True;
- sal_Int32 _aInt = 0xbabebabe;
- float _aFloat = 3.14f;
- Any _any1(&_aBool, getCppuBooleanType());
- Any _any2(&_aInt, getCppuType((sal_Int32*) 0));
- Any _any3(&_aFloat, getCppuType((float*) 0));
- Any _arAny[] = { _any1, _any2, _any3};
-
- Reference<XInterface> _arObj[3];
- _arObj[0] = new OWeakObject();
- _arObj[1] = new OWeakObject();
- _arObj[2] = new OWeakObject();
-
- TestEnum _arEnum[] = {TestEnum_ONE, TestEnum_TWO, TestEnum_CHECK};
-
- TestElement _arStruct[3];
- assign( _arStruct[0], sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
- SAL_CONST_INT64(0x123456789abcdef0),
- SAL_CONST_UINT64(0xfedcba9876543210),
- 17.0815f, 3.1415926359,
+ Reference< XBridgeTest2 > xBT2(xLBT, UNO_QUERY);
+ if (!xBT2.is()) {
+ return bRet;
+ }
+ // Perform sequence tests (XBridgeTest2); create the sequence which is
+ // compared with the results:
+ sal_Bool _arBool[] = { true, false, true };
+ sal_Unicode _arChar[] = { 0x0065, 0x0066, 0x0067 };
+ sal_Int8 _arByte[] = { 1, 2, -1 };
+ sal_Int16 _arShort[] = { -0x8000, 1, 0x7FFF };
+ sal_uInt16 _arUShort[] = { 0 , 1, 0xFFFF };
+ sal_Int32 _arLong[] = { 0x80000000, 1, 0x7FFFFFFF };
+ sal_uInt32 _arULong[] = { 0, 1, 0xFFFFFFFF };
+ sal_Int64 _arHyper[] = {
+ SAL_CONST_INT64(0x8000000000000000), 1,
+ SAL_CONST_INT64(0x7FFFFFFFFFFFFFFF) };
+ sal_uInt64 _arUHyper[] = { 0, 1, SAL_CONST_UINT64(0xFFFFFFFFFFFFFFFF) };
+ float _arFloat[] = { 1.1f, 2.2f, 3.3f };
+ double _arDouble[] = { 1.11, 2.22, 3.33 };
+ OUString _arString[] = {
+ OUString(RTL_CONSTASCII_USTRINGPARAM("String 1")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("String 2")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("String 3")) };
+ sal_Bool _aBool = true;
+ sal_Int32 _aInt = 0xBABEBABE;
+ float _aFloat = 3.14f;
+ Any _any1(&_aBool, getCppuBooleanType());
+ Any _any2(&_aInt, getCppuType((sal_Int32 *) 0));
+ Any _any3(&_aFloat, getCppuType((float *) 0));
+ Any _arAny[] = { _any1, _any2, _any3 };
+ Reference< XInterface > _arObj[3];
+ _arObj[0] = new OWeakObject();
+ _arObj[1] = new OWeakObject();
+ _arObj[2] = new OWeakObject();
+ TestEnum _arEnum[] = { TestEnum_ONE, TestEnum_TWO, TestEnum_CHECK };
+ TestElement _arStruct[3];
+ assign(
+ _arStruct[0], true, '@', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98,
+ SAL_CONST_INT64(0x123456789ABCDEF0),
+ SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359,
TestEnum_LOLA, OUSTR(STRING_TEST_CONSTANT), _arObj[0],
- Any( &_arObj[0], ::getCppuType( (const Reference<XInterface > *)0 ) ) );
- assign( _arStruct[1], sal_True, 'A', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
- SAL_CONST_INT64(0x123456789abcdef0),
- SAL_CONST_UINT64(0xfedcba9876543210),
- 17.0815f, 3.1415926359,
+ Any(&_arObj[0], getCppuType((Reference< XInterface > const *) 0)));
+ assign(
+ _arStruct[1], true, 'A', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98,
+ SAL_CONST_INT64(0x123456789ABCDEF0),
+ SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359,
TestEnum_TWO, OUSTR(STRING_TEST_CONSTANT), _arObj[1],
- Any( &_arObj[1], ::getCppuType( (const Reference<XInterface > *)0 ) ) );
- assign( _arStruct[2], sal_True, 'B', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
- SAL_CONST_INT64(0x123456789abcdef0),
- SAL_CONST_UINT64(0xfedcba9876543210),
- 17.0815f, 3.1415926359,
+ Any(&_arObj[1], getCppuType((Reference< XInterface > const *) 0)));
+ assign(
+ _arStruct[2], true, 'B', 17, 0x1234, 0xFEDC, 0x12345678, 0xFEDCBA98,
+ SAL_CONST_INT64(0x123456789ABCDEF0),
+ SAL_CONST_UINT64(0xFEDCBA9876543210), 17.0815f, 3.1415926359,
TestEnum_CHECK, OUSTR(STRING_TEST_CONSTANT), _arObj[2],
- Any( &_arObj[2], ::getCppuType( (const Reference<XInterface > *)0 ) ) );
-
- {
- Sequence<sal_Bool> arBool(_arBool, 3);
- Sequence<sal_Unicode> arChar( _arChar, 3);
- Sequence<sal_Int8> arByte(_arByte, 3);
- Sequence<sal_Int16> arShort(_arShort, 3);
- Sequence<sal_uInt16> arUShort(_arUShort, 3);
- Sequence<sal_Int32> arLong(_arLong, 3);
- Sequence<sal_uInt32> arULong(_arULong, 3);
- Sequence<sal_Int64> arHyper(_arHyper, 3);
- Sequence<sal_uInt64> arUHyper(_arUHyper, 3);
- Sequence<float> arFloat(_arFloat, 3);
- Sequence<double> arDouble(_arDouble, 3);
- Sequence<OUString> arString(_arString, 3);
- Sequence<Any> arAny(_arAny, 3);
- Sequence<Reference<XInterface> > arObject(_arObj, 3);
- Sequence<TestEnum> arEnum(_arEnum, 3);
- Sequence<TestElement> arStruct(_arStruct, 3);
- Sequence<Sequence<sal_Int32> > _arSeqLong2[3];
- for (int j = 0; j < 3; j++)
- {
- Sequence<sal_Int32> _arSeqLong[3];
- for (int i = 0; i < 3; i++)
+ Any(&_arObj[2], getCppuType((Reference< XInterface > const *) 0)));
{
- _arSeqLong[i] = Sequence<sal_Int32>(_arLong, 3);
- }
-
- _arSeqLong2[j] = Sequence< Sequence<sal_Int32> > (_arSeqLong, 3);
- }
-
- Sequence<Sequence<Sequence<sal_Int32> > > arLong3( _arSeqLong2, 3);
- Sequence<Sequence<sal_Int32> > seqSeqRet = xBT2->setDim2(arLong3[0]);
- bRet = check( seqSeqRet == arLong3[0], "sequence test") && bRet;
- Sequence<Sequence<Sequence<sal_Int32> > > seqSeqRet2 = xBT2->setDim3(arLong3);
- bRet = check( seqSeqRet2 == arLong3, "sequence test") && bRet;
- Sequence<Any> seqAnyRet = xBT2->setSequenceAny(arAny);
- bRet = check( seqAnyRet == arAny, "sequence test") && bRet;
- Sequence<sal_Bool> seqBoolRet = xBT2->setSequenceBool(arBool);
- bRet = check( seqBoolRet == arBool, "sequence test") && bRet;
- Sequence<sal_Int8> seqByteRet = xBT2->setSequenceByte(arByte);
- bRet = check( seqByteRet == arByte, "sequence test") && bRet;
- Sequence<sal_Unicode> seqCharRet = xBT2->setSequenceChar(arChar);
- bRet = check( seqCharRet == arChar, "sequence test") && bRet;
- Sequence<sal_Int16> seqShortRet = xBT2->setSequenceShort(arShort);
- bRet = check( seqShortRet == arShort, "sequence test") && bRet;
- Sequence<sal_Int32> seqLongRet = xBT2->setSequenceLong(arLong);
- bRet = check( seqLongRet == arLong, "sequence test") && bRet;
- Sequence<sal_Int64> seqHyperRet = xBT2->setSequenceHyper(arHyper);
- bRet = check( seqHyperRet == arHyper, "sequence test") && bRet;
- Sequence<float> seqFloatRet = xBT2->setSequenceFloat(arFloat);
- bRet = check( seqFloatRet == arFloat, "sequence test") && bRet;
- Sequence<double> seqDoubleRet = xBT2->setSequenceDouble(arDouble);
- bRet = check( seqDoubleRet == arDouble, "sequence test") && bRet;
- Sequence<TestEnum> seqEnumRet = xBT2->setSequenceEnum(arEnum);
- bRet = check( seqEnumRet == arEnum, "sequence test") && bRet;
- Sequence<sal_uInt16> seqUShortRet = xBT2->setSequenceUShort(arUShort);
- bRet = check( seqUShortRet == arUShort, "sequence test") && bRet;
- Sequence<sal_uInt32> seqULongRet = xBT2->setSequenceULong(arULong);
- bRet = check( seqULongRet == arULong, "sequence test") && bRet;
- Sequence<sal_uInt64> seqUHyperRet = xBT2->setSequenceUHyper(arUHyper);
- bRet = check( seqUHyperRet == arUHyper, "sequence test") && bRet;
- Sequence<Reference<XInterface> > seqObjectRet = xBT2->setSequenceXInterface(arObject);
- bRet = check( seqObjectRet == arObject, "sequence test") && bRet;
- Sequence<OUString> seqStringRet = xBT2->setSequenceString(arString);
- bRet = check( seqStringRet == arString, "sequence test") && bRet;
- Sequence<TestElement> seqStructRet = xBT2->setSequenceStruct(arStruct);
- bRet = check( seqStructRet == arStruct, "sequence test") && bRet;
-
- Sequence<sal_Bool> arBoolTemp = cloneSequence(arBool);
- Sequence<sal_Unicode> arCharTemp = cloneSequence(arChar);
- Sequence<sal_Int8> arByteTemp = cloneSequence(arByte);
- Sequence<sal_Int16> arShortTemp = cloneSequence(arShort);
- Sequence<sal_uInt16> arUShortTemp = cloneSequence(arUShort);
- Sequence<sal_Int32> arLongTemp = cloneSequence(arLong);
- Sequence<sal_uInt32> arULongTemp = cloneSequence(arULong);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list