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

18 files changed, 0 insertions, 0 deletions

diff --git a/testautomation/xml/optional/docbook_losa.bas b/testautomation/xml/optional/docbook_losa.bas
index e622c279d185..e622c279d185 100644..100755
--- a/testautomation/xml/optional/docbook_losa.bas
+++ b/testautomation/xml/optional/docbook_losa.bas
diff --git a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
index 0cbf8244512e..0cbf8244512e 100755..100644
--- a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
+++ b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
diff --git a/testautomation/xml/optional/includes/sxc7_01.inc b/testautomation/xml/optional/includes/sxc7_01.inc
index 0dace41f0ca4..0dace41f0ca4 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_01.inc
+++ b/testautomation/xml/optional/includes/sxc7_01.inc
diff --git a/testautomation/xml/optional/includes/sxc7_02.inc b/testautomation/xml/optional/includes/sxc7_02.inc
index 8696cb359954..8696cb359954 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_02.inc
+++ b/testautomation/xml/optional/includes/sxc7_02.inc
diff --git a/testautomation/xml/optional/includes/sxc7_03.inc b/testautomation/xml/optional/includes/sxc7_03.inc
index 5c8661303cb3..5c8661303cb3 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_03.inc
+++ b/testautomation/xml/optional/includes/sxc7_03.inc
diff --git a/testautomation/xml/optional/includes/sxd7_01.inc b/testautomation/xml/optional/includes/sxd7_01.inc
index 0c1069ff930f..0c1069ff930f 100755..100644
--- a/testautomation/xml/optional/includes/sxd7_01.inc
+++ b/testautomation/xml/optional/includes/sxd7_01.inc
diff --git a/testautomation/xml/optional/includes/sxd7_02.inc b/testautomation/xml/optional/includes/sxd7_02.inc
index 74212989c26b..74212989c26b 100755..100644
--- a/testautomation/xml/optional/includes/sxd7_02.inc
+++ b/testautomation/xml/optional/includes/sxd7_02.inc
diff --git a/testautomation/xml/optional/includes/sxd7_03.inc b/testautomation/xml/optional/includes/sxd7_03.inc
index 22d812bc93f2..22d812bc93f2 100755..100644
--- a/testautomation/xml/optional/includes/sxd7_03.inc
+++ b/testautomation/xml/optional/includes/sxd7_03.inc
diff --git a/testautomation/xml/optional/includes/sxd7_04.inc b/testautomation/xml/optional/includes/sxd7_04.inc
index 5c32c2a48d05..5c32c2a48d05 100755..100644
--- a/testautomation/xml/optional/includes/sxd7_04.inc
+++ b/testautomation/xml/optional/includes/sxd7_04.inc
diff --git a/testautomation/xml/optional/includes/sxd7_05.inc b/testautomation/xml/optional/includes/sxd7_05.inc
index a958ebe1841f..a958ebe1841f 100755..100644
--- a/testautomation/xml/optional/includes/sxd7_05.inc
+++ b/testautomation/xml/optional/includes/sxd7_05.inc
diff --git a/testautomation/xml/optional/includes/sxi7_01.inc b/testautomation/xml/optional/includes/sxi7_01.inc
index 43ebe8a8c99c..43ebe8a8c99c 100755..100644
--- a/testautomation/xml/optional/includes/sxi7_01.inc
+++ b/testautomation/xml/optional/includes/sxi7_01.inc
diff --git a/testautomation/xml/optional/includes/sxm7_01.inc b/testautomation/xml/optional/includes/sxm7_01.inc
index e8f7fd94260e..e8f7fd94260e 100755..100644
--- a/testautomation/xml/optional/includes/sxm7_01.inc
+++ b/testautomation/xml/optional/includes/sxm7_01.inc
diff --git a/testautomation/xml/optional/includes/sxw7_01.inc b/testautomation/xml/optional/includes/sxw7_01.inc
index 7f1452ad687b..7f1452ad687b 100755..100644
--- a/testautomation/xml/optional/includes/sxw7_01.inc
+++ b/testautomation/xml/optional/includes/sxw7_01.inc
diff --git a/testautomation/xml/optional/includes/sxw7_01a.inc b/testautomation/xml/optional/includes/sxw7_01a.inc
index f0121277b1e0..f0121277b1e0 100755..100644
--- a/testautomation/xml/optional/includes/sxw7_01a.inc
+++ b/testautomation/xml/optional/includes/sxw7_01a.inc
diff --git a/testautomation/xml/optional/includes/sxw7_02.inc b/testautomation/xml/optional/includes/sxw7_02.inc
index 659e574ed720..659e574ed720 100755..100644
--- a/testautomation/xml/optional/includes/sxw7_02.inc
+++ b/testautomation/xml/optional/includes/sxw7_02.inc
diff --git a/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc b/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc
index f38ed4158049..f38ed4158049 100755..100644
--- a/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc
+++ b/testautomation/xml/optional/includes/w_xml_vertical_alignment.inc
diff --git a/testautomation/xml/required/includes/oasis_graphics_01.inc b/testautomation/xml/required/includes/oasis_graphics_01.inc
index 9c323d46386b..9c323d46386b 100755..100644
--- a/testautomation/xml/required/includes/oasis_graphics_01.inc
+++ b/testautomation/xml/required/includes/oasis_graphics_01.inc
diff --git a/testautomation/xml/tools/includes/itools1.inc b/testautomation/xml/tools/includes/itools1.inc
index 762856de69cf..762856de69cf 100755..100644
--- a/testautomation/xml/tools/includes/itools1.inc
+++ b/testautomation/xml/tools/includes/itools1.inc