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

1 files changed, 0 insertions, 76 deletions

diff --git a/testautomation/graphics/optional/i_only_updt_2.bas b/testautomation/graphics/optional/i_only_updt_2.bas
deleted file mode 100644
index 7b35dbab5740..000000000000
--- a/testautomation/graphics/optional/i_only_updt_2.bas
+++ /dev/null
@@ -1,76 +0,0 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' 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.
-'
-'/************************************************************************
-'*
-'* Owner : wolfram.garten@oracle.com
-'*
-'* short description : Impress Only Required (Test Part 2)
-'*
-'\*****************************************************************
-
-public glLocale (15*20) as string
-global ExtensionString as String
-
-sub main
-    Printlog " -------------------- Impress-Only-Required-Test -----------------------------"
-    Call hStatusIn ( "Graphics","i_only_updt_2.bas")
-
-    use "graphics\tools\id_tools.inc"
-    use "graphics\tools\id_tools_2.inc"
-    use "graphics\required\includes\global\id_001.inc"                        'File
-    use "graphics\required\includes\global\id_007.inc"                        'Kontext
-    use "graphics\required\includes\global\id_008.inc"                        'Window
-    use "graphics\required\includes\global\id_009.inc"                        'Help
-    use "graphics\required\includes\global\id_011.inc"                        'Toolbars
-    use "graphics\required\includes\impress\im_007_.inc"                   'Praesentation
-
-    if hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () ) = FALSE then
-        qaErrorLog "Locales doesn't exist in file : "+gTesttoolPath + "graphics\tools\locale_1.txt"       ' this is needed for spellchecking.
-    endif
-
-    call id_011
-    Call tFileExportAsPDF
-    Call tExportAsPDFButton
-    Call im_007_
-    call id_008
-    call id_009
-    call id_007
-
-    Call hStatusOut
-end sub
-
-'----------------------------------------------
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    use "global\required\includes\g_option.inc"
-    use "global\required\includes\g_customize.inc"
-    use "global\required\includes\g_001.inc"
-    use "global\required\includes\g_009.inc"
-    gApplication   = "IMPRESS"
-    Call GetUseFiles()
-end sub
-