8c59580b88
Conflicts: smoketestoo_native/data/Global.xml smoketestoo_native/data/OptionsDlg.xml smoketestoo_native/data/Test_10er.xml smoketestoo_native/data/content.xml smoketestoo_native/smoketest.cxx test/source/cpp/getargument.cxx test/source/cpp/officeconnection.cxx testautomation/framework/optional/includes/basic_vba-compat_security_check.inc testautomation/framework/optional/includes/filedlg_cjk_folders.inc testautomation/global/sid/all.sid testautomation/global/sid/bars.sid testautomation/global/sid/e_all.sid testautomation/global/win/bars.win testautomation/graphics/optional/includes/impress/i_slideshow2.inc testautomation/graphics/optional/includes/impress/i_slideshow3.inc testtools/source/bridgetest/bridgetest.cxx testtools/source/bridgetest/constructors.cxx testtools/source/bridgetest/makefile.mk testtools/source/bridgetest/testComponent.component |
||
|---|---|---|
| .. | ||
| declare.inc | ||
| gvariabl.inc | ||
| iniinfo.inc | ||
| inivalue.inc | ||
| master.inc | ||
| status.inc | ||
| sysinfo.inc | ||