libreoffice

Files

Michael Meeks 8c59580b88 Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

2011-03-11 11:35:29 +00:00

c_datapilot_pagefields.inc

CWS-TOOLING: integrate CWS automationemailchange

2010-07-22 13:30:29 +02:00

c_xml_print_scale.inc

#163885 # Correction of mispelled testownername

2010-10-12 15:22:57 +02:00

c_xml_scenario.inc

#163885 # Correction of mispelled testownername

2010-10-12 15:22:57 +02:00

ch_xml_japanese_candlestick.inc

CWS-TOOLING: integrate CWS automationemailchange