automationdev300m87: Rebased to DEV300m90

65 files changed, 971 insertions, 8141 deletions

diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 1594d5c59f57..e159c6a7b6cc 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -2,4 +2,6 @@ qa  qadevOOo    : javaunohelper jurt ridljar unoil NULL
 qa  qadevOOo                                             usr1    -   all qa_mkout NULL
 qa  qadevOOo			                         nmake   -   all qa_runner_ant_build NULL
 qa  qadevOOo\runner			                 nmake   -   all qa_make_package qa_runner_ant_build NULL
-qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi NULL
+
+qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL
+qa qadevOOo\qa\complex\junitskeleton        nmake - all qa_complex_junitskel qa_make_package NULL
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
new file mode 100644
index 000000000000..3ae5d3dad120
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@ -0,0 +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 --git a/qadevOOo/qa/complex/junitskeleton/TestDocument.java b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
new file mode 100644
index 000000000000..ff140a9991f6
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
@@ -0,0 +1,41 @@
+/*************************************************************************
+*
+* 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 java.io.File;
+import org.openoffice.test.OfficeFileUrl;
+
+final class TestDocument
+{
+    public static String getUrl(String name)
+        {
+            return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+        }
+
+    private TestDocument() {}
+}
diff --git a/qadevOOo/qa/complex/junitskeleton/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java
new file mode 100644
index 000000000000..5c11360b0717
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/justatest.java
@@ -0,0 +1,38 @@
+/**
+ * @author: ll93751
+ * @copyright: Sun Microsystems Inc. 2010
+ */
+
+package complex.junitskeleton;
+
+public class justatest /* extends *//* implements */ {
+    //public static void main( String[] argv ) {
+    //
+    //    }
+    public void justatest()
+        {
+            System.out.println("justatest CTor.");
+        }
+
+    public void testfkt()
+        {
+            System.out.println("Test called.");
+        }
+
+      /**
+    * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
+    * reset</code> call.
+    */
+    public static void shortWait()
+    {
+        try
+        {
+            Thread.sleep(500) ;
+        }
+        catch (InterruptedException e)
+        {
+            System.out.println("While waiting :" + e) ;
+        }
+    }
+
+}
diff --git a/qadevOOo/qa/complex/junitskeleton/makefile.mk b/qadevOOo/qa/complex/junitskeleton/makefile.mk
new file mode 100644
index 000000000000..301b8cf88fd7
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+    @echo "OOO_SUBSEQUENT_TESTS not set, do nothing."
+.ELSE
+
+PRJ = ../../..
+PRJNAME = sc
+TARGET = qa_complex_junitskeleton
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/junitskeleton
+
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    Skeleton.java
+
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    justatest.java \
+    TestDocument.java
+
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END
+
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
+
+ALLTAR : javatest
+
+.END
diff --git a/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
new file mode 100644
index 000000000000..775f01c4924d
--- /dev/null
+++ b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt
@@ -0,0 +1 @@
+Here you can store documents.
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index e954549fdca9..18f3a42b789f 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -56,7 +56,8 @@ ALLTAR : cpptest
 
 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 \
diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx
index fd283327c738..a4e532123456 100644
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketestoo_native/smoketest.cxx
@@ -28,8 +28,8 @@
 #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"
@@ -58,7 +58,7 @@
 #include "osl/diagnose.h"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
-#include "test/getargument.hxx"
+#include "test/gettestargument.hxx"
 #include "test/officeconnection.hxx"
 #include "test/oustringostreaminserter.hxx"
 #include "test/toabsolutefileurl.hxx"
@@ -149,8 +149,8 @@ void Test::tearDown() {
 void Test::test() {
     rtl::OUString doc;
     CPPUNIT_ASSERT(
-        test::getArgument(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("doc")), &doc));
+        test::getTestArgument(
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc));
     css::uno::Sequence< css::beans::PropertyValue > args(1);
     args[0].Name = rtl::OUString(
         RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode"));
@@ -168,10 +168,12 @@ void Test::test() {
             css::uno::Reference< css::frame::XController >(
                 css::uno::Reference< css::frame::XModel >(
                     css::uno::Reference< css::frame::XComponentLoader >(
-                        connection_.getFactory()->createInstance(
-                            rtl::OUString(
-                                RTL_CONSTASCII_USTRINGPARAM(
-                                    "com.sun.star.frame.Desktop"))),
+                        (connection_.getComponentContext()->
+                         getServiceManager()->createInstanceWithContext(
+                             rtl::OUString(
+                                 RTL_CONSTASCII_USTRINGPARAM(
+                                     "com.sun.star.frame.Desktop")),
+                             connection_.getComponentContext())),
                         css::uno::UNO_QUERY_THROW)->loadComponentFromURL(
                             test::toAbsoluteFileUrl(doc),
                             rtl::OUString(
@@ -184,11 +186,8 @@ void Test::test() {
         css::uno::UNO_QUERY_THROW);
     Result result;
     // Shifted to main thread to work around potential deadlocks (i112867):
-    css::uno::Reference< css::awt::XRequestCallback >(
-        connection_.getFactory()->createInstance( //TODO: AsyncCallback ctor
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback"))),
-        css::uno::UNO_QUERY_THROW)->addCallback(
+    com::sun::star::awt::AsyncCallback::create(
+        connection_.getComponentContext())->addCallback(
             new Callback(
                 disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
                 new Listener(&result)),
diff --git a/test/inc/test/gettestargument.hxx b/test/inc/test/gettestargument.hxx
new file mode 100644
index 000000000000..21b9df7a097e
--- /dev/null
+++ b/test/inc/test/gettestargument.hxx
@@ -0,0 +1,46 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+#ifndef INCLUDED_TEST_GETTESTARGUMENT_HXX
+#define INCLUDED_TEST_GETTESTARGUMENT_HXX
+
+#include "sal/config.h"
+
+#include "test/detail/testdllapi.hxx"
+
+namespace rtl { class OUString; }
+
+namespace test {
+
+// Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
+// bootstrap variable):
+OOO_DLLPUBLIC_TEST bool getTestArgument(
+    rtl::OUString const & name, rtl::OUString * value);
+
+}
+
+#endif
diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx
index 99a319d51a7e..45c0a370d3c4 100644
--- a/test/inc/test/officeconnection.hxx
+++ b/test/inc/test/officeconnection.hxx
@@ -33,8 +33,8 @@
 #include "osl/process.h"
 #include "test/detail/testdllapi.hxx"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
 } } } }
 
 namespace test {
@@ -51,13 +51,13 @@ public:
 
     void tearDown();
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-    getFactory() const;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    getComponentContext() const;
 
 private:
     oslProcess process_;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        factory_;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        context_;
 };
 
 }
diff --git a/test/prj/build.lst b/test/prj/build.lst
index 1bf76d664a7a..5ef6353a1dc3 100644
--- a/test/prj/build.lst
+++ b/test/prj/build.lst
@@ -1,4 +1,4 @@
 te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv unoil NULL
 te test\inc nmake - all inc NULL
 te test\source\cpp nmake - all source_cpp inc NULL
-te test\source\java nmake - all source_java NULL
+te test\source\java\org\openoffice\test nmake - all source_java NULL
diff --git a/test/prj/d.lst b/test/prj/d.lst
index 6a3827d90309..48f9d8edba0c 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -5,7 +5,7 @@ mkdir: %_DEST%\inc%_EXT%\test\detail
 ..\%__SRC%\lib\libtest.dylib %_DEST%\lib%_EXT%\libtest.dylib
 ..\%__SRC%\lib\libtest.so %_DEST%\lib%_EXT%\libtest.so
 ..\inc\test\detail\testdllapi.hxx %_DEST%\inc%_EXT%\test\detail\testdllapi.hxx
-..\inc\test\getargument.hxx %_DEST%\inc%_EXT%\test\getargument.hxx
+..\inc\test\gettestargument.hxx %_DEST%\inc%_EXT%\test\gettestargument.hxx
 ..\inc\test\officeconnection.hxx %_DEST%\inc%_EXT%\test\officeconnection.hxx
 ..\inc\test\oustringostreaminserter.hxx %_DEST%\inc%_EXT%\test\oustringostreaminserter.hxx
 ..\inc\test\toabsolutefileurl.hxx %_DEST%\inc%_EXT%\test\toabsolutefileurl.hxx
diff --git a/test/source/cpp/getargument.cxx b/test/source/cpp/getargument.cxx
index 339c5c9c797d..0db144679d92 100644
--- a/test/source/cpp/getargument.cxx
+++ b/test/source/cpp/getargument.cxx
@@ -29,10 +29,13 @@
 #include "rtl/bootstrap.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
-#include "test/getargument.hxx"
+
+#include "getargument.hxx"
 
 namespace test {
 
+namespace detail {
+
 bool getArgument(rtl::OUString const & name, rtl::OUString * value) {
     OSL_ASSERT(value != 0);
     return rtl::Bootstrap::get(
@@ -40,3 +43,5 @@ bool getArgument(rtl::OUString const & name, rtl::OUString * value) {
 }
 
 }
+
+}
diff --git a/test/inc/test/getargument.hxx b/test/source/cpp/getargument.hxx
index 1b4df29d2115..4ba7e0f47827 100644
--- a/test/inc/test/getargument.hxx
+++ b/test/source/cpp/getargument.hxx
@@ -23,22 +23,22 @@
 * for a copy of the LGPLv3 License.
 ************************************************************************/
 
-#ifndef INCLUDED_TEST_GETARGUMENT_HXX
-#define INCLUDED_TEST_GETARGUMENT_HXX
+#ifndef INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
+#define INCLUDED_TEST_SOURCE_CPP_GETARGUMENT_HXX
 
 #include "sal/config.h"
 
-#include "test/detail/testdllapi.hxx"
-
-namespace rtl { class OUString; }
-
 namespace test {
 
+namespace detail {
+
 // Obtain the value of an argument tunneled in via an "arg-<name>" bootstrap
 // variable:
-OOO_DLLPUBLIC_TEST bool getArgument(
+bool getArgument(
     rtl::OUString const & name, rtl::OUString * value);
 
 }
 
+}
+
 #endif
diff --git a/test/source/cpp/gettestargument.cxx b/test/source/cpp/gettestargument.cxx
new file mode 100644
index 000000000000..757faa751d37
--- /dev/null
+++ b/test/source/cpp/gettestargument.cxx
@@ -0,0 +1,43 @@
+/*************************************************************************
+*
+* 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.
+*
+************************************************************************/
+
+#include "sal/config.h"
+
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "test/gettestargument.hxx"
+
+#include "getargument.hxx"
+
+namespace test {
+
+bool getTestArgument(rtl::OUString const & name, rtl::OUString * value) {
+    return detail::getArgument(
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testarg.")) + name, value);
+}
+
+}
diff --git a/test/source/cpp/makefile.mk b/test/source/cpp/makefile.mk
index 9561be25fc1f..4c90dc678959 100644
--- a/test/source/cpp/makefile.mk
+++ b/test/source/cpp/makefile.mk
@@ -44,6 +44,7 @@ CFLAGSCXX+=-DADAPT_EXT_STL
 
 SLOFILES = \
     $(SLO)/getargument.obj \
+    $(SLO)/gettestargument.obj \
     $(SLO)/officeconnection.obj \
     $(SLO)/toabsolutefileurl.obj \
     $(SLO)/uniquepipename.obj
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index 85c1b855f88b..ca62a5c93c2b 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -30,8 +30,8 @@
 #include "com/sun/star/connection/NoConnectException.hpp"
 #include "com/sun/star/frame/XDesktop.hpp"
 #include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
 #include "cppuhelper/bootstrap.hxx"
 #include <preextstl.h>
 #include "cppunit/TestAssert.h"
@@ -39,11 +39,12 @@
 #include "osl/process.h"
 #include "osl/time.h"
 #include "sal/types.h"
-#include "test/getargument.hxx"
 #include "test/officeconnection.hxx"
 #include "test/toabsolutefileurl.hxx"
 #include "test/uniquepipename.hxx"
 
+#include "getargument.hxx"
+
 namespace {
 
 namespace css = com::sun::star;
@@ -60,7 +61,7 @@ void OfficeConnection::setUp() {
     rtl::OUString desc;
     rtl::OUString argSoffice;
     CPPUNIT_ASSERT(
-        getArgument(
+        detail::getArgument(
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice")),
             &argSoffice));
     if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("path:"))) {
@@ -77,7 +78,7 @@ void OfficeConnection::setUp() {
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
         rtl::OUString argUser;
         CPPUNIT_ASSERT(
-            getArgument(
+            detail::getArgument(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), &argUser));
         rtl::OUString userArg(
             rtl::OUString(
@@ -85,15 +86,12 @@ 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, classpathArg.pData };
+            acceptArg.pData, userArg.pData, jreArg.pData };
         rtl_uString ** envs = 0;
         rtl::OUString argEnv;
-        if (getArgument(
+        if (detail::getArgument(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")), &argEnv))
         {
             envs = &argEnv.pData;
@@ -117,14 +115,14 @@ void OfficeConnection::setUp() {
             cppu::defaultBootstrap_InitialComponentContext()));
     for (;;) {
         try {
-            factory_ =
-                css::uno::Reference< css::lang::XMultiServiceFactory >(
+            context_ =
+                css::uno::Reference< css::uno::XComponentContext >(
                     resolver->resolve(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno:")) +
                         desc +
                         rtl::OUString(
                             RTL_CONSTASCII_USTRINGPARAM(
-                                ";urp;StarOffice.ServiceManager"))),
+                                ";urp;StarOffice.ComponentContext"))),
                     css::uno::UNO_QUERY_THROW);
             break;
         } catch (css::connection::NoConnectException &) {}
@@ -138,21 +136,23 @@ void OfficeConnection::setUp() {
 }
 
 void OfficeConnection::tearDown() {
-    if (factory_.is()) {
-        css::uno::Reference< css::frame::XDesktop > desktop(
-            factory_->createInstance(
-                rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
-            css::uno::UNO_QUERY_THROW);
-        factory_.clear();
-        try {
-            CPPUNIT_ASSERT(desktop->terminate());
-            desktop.clear();
-        } catch (css::lang::DisposedException &) {}
-            // it appears that DisposedExceptions can already happen while
-            // receiving the response of the terminate call
-    }
     if (process_ != 0) {
+        if (context_.is()) {
+            css::uno::Reference< css::frame::XDesktop > desktop(
+                context_->getServiceManager()->createInstanceWithContext(
+                    rtl::OUString(
+                        RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.frame.Desktop")),
+                    context_),
+                css::uno::UNO_QUERY_THROW);
+            context_.clear();
+            try {
+                CPPUNIT_ASSERT(desktop->terminate());
+                desktop.clear();
+            } catch (css::lang::DisposedException &) {}
+                // it appears that DisposedExceptions can already happen while
+                // receiving the response of the terminate call
+        }
         CPPUNIT_ASSERT_EQUAL(osl_Process_E_None, osl_joinProcess(process_));
         oslProcessInfo info;
         info.Size = sizeof info;
@@ -164,9 +164,9 @@ void OfficeConnection::tearDown() {
     }
 }
 
-css::uno::Reference< css::lang::XMultiServiceFactory >
-OfficeConnection::getFactory() const {
-    return factory_;
+css::uno::Reference< css::uno::XComponentContext >
+OfficeConnection::getComponentContext() const {
+    return context_;
 }
 
 }
diff --git a/test/source/java/org/openoffice/test/Argument.java b/test/source/java/org/openoffice/test/Argument.java
new file mode 100644
index 000000000000..0380375d8519
--- /dev/null
+++ b/test/source/java/org/openoffice/test/Argument.java
@@ -0,0 +1,36 @@
+/*************************************************************************
+*
+* 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 org.openoffice.test;
+
+public final class Argument {
+    public static String get(String name) {
+        return System.getProperty("org.openoffice.test.arg." + name);
+    }
+
+    private Argument() {}
+}
diff --git a/test/source/java/org/openoffice/test/FileHelper.java b/test/source/java/org/openoffice/test/FileHelper.java
new file mode 100644
index 000000000000..722b31124d43
--- /dev/null
+++ b/test/source/java/org/openoffice/test/FileHelper.java
@@ -0,0 +1,62 @@
+/*
+ *  ************************************************************************
+ *
+ *  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 org.openoffice.test;
+
+/**
+ * Helper Functions for File handling
+ */
+public class FileHelper
+{
+    public FileHelper()
+        {
+        }
+    /**
+     * Concat a _sRelativePathToAdd to a _sPath and append a '/' to the _sPath only if need.
+     *
+     * @param _sPath
+     * @param _sRelativePathToAdd
+     * @return a right concated path
+     */
+    public static String appendPath(String _sPath, String _sRelativePathToAdd)
+    {
+        String sNewPath = _sPath;
+        String fs = System.getProperty("file.separator");
+        if (_sPath.startsWith("file:"))
+        {
+            fs = "/";                                  // we use a file URL so only '/' is allowed.
+        }
+        if (! (sNewPath.endsWith("/") || sNewPath.endsWith("\\") ) )
+        {
+            sNewPath += fs;
+        }
+        sNewPath += _sRelativePathToAdd;
+        return sNewPath;
+    }
+}
diff --git a/test/source/java/OfficeConnection.java b/test/source/java/org/openoffice/test/OfficeConnection.java
index 6887c3bfa3cd..60978717a993 100644
--- a/test/source/java/OfficeConnection.java
+++ b/test/source/java/org/openoffice/test/OfficeConnection.java
@@ -31,8 +31,9 @@ import com.sun.star.comp.helper.Bootstrap;
 import com.sun.star.connection.NoConnectException;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -49,17 +50,16 @@ public final class OfficeConnection {
     /** Start up an OOo instance.
     */
     public void setUp() throws Exception {
-        String sofficeArg = getArgument("soffice");
+        String sofficeArg = Argument.get("soffice");
         if (sofficeArg.startsWith("path:")) {
             description = "pipe,name=oootest" + UUID.randomUUID();
             ProcessBuilder pb = new ProcessBuilder(
                 sofficeArg.substring("path:".length()), "-quickstart=no",
                 "-nofirststartwizard", "-norestore",
                 "-accept=" + description + ";urp",
-                "-env:UserInstallation=" + getArgument("user"),
-                "-env:UNO_JAVA_JFW_ENV_JREHOME=true",
-                "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
-            String envArg = getArgument("env");
+                "-env:UserInstallation=" + Argument.get("user"),
+                "-env:UNO_JAVA_JFW_ENV_JREHOME=true");
+            String envArg = Argument.get("env");
             if (envArg != null) {
                 Map<String, String> env = pb.environment();
                 int i = envArg.indexOf("=");
@@ -85,11 +85,11 @@ public final class OfficeConnection {
             Bootstrap.createInitialComponentContext(null));
         for (;;) {
             try {
-                factory = UnoRuntime.queryInterface(
-                    XMultiServiceFactory.class,
+                context = UnoRuntime.queryInterface(
+                    XComponentContext.class,
                     resolver.resolve(
                         "uno:" + description +
-                        ";urp;StarOffice.ServiceManager"));
+                        ";urp;StarOffice.ComponentContext"));
                 break;
             } catch (NoConnectException e) {}
             if (process != null) {
@@ -104,19 +104,24 @@ public final class OfficeConnection {
         throws InterruptedException, com.sun.star.uno.Exception
     {
         boolean desktopTerminated = true;
-        if (factory != null) {
-            XDesktop desktop = UnoRuntime.queryInterface(
-                XDesktop.class,
-                factory.createInstance("com.sun.star.frame.Desktop"));
-            factory = null;
-            try {
-                desktopTerminated = desktop.terminate();
-            } catch (DisposedException e) {}
-                // it appears that DisposedExceptions can already happen while
-                // receiving the response of the terminate call
-            desktop = null;
-        } else if (process != null) {
-            process.destroy();
+        if (process != null) {
+            if (context != null) {
+                XMultiComponentFactory factory = context.getServiceManager();
+                assertNotNull(factory);
+                XDesktop desktop = UnoRuntime.queryInterface(
+                    XDesktop.class,
+                    factory.createInstanceWithContext(
+                        "com.sun.star.frame.Desktop", context));
+                context = null;
+                try {
+                    desktopTerminated = desktop.terminate();
+                } catch (DisposedException e) {}
+                    // it appears that DisposedExceptions can already happen
+                    // while receiving the response of the terminate call
+                desktop = null;
+            } else {
+                process.destroy();
+            }
         }
         int code = 0;
         if (process != null) {
@@ -130,10 +135,10 @@ public final class OfficeConnection {
         assertTrue(errTerminated);
     }
 
-    /** Obtain the service factory of the running OOo instance.
+    /** Obtain the component context of the running OOo instance.
     */
-    public XMultiServiceFactory getFactory() {
-        return factory;
+    public XComponentContext getComponentContext() {
+        return context;
     }
 
     //TODO: get rid of this hack for legacy qa/unoapi tests
@@ -141,10 +146,6 @@ public final class OfficeConnection {
         return description;
     }
 
-    private static String getArgument(String name) {
-        return System.getProperty("org.openoffice.test.arg." + name);
-    }
-
     private static Integer waitForProcess(Process process, final long millis)
         throws InterruptedException
     {
@@ -217,5 +218,5 @@ public final class OfficeConnection {
     private Process process = null;
     private Forward outForward = null;
     private Forward errForward = null;
-    private XMultiServiceFactory factory = null;
+    private XComponentContext context = null;
 }
diff --git a/test/source/java/org/openoffice/test/OfficeFileUrl.java b/test/source/java/org/openoffice/test/OfficeFileUrl.java
new file mode 100644
index 000000000000..1ab62e283e6a
--- /dev/null
+++ b/test/source/java/org/openoffice/test/OfficeFileUrl.java
@@ -0,0 +1,42 @@
+/*************************************************************************
+*
+* 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 org.openoffice.test;
+
+import java.io.File;
+
+/** Obtain the office-internal absolute file URL of a given file.
+ */
+public final class OfficeFileUrl {
+    public static String getAbsolute(File file) {
+        return file.getAbsoluteFile().toURI().toString().replaceFirst(
+            "\\A[Ff][Ii][Ll][Ee]:/(?=[^/]|\\z)", "file:///");
+            // file:/path -> file:///path
+    }
+
+    private OfficeFileUrl() {}
+}
diff --git a/test/source/java/org/openoffice/test/TestArgument.java b/test/source/java/org/openoffice/test/TestArgument.java
new file mode 100644
index 000000000000..1303d09e1ba2
--- /dev/null
+++ b/test/source/java/org/openoffice/test/TestArgument.java
@@ -0,0 +1,39 @@
+/*************************************************************************
+*
+* 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 org.openoffice.test;
+
+/** Obtain the value of a test argument (tunneled in via an
+    "org.openoffice.test.arg.testarg.<name>" system property).
+ */
+public final class TestArgument {
+    public static String get(String name) {
+        return Argument.get("testarg." + name);
+    }
+
+    private TestArgument() {}
+}
diff --git a/test/source/java/makefile.mk b/test/source/java/org/openoffice/test/makefile.mk
index a541d532f158..9314ea6a1506 100644
--- a/test/source/java/makefile.mk
+++ b/test/source/java/org/openoffice/test/makefile.mk
@@ -23,14 +23,19 @@
 # for a copy of the LGPLv3 License.
 #***********************************************************************/
 
-PRJ = ../..
+PRJ = ../../../../..
 PRJNAME = test
 TARGET = java
 
 .IF "$(OOO_JUNIT_JAR)" != ""
 
 PACKAGE = org/openoffice/test
-JAVAFILES = OfficeConnection.java
+JAVAFILES = \
+    Argument.java \
+    FileHelper.java \
+    OfficeConnection.java \
+    OfficeFileUrl.java \
+    TestArgument.java
 JARFILES = juh.jar ridl.jar unoil.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc
index b9ed8420134e..3a70c8051808 100755..100644
--- a/testautomation/framework/required/includes/script_organizers.inc
+++ b/testautomation/framework/required/includes/script_organizers.inc
@@ -78,6 +78,7 @@ testcase tUpdtScripts
     dim iCurrentDialog as integer
 
     dim iDiffCount as integer
+    dim max_diffcount as integer
 
     hInitSingleDoc()
 
@@ -109,25 +110,33 @@ testcase tUpdtScripts
         case DLG_JAVASCRIPT: ToolsMacrosOrganizeMacrosJavaScript
             kontext "ScriptOrganizer"
             hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+            max_diffcount = 0
         case DLG_BEANSHELL: ToolsMacrosOrganizeMacrosBeanShell
             kontext "ScriptOrganizer"
             hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+            max_diffcount = 0
         case DLG_PYTHON: ToolsMacrosOrganizeMacrosPython
             kontext "ScriptOrganizer"
             hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+            max_diffcount = 0
         case DLG_BASIC_ORG: ToolsMacro_uno
             Kontext "Makro"
             hGetScriptNames( MakroAus, MakroListe, cScriptNamesList() )
+            max_diffcount = 6
         case DLG_RUN_MACRO: ToolsMacrosRunMacro
             kontext "ScriptSelector"
             hGetScriptNames( LibraryTreeList, ScriptList, cScriptNamesList() )
+            max_diffcount = 6
         end select
         
         printlog( "Compare to reference list, create new one if differences were found" )
-        iDiffCount = hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() )
-
-        if ( iDiffCount <> 0 ) then warnlog( "The number of scripts has changed, please review." )
+        iDiffCount = abs( hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() ) )
 
+        ' Usually we should have 0 differences in the list. However, as we do not have
+        ' a unique way of installing the office (Root-Installation, archives and
+        ' others) we need a little tolerance here. If a number of bundled extensions
+        ' are installed, we have more scripts.
+        if ( iDiffCount > max_diffcount ) then warnlog( "The number of scripts has changed, please review." )
 
         printlog( "Close <" & sDialog & ">" )
         select case ( sDialog ) 
diff --git a/testautomation/graphics/optional/i_only_updt_1.bas b/testautomation/graphics/optional/i_only_updt_1.bas
deleted file mode 100755
index 98d226424f00..000000000000
--- a/testautomation/graphics/optional/i_only_updt_1.bas
+++ /dev/null
@@ -1,77 +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 1)
-'*
-'\*****************************************************************
-
-public glLocale (15*20) as string
-global ExtensionString as String
-
-sub main
-    Printlog " -------------------- Impress-Only-Required-Test -----------------------------"
-    Call hStatusIn ( "Graphics","i_only_updt_1.bas")
-
-    use "graphics\tools\id_tools.inc"
-    use "graphics\tools\id_tools_2.inc"
-    use "graphics\required\includes\global\id_002.inc"                        'Edit
-    use "graphics\required\includes\global\id_003.inc"                        'View
-    use "graphics\required\includes\global\id_004.inc"                        'Insert
-    use "graphics\required\includes\global\id_005.inc"                        'Format
-    use "graphics\required\includes\global\id_006.inc"                        'Tools
-    use "graphics\required\includes\impress\im_003_.inc"                   'Ansicht
-    use "graphics\required\includes\impress\im_004_.inc"                   'Einfuegen
-
-    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_002
-    call im_003_
-    call id_003
-    call im_004_
-    call id_004
-    call id_005
-    call id_Tools
-
-    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
-
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
-
diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas
index fc1196fdb182..c8836cad4887 100644..100755
--- a/testautomation/graphics/optional/i_us_presentation.bas
+++ b/testautomation/graphics/optional/i_us_presentation.bas
@@ -42,14 +42,7 @@ sub main
 
     PrintLog "------------ Graphics User-scenario-test: PowerUser creates a Presentation ------------"
 
-    Call i_us_presentation1  ' User-Scenario: Pro.
-    Call i_us_presentation2
-    Call i_us_presentation3
-    Call i_us_presentation4
-    Call i_us_presentation5
-    Call i_us_presentation6
-    Call i_us_presentation7
-
+    Call i_us_presentation  ' User-Scenario: Pro.
     Call i_us2_pres1         ' User-Scenario: Beginner.
     Call i_us2_pres2
 
diff --git a/testautomation/graphics/optional/includes/draw/d_002_.inc b/testautomation/graphics/optional/includes/draw/d_002_.inc
deleted file mode 100644
index 9b2f267a0729..000000000000
--- a/testautomation/graphics/optional/includes/draw/d_002_.inc
+++ /dev/null
@@ -1,109 +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 :
-'*
-'\*****************************************************************
-
-
-testcase tdEditCrossFading
-
-    printlog " open application "
-    Call hNewDocument
-    printlog " create 2 rectangles "
-    gMouseClick 50,50
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    Call hRechteckErstellen ( 30, 30, 50, 60 )
-    printlog " Edit-YSelect All "
-    EditSelectAll
-    try
-        printlog " Edit->Cross-fading "
-        EditCrossFading
-    catch
-        warnlog "EditCrossFading not accessible :-("
-    endcatch
-    
-    Kontext "Ueberblenden"
-    Call DialogTest ( Ueberblenden )
-    printlog " Change : 'Increments'; 1 more, 1 less "
-    Schritte.More
-    Schritte.Less
-    printlog " Change: Cross-fading attributes; uncheck, check "
-    Attributierung.uncheck
-    Attributierung.check
-    printlog " Change: same orientation; uncheck, check "
-    GleicheOrientierung.Uncheck
-    GleicheOrientierung.Check
-    printlog " cancel dialog 'Cross-fading'; uncheck, check "
-    Ueberblenden.Cancel
-    printlog " close application "
-    Call hCloseDocument
-    
-endcase 'tdEditCrossFading
-'------------------------------------------------------------------------------
-testcase tdEditLayer
-
-    printlog " open application "
-    Call hNewDocument
-    printlog " View->Layer "
-    ViewLayer
-    printlog " Edit->Layer->Insert "
-    InsertLayer
-    Kontext "EbeneEinfuegenDlg"
-    Call DialogTest ( EbeneEinfuegenDlg )
-    printlog " Change: Set another name for the layer "
-    EbenenName.SetText "SomeThing"
-    printlog " Change: Visible; uncheck, check "
-    Sichtbar.UnCheck
-    Sichtbar.Check
-    printlog " Change: Printable; uncheck, check "
-    Druckbar.UnCheck
-    Druckbar.Check
-    printlog " Change: Locked; check, uncheck "
-    Gesperrt.Check
-    Gesperrt.UnCheck
-    EbeneEinfuegenDlg.OK
-    printlog " (Edit->Layer->Modify is tested in format-menu-test) "
-    printlog " Edit->Layer->Rename "
-    EditLayerRename
-    kontext "DocumentDrawImpress"
-    LayerTabBar.TypeKeys "Apply!!<Return>" , true
-    printlog " Edit->Layer->Delete "
-    EditDeleteLayer    
-    printlog " Messagebox: really delete? YES "
-    Kontext "Messagebox"
-    Messagebox.Yes
-    sleep (2)
-    printlog " View->Layer "
-    ViewLayer
-    printlog " close application "
-    Call hCloseDocument
-
-endcase 'tdEditLayer
-'------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/draw/d_003_.inc b/testautomation/graphics/optional/includes/draw/d_003_.inc
deleted file mode 100644
index 744461061559..000000000000
--- a/testautomation/graphics/optional/includes/draw/d_003_.inc
+++ /dev/null
@@ -1,82 +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 :
-'*
-'\*****************************************************************
-
-testcase tdViewPagePane
-
-    printlog " open application "
-    Call hNewDocument
-    sleep 1
-    kontext "pagepane"
-    if (NOT pagepane.exists) then
-        qaerrorlog "Pages Panel not visible on opening application. Opening now."
-        ViewPagePane
-    endif
-    kontext "pagepane"
-    sleep (2)
-    try
-        printlog " View->Page Pane "
-        ViewPagePane
-        sleep (2)
-        if (pagepane.exists) then
-            warnlog "View->Page Pane failed."
-            ViewPagePane
-        endif
-    catch
-        warnlog "View->Page Pane couldn't get executed"
-    endcatch
-    sleep 1
-    if (NOT pagepane.exists) then
-        ViewPagePane
-        sleep (1)
-    endif
-    printlog " close application "
-    Call hCloseDocument
-    
-endcase 'tdViewPagePane
-
-'-------------------------------------------------------------------------------
-testcase tdViewSlide
-
-    printlog " open application "
-    hNewDocument
-    kontext "DocumentDrawImpress" ' special case :-)
-    printlog " click the button on the bottom: 'Master View' (because it is not accessible via the menu :-() "
-    ViewMasterPage
-    sleep 1
-    printlog " View->Slide "
-    ViewPagePane
-    Sleep 1
-    printlog " close application "
-    Call  hCloseDocument
-   
-endcase 'tdViewSlide
diff --git a/testautomation/graphics/optional/includes/draw/d_005_.inc b/testautomation/graphics/optional/includes/draw/d_005_.inc
deleted file mode 100644
index 6c3e7b2484df..000000000000
--- a/testautomation/graphics/optional/includes/draw/d_005_.inc
+++ /dev/null
@@ -1,51 +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 :
-'*
-'\*****************************************************************
-
-testcase tiFormatLayer
-    
-    printlog " open application "
-    Call  hNewDocument
-    printlog " View->Layer "
-    ViewLayer
-    printlog " Format->Layer "
-    FormatLayer
-    Kontext "EbeneAendernDlg"
-    DialogTest ( EbeneAendernDlg )
-    printlog " cancel dialog 'Modify Layer' "
-    EbeneAendernDlg.Cancel
-    printlog " View->Layer "
-    ViewLayer
-    printlog " close application "
-    Call hCloseDocument
-
-endcase 'tiFormatLayer
diff --git a/testautomation/graphics/optional/includes/draw/d_007.inc b/testautomation/graphics/optional/includes/draw/d_007.inc
deleted file mode 100644
index 89fef373f161..000000000000
--- a/testautomation/graphics/optional/includes/draw/d_007.inc
+++ /dev/null
@@ -1,47 +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 :
-'*
-'\*****************************************************************
-
-testcase tdModifyRotate
-
-    printlog " open application "
-    Call  hNewDocument
-    printlog " create a rectangle "
-    Call hRechteckErstellen 20,20,40,40
-    sleep 1
-    printlog " Modify->Rotate "
-    ModifyRotate
-    sleep 1
-    printlog " close application "
-    Call hCloseDocument
-   
-endcase 'tdModifyRotate
diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc
deleted file mode 100644
index 15a99c0d3f23..000000000000
--- a/testautomation/graphics/optional/includes/global/id_001.inc
+++ /dev/null
@@ -1,725 +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 :
-'*
-'\**********************************************************************************
-
-
-testcase tiFileSaveAs
-
-    dim sFileName as string ' test document & new created doc
-    '   dim sFormula as string  ' container for formula to create document with
-    dim sTemp as string
-    dim sFilter (50) as string
-    dim i as integer
-    dim x as integer
-    dim y as integer
-    dim Exlist(100) as string ' files to be deleted
-    dim sFile as string ' filename to export
-    dim sPath as string ' filename to export
-
-    if (gApplication = "IMPRESS") then
-        ExtensionString = "odp"
-    else
-        ExtensionString = "odg"
-    end if
-
-    sFilter (0) = 0 ' initalize ;-)...
-
-    sFileName = "graphics\required\input\tbo_alf_." + ExtensionString    ' this is the file with all features
-    sFile = "isas_"                                ' this is the filename of the export files
-    sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path
-    if dir (sPath) = "" then
-        app.mkdir (sPath)
-    end if
-
-    if gSamePC = TRUE then ' delete export directory
-        GetFileList ( sPath, sFile+"*", Exlist() )
-        if KillFileList ( Exlist() ) <> TRUE then
-            Warnlog "Couldn't delete all Files in Output-Export-Directory, the followings are still there:"
-            for i=1 to ListCount ( Exlist() )
-                printlog "  <> " + Exlist(i)
-            next i
-        end if
-    end if
-
-    Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
-    WaitSlot (3000)
-
-
-    ' to use the helper fileSaveAs functions i get alll available filters...
-    FileSaveAs
-    WaitSlot (2000)
-    Kontext "SpeichernDlg"
-    for i = 0 to 5
-        if i=0 then x = Dateityp.GetItemCount
-            if (i) then  ' set border, whenm start from beginning/end
-                y = i     ' set filter from beginning
-            else
-                y = x-3     ' set filter from end
-            end if
-            ListAppend(sFilter(), Dateityp.GetItemText (y))
-        next i
-        SpeichernDlg.Cancel
-        y = ListCount(sFilter())
-
-        if gtSYSName = "Linux" then y=y-1
-            '#i45961# - last part of filter-list deactivated due to BUG - FHA
-            'TODO: JSI->FHA please verify if this special handling needed after the issue has been fixed.
-
-            for i = 1 to y
-                sFileName = sPath + sFile + (i)
-                hFileSaveAsWithFilter (sFileName, sFilter(i), TRUE )
-                kontext
-                if messagebox.exists then
-                    messagebox.Yes ' to go on ....
-                end if
-                printlog " saved with filter ("+i+"/"+y+"): "+ sFilter(i)
-            next i
-            ' TODO TBO: small check, if correct filter was used!
-            WaitSlot (3000)
-            fileclose
-            WaitSlot (3000)
-            kontext "Messagebox"
-            if Messagebox.exists then
-                printlog "Messagebox about informationloss... :-) that's OK: 'Text in the messagebox: "+Messagebox.GetText+"'"
-                Messagebox.YES
-            end if
-
-            '-----------------------------------------------------------------
-            hNewDocument
-
-
-            sFilter (0) = 0
-            sFileName = sPath
-            GetFileList ( sFileName, sFile + "*", sFilter() )
-
-            '   call hNewDocument
-            x = ListCount ( sFilter() )
-            for i = 1 to x
-                printlog "("+i+"/"+x+"): "+sFilter(i)
-                hFileOpen ( sFilter(i) )
-                WaitSlot (3000)
-                If hIsNamedDocLoaded (sFilter(i)) Then
-                    printlog "  used filter: " + hGetUsedFilter()
-                else
-                    sTemp = left(right(sFilter(i),2),1)
-                    if ( (sTemp = "t") OR (sTemp = "o") ) then
-                        printlog "document is --- TEMPLATE?! --- "
-                    else
-                        qaErrorlog "#116563# document didn't get loaded "
-                    end if
-                end if
-                hCloseDocument
-                WaitSlot (2000)
-            next i
-            '   Call hCloseDocument
-endcase
-
-testcase tiFileReload
-    Dim DokumentPfad$
-    Dim Datei$
-
-    if (gApplication = "IMPRESS") then
-        ExtensionString = "odp"
-    else
-        ExtensionString = "odg"
-    end if
-
-    Datei$= (ConvertPath (gOfficePath + "user/work/graphics/required/version1." + ExtensionString))
-
-    if app.dir(ConvertPath (gOfficePath + "user/work/graphics/required/")) = "" then
-        app.mkdir (ConvertPath (gOfficePath + "user/work/graphics/required/"))
-    end if
-    Call hNewDocument
-    WaitSlot (2000)
-    Call hFileSaveAsKill (Datei$)
-    WaitSlot (2000)
-    Call hCloseDocument
-
-    Call hFileOpen (Datei$)
-    WaitSlot (2000)
-    call hTBOtypeInDoc
-    WaitSlot (2000)
-    FileReload
-    WaitSlot (2000)
-    Kontext "Messagebox"
-    sleep 2
-    Messagebox.No
-    WaitSlot (2000)
-
-    FileReload
-    WaitSlot (2000)
-    Kontext "Messagebox"
-    sleep 2
-    Messagebox.Yes
-    WaitSlot (1000)
-
-    Call hCloseDocument
-    if Dir (Datei$) <> "" AND gSamePC = TRUE then kill Datei$
-endcase
-
-testcase tiFileVersion
-    Dim DokumentPfad$
-    Dim Datei$
-
-    if (gApplication = "IMPRESS") then
-        ExtensionString = "odp"
-    else
-        ExtensionString = "odg"
-    end if
-
-    Datei$= (ConvertPath (gOfficePath + "user/work/graphics/required/erwin." + ExtensionString))
-    'if dir (ConvertPath (gOfficePath + "user/work/graphics/required/")) = "" then
-    if dir (Datei$) = "" then app.mkdir (ConvertPath (gOfficePath + "user/work/graphics/required/"))
-        Call hNewDocument
-        WaitSlot (1000)
-        Call hFileSaveAsKill (Datei$)
-        WaitSlot (1000)
-        Call hCloseDocument
-
-        Call hFileOpen (Datei$)
-        WaitSlot (1000)
-        call hTBOtypeInDoc
-        WaitSlot (1000)
-        try
-            FileVersions
-        catch
-            Warnlog "- File / Versions not accessible!"
-            goto endsub
-        endcatch
-
-        Kontext "Versionen"
-        Call DialogTest ( Versionen )
-        Speichern.Click
-        Kontext "VersionskommentarEingeben"
-        Call DialogTest ( VersionskommentarEingeben )
-        VersionskommentarEingeben.Cancel
-        Kontext "Versionen"
-        Versionen.Close
-        Call hCloseDocument
-        '   if Dir (Datei$) <> "" AND gSamePC = TRUE then kill Datei$
-endcase
-
-testcase tiFilePassword
-    goto endsub
-    Dim DokumentPfad$
-    Dim Datei$
-    dim sFileName as string ' test document & new created doc
-    '   dim sFormula as string  ' container for formula to create document with
-    dim e as string
-    dim sTemp as string
-    dim sFilter (50) as string
-    dim i as integer
-    dim x as integer
-    dim y as integer
-    dim Exlist(100) as string ' files to be deleted
-    dim sFileIn as string ' filename to import
-    dim sFile as string ' filename to export
-    dim sPath as string ' and path to export
-
-    if (gApplication = "IMPRESS") then
-        ExtensionString = "odp"
-    else
-        ExtensionString = "odg"
-    end if
-
-    sFile = "isp__"                                                     ' this is the filename of the export files
-    sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform+"\") ' this is the export path
-    mkdir (sPath)
-    if dir (sPath) = "" then app.mkdir (sPath)
-        sFileIn = (sPath + sFile + "." + ExtensionString)
-        if gSamePC = TRUE then ' delete export directory
-            GetFileList ( sPath, sFile+"*", Exlist() )
-            if KillFileList ( Exlist() ) <> TRUE then
-                Warnlog "Couldnt delete all Files in Output-Export-Directory, the followings are still there:"
-                for i=1 to ListCount ( Exlist() )
-                    printlog "  <> " + Exlist(i)
-                next i
-            end if
-        end if
-
-        Call hNewDocument
-        WaitSlot (1000)
-        FileSaveAs
-        Kontext "SpeichernDlg"
-        Datei$ = ConvertPath ( sFileIn )
-        printlog "   will use the file: "+Datei$
-        if Dir (Datei$) <> "" then
-            kill Datei$
-        end if
-        Passwort.Check
-        Dateiname.SetText Datei$
-        Speichern.Click
-        WaitSlot (2000)
-        Kontext "Passwort"
-        PasswortName.SetText "12345"
-        PasswortBestaetigen.Settext "54321"
-        Passwort.OK
-        WaitSlot (2000)
-        Kontext "Messagebox"
-        if Messagebox.Exists(1) then
-            Messagebox.OK
-        else
-            Warnlog "- Wrong password not recognized"
-        end if
-        Kontext "Passwort"
-        PasswortName.SetText "12345"
-        PasswortBestaetigen.SetText "12345"
-        Passwort.OK
-        sleep 2
-        FileClose
-        sleep 2
-
-        FileOpen
-        Kontext "OeffnenDlg"
-        WaitSlot (2000)
-        Dateiname.SetText Datei$
-        Oeffnen.Click
-        WaitSlot (2000)
-        Kontext "PasswordFileOpen"
-        PasswortName.SetText "34567"
-        try
-            PasswordFileOpen.OK
-        catch
-            Printlog "- Wrong password not accepted"
-        endcatch
-        Kontext
-        if Not Messagebox.Exists(1) then
-            Warnlog "Wrong password while loading not recognized"
-        else
-            Messagebox.OK
-            printlog "Wrong password on loading ok - recogniced"
-        end if
-        WaitSlot (3000)
-        Kontext "PasswordFileOpen"
-        PasswortName.SetText "12345"
-        PasswordFileOpen.OK
-        WaitSlot (5000)
-        FileSaveAs
-        Kontext "SpeichernDlg"
-        Dateiname.SetText Datei$
-        if (Passwort.IsChecked <> TRUE) then
-            Warnlog "Password has to be checked! :-("
-        end if
-        Speichern.Click
-        WaitSlot (1000)
-        Kontext "Messagebox"
-        if Messagebox.Exists(5) then
-            Messagebox.Yes
-        end if
-        Kontext "Passwort"
-        if (Passwort.Exists(5) = FALSE)then
-            Warnlog "- Password dialog Didn't pop up after pressing save"
-        else
-            Kontext "Passwort"
-            WaitSlot (1000)
-            PasswortName.SetText "a12345"
-            PasswortBestaetigen.SetText "a12345"
-            Passwort.OK
-            WaitSlot (1000)
-            FileClose
-            WaitSlot (1000)
-        end if
-        FileOpen
-        WaitSlot (2000)
-        Kontext "OeffnenDlg"
-        Dateiname.SetText Datei$
-        Oeffnen.Click
-        Kontext "PasswordFileOpen"
-        WaitSlot (1000)
-        PasswortName.SetText "a12345"
-        PasswordFileOpen.OK
-        WaitSlot (5000)
-        FileSaveAs
-        Kontext "SpeichernDlg"
-        Dateiname.SetText Datei$
-        if (Passwort.IsChecked <> TRUE) then
-            Warnlog "Password has to be checked! :-("
-        end if
-        Passwort.UnCheck
-        Speichern.Click
-        Kontext "Messagebox"
-        if Messagebox.Exists(5) then Messagebox.Yes
-            Kontext "Passwort"
-            if (Passwort.Exists(5))then
-                Warnlog "- Password dialog didn't pop up after pressing save"
-                Kontext "Passwort"
-                password.cancel
-                FileClose
-            else
-                hCloseDocument
-            end if
-endcase
-
-testcase tiFileTemplates
-    Call hNewDocument
-
-    FileTemplatesOrganize
-    Kontext "DVVerwalten"
-    WaitSlot (1000)
-    Call DialogTest (DVVerwalten)
-    sleep 1
-    PopuplisteLinks.Select 2
-    WaitSlot (1000)
-    PopuplisteRechts.Select 2
-    WaitSlot (1000)
-    WelcheDatei.Click
-    WaitSlot (1000)
-    Kontext "Oeffnendlg"
-    Call DialogTest (OeffnenDlg)
-    sleep 1
-    OeffnenDlg.Cancel
-    WaitSlot (2000)
-    Kontext "DVVerwalten"
-    DVVerwalten.Close
-
-    if gtSYSName = "Solaris x86" then
-        qaErrorLog "#i62423# - FileTemplatesAddressBookSource outcommented under x86. - FHA"
-    else
-        FileTemplatesAddressBookSource
-        Printlog "- AddressBookAssignment"
-        kontext "AddressBookSource"
-        Call DialogTest (AddressBookSource)
-        Administrate.Click
-        kontext "AddressSourceAutopilot"
-        AddressSourceAutopilot.Cancel
-        kontext "AddressBookSource"
-        AddressBookSource.Cancel
-    end if
-
-    FileTemplatesSave
-    Printlog "- Save template"
-    WaitSlot (1000)
-    Kontext "Dokumentvorlagen"
-    sleep 1
-    Call DialogTest (Dokumentvorlagen)
-    WaitSlot (1000)
-    Verwalten.Click
-    WaitSlot (2000)
-    Kontext "DVVerwalten"
-    Call DialogTest (DVVerwalten)
-    WaitSlot (3000)
-    DVVerwalten.Close
-    WaitSlot (1000)
-    Kontext "Dokumentvorlagen"
-    sleep 1
-    Dokumentvorlagen.Cancel
-    WaitSlot (1000)
-
-    try
-        FileTemplatesEdit
-        Printlog "- Edit template"
-        WaitSlot (1000)
-        Kontext "OeffnenDlg"
-        sleep 1
-        Call DialogTest (OeffnenDlg)
-        WaitSlot (1000)
-        OeffnenDlg.Cancel
-    catch
-        Warnlog "- There are problems with File-Template-Save"
-    endcatch
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-
-'-----------------------------------------------------------
-'*******************  M A T H dito *************************
-'-----------------------------------------------------------
-
-
-testcase tmFileNewFromTemplate
-    Call hNewDocument
-    FileNewFromTemplate
-    WaitSlot (5000)
-    Kontext "TemplateAndDocuments"
-    if TemplateAndDocuments.NotExists then
-        Warnlog "Dialog Templates and Documents are not up!"
-        goto endsub
-    end if
-    Call DialogTest (TemplateAndDocuments)
-    WaitSlot (5000)
-    try
-        TemplateAndDocuments.Cancel
-    catch
-    endcatch
-    WaitSlot (5000)
-    Call hCloseDocument
-endcase
-
-testcase tmFileOpen
-    call hNewDocument
-    FileOpen
-    Kontext "OeffnenDlg"
-    UebergeordneterOrdner.Click
-    Standard.Click
-    NurLesen.check
-    Call DialogTest ( OeffnenDlg )
-    OeffnenDlg.Cancel
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tmFileClose
-    printlog "- File Close"
-    hNewDocument    ' just for the records: I open ONE document
-    call hTBOtypeInDoc
-    WaitSlot (2000)
-    FileClose
-    Kontext         ' Expecting "Modified, do you want to close?"
-    if active.exists (5) then
-        printlog "  Ok, active came up: " + active.gettext
-        Active.Cancel   ' No, not this time
-    else
-        warnlog "active missing (1)"
-    end if
-    WaitSlot (2000)
-
-    FileClose
-    Kontext
-    Active.Yes      ' but now - records: this document is closed
-    WaitSlot (2000)
-
-    Kontext "SpeichernDlg"
-    Call DialogTest ( SpeichernDlg )
-    SpeichernDlg.Cancel
-    WaitSlot (2000)
-
-    FileClose       ' now the office gets closed! (if there were no modifications!)
-    Kontext
-    Active.No
-    WaitSlot (2000)
-endcase
-'-----------------------------------------------------------
-testcase tmFileSave
-    hNewDocument
-    call hTBOtypeInDoc
-
-    FileSave
-    WaitSlot (2000)
-    Kontext "SpeichernDlg"
-    UebergeordneterOrdner.click
-    Standard.Click
-    Call DialogTest (SpeichernDlg)
-    Kontext "SpeichernDlg"
-    Standard.Click
-    SpeichernDlg.Cancel
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tmFileSaveAs
-
-    hNewDocument
-    WaitSlot (2000)
-    call hTBOtypeInDoc
-
-    FileSaveAs
-    WaitSlot (2000)
-    Kontext "SpeichernDlg"
-    if (SpeichernDlg.exists (5) = FALSE) then
-        warnlog "FileSaveAs dialog is not visible"
-    end if
-    WaitSlot (2000)
-    Passwort.check
-    Passwort.uncheck
-    UebergeordneterOrdner.click
-    Standard.Click
-
-    NeuerOrdner.click
-    kontext "NeuerOrdner"
-    neuerordner.cancel
-    Kontext "SpeichernDlg"
-
-    Call DialogTest (SpeichernDlg)
-
-    Kontext "SpeichernDlg"
-    SpeichernDlg.Cancel
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tmFileSaveAll
-    printlog "- File SaveAll"
-
-    hNewDocument
-    call hTBOtypeInDoc
-
-    Printlog "  open 2. window"
-    hNewDocument
-    call hTBOtypeInDoc
-
-    Printlog "  call save all"
-    FileSaveAll
-    Printlog "  cancel 1. save"
-    Kontext "SpeichernDlg"
-    SpeichernDlg.Cancel
-
-    Printlog "  cancel 2. save"
-    WaitSlot (2000)
-    Kontext "SpeichernDlg"
-    SpeichernDlg.Cancel
-    WaitSlot (2000)
-
-    try
-        Kontext "SpeichernDlg"
-        SpeichernDlg.Cancel
-        printlog "smth had been typed in the starting window (just a hint ;-) )"
-    catch
-        printlog "--------- no other window wants to get saved. :-)"
-    endcatch
-
-    WaitSlot (2000)
-    Printlog "  hCloseDocument both"
-    Call hCloseDocument
-    sleep 2
-    Printlog "  first closed"
-    Call hCloseDocument
-    WaitSlot (2000)
-    Printlog "  second closed"
-    WaitSlot (5000)
-endcase
-
-testcase tmFileProperties
-    printlog "- File Properties"
-
-    Call hNewDocument
-    FileProperties
-
-    Kontext
-    active.SetPage TabDokument
-    Kontext "TabDokument"
-    Call DialogTest ( TabDokument )
-
-    Kontext
-    active.SetPage TabDokumentInfo
-    Kontext "TabDokumentInfo"
-    Call DialogTest ( TabDokumentInfo )
-
-    'Deactivating this part because of #i95523#:
-    'Kontext
-    'active.SetPage TabBenutzer
-    'Kontext "TabBenutzer"
-    'Call DialogTest ( TabBenutzer )
-    'Infofelder.Click
-    '   Kontext "InfonamenBearbeiten"
-    '   Call DialogTest (InfonamenBearbeiten)
-    'InfonamenBearbeiten.Cancel
-
-    Kontext
-    active.SetPage TabInternet
-    Kontext "TabInternet"
-    Call DialogTest (TabInternet)
-    TabInternet.Cancel
-
-    Call hCloseDocument
-endcase
-
-testcase tmFilePrinterSetting
-    printlog "- File Printersettings"
-    Call hNewDocument
-    WaitSlot (3000)
-    FilePrintersettings
-    kontext
-    if active.exists(5) then
-        active.ok
-        qaerrorlog "There is no printer available - please install one on your system!"
-    end if
-    WaitSlot (2000)
-    Kontext "DruckerEinrichten"
-    Call DialogTest (DruckerEinrichten)
-    sleep 2
-    DruckerEinrichten.Cancel
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tdFileExport
-    goto endsub
-    dim x as integer
-    Call hNewDocument
-    WaitSlot (3000)
-    FileExport
-    Kontext "ExportierenDlg"
-    Call DialogTest ( ExportierenDlg )
-    UebergeordneterOrdner.Click
-    Kontext "SpeichernDlg"
-    x=Dateityp.getitemcount
-    if x <> 18 then warnlog "the number of filters is not 18, it is: " + x
-        SpeichernDlg.Cancel
-        WaitSlot (2000)
-        Call hCloseDocument
-        WaitSlot (2000)
-endcase
-
-testcase tmFileExit
-    goto endsub
-    printlog "- File Close"
-    Call hNewDocument
-    WaitSlot (2000)
-    try
-        FileExit "SynchronMode", TRUE
-        WaitSlot (2000)
-        Kontext
-        WaitSlot (2000)
-        Kontext "MessageBox"
-        if MessageBox.Exists(1) then ' this is the messagebox from the first window!
-            Printlog MessageBox.GetText
-            try
-                MessageBox.OK
-            catch
-                MessageBox.No
-            endcatch
-        end if
-        Kontext "MessageBox"
-        if MessageBox.Exists(1) then
-            Warnlog "MsgBox popped up and there were no changes in the document"
-            Printlog MessageBox.GetText
-            try
-                MessageBox.OK
-            catch
-                MessageBox.No
-            endcatch
-        end if
-    catch
-        printlog "this exit is wanted :-)"
-    endcatch
-    try
-        WaitSlot (20000)
-        call hStartTheOffice ' from master.inc
-    catch
-        printlog "catch AGAIN"
-    endcatch
-    Kontext "SD_Praesentation"
-    if SD_Praesentation.exists (2) then
-        ViewToolbarsPresentation
-    end if
-endcase
diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc
deleted file mode 100644
index c199ab998524..000000000000
--- a/testautomation/graphics/optional/includes/global/id_002.inc
+++ /dev/null
@@ -1,440 +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 :
-'*
-'\**********************************************************************************
-
-testcase tiEditUndoRedo
-
-    hNewDocument
-    call hTBOtypeInDoc
-
-    EditUndo
-    WaitSlot (2000)
-    EditRedo
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tiEditRepeat
-    goto endsub 'Quaste, ask FHA
-    Call hNewDocument
-
-    gMouseClick 50,50
-    Call hRechteckErstellen ( 30, 10, 70, 30 )
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 20, 20, 60, 40 )
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 80, 50, 40, 20 )
-    WaitSlot (1000)
-    ContextArrangeBringBackward
-    WaitSlot (2000)
-    try
-        EditRepeat
-    catch
-        Warnlog " Menu entry is disabled #i26129#"
-    endcatch
-
-    Call hCloseDocument
-endcase
-
-testcase tiEditCutPasteCopySelectall
-    Call hNewDocument
-
-    call hTBOtypeInDoc
-
-    EditCut
-    WaitSlot (2000)
-    EditPaste
-    WaitSlot (2000)
-    EditCopy
-    WaitSlot (2000)
-    EditPaste
-    WaitSlot (2000)
-    EditSelectAll
-    WaitSlot (2000)
-    EditCut
-    WaitSlot (2000)
-    EditPaste
-    WaitSlot (2000)
-    EditDeleteContents
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tiEditPasteSpecial
-    Call  hNewDocument
-
-    SetClipboard "This is a Text in the Clipboard"
-
-    EditPasteSpecial
-    WaitSlot (1000)
-    Kontext "InhaltEinfuegen"
-    DialogTest ( InhaltEinfuegen )
-
-    InhaltEinfuegen.Cancel
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-testcase tiEditSearchAndReplace
-    Call  hNewDocument
-
-    try
-        EditSearchAndReplace
-        WaitSlot (1000)
-        Kontext "FindAndReplace"
-        DialogTest ( FindAndReplace )
-
-        More.Click
-        SimilaritySearch.Check ' culprint for errors if not resetted !
-        WaitSlot (1000)
-        SimilaritySearchFor.Click
-        Kontext "Aehnlichkeitssuche"
-        DialogTest (Aehnlichkeitssuche )
-        Aehnlichkeitssuche.Cancel
-        Kontext "FindAndReplace"
-        SimilaritySearch.UnCheck
-        More.Click
-        FindAndReplace.Close
-    catch
-        Warnlog "EditSearchAndReplace caused an error"
-    endcatch
-    Call hCloseDocument
-endcase
-
-testcase tiEditDuplicate
-    Call hNewDocument
-    call hTBOtypeInDoc
-    EditSelectAll
-    EditDuplicate
-
-    Kontext "Duplizieren"
-    Call DialogTest ( Duplizieren )
-    Duplizieren.Cancel
-
-    Call hCloseDocument
-endcase
-
-testcase tEditPoints
-    Call hNewDocument
-    call hTBOtypeInDoc
-    FormatEditPoints
-    EditGluePoints
-    Call hCloseDocument
-endcase
-
-testcase tiEditFields
-    Call hNewDocument
-    WaitSlot (2000)
-    InsertFieldsDateFix
-    WaitSlot (1000)
-    gMouseDoubleClick 10,10
-
-    hTypeKeys "<ESCAPE>"
-    hTypeKeys "<Tab>"                  ' With a Tab catches we always the Object
-    hTypeKeys "<F2>"                   ' Here we enter Edit-Mode and therefore also the right place
-    hTypeKeys "<Home>"                 ' Here we enter Edit-Mode and therefore also the right place
-
-    try
-        EditFieldsDraw
-        Kontext "FeldbefehlBearbeitenDraw"
-        Call DialogTest ( FeldbefehlBearbeitenDraw )
-        FeldbefehlBearbeitenDraw.Close
-    catch
-        Warnlog "- Slot could not be accessed"
-    endcatch
-
-    Call hCloseDocument
-endcase
-
-testcase tdEditDeleteSlide
-    Call hNewDocument
-    InsertSlide
-    WaitSlot (2000)
-    hTypekeys "<Pagedown>"
-    WaitSlot (2000)
-    Kontext "Navigator"
-    sleep (2)
-    if Navigator.exists then
-        printlog "Navigator: open :-)"
-    else
-        printlog "Navigator: NOT available :-( Will be opened now!"
-        ViewNavigator
-    end if
-    WaitSlot (2000)
-    Kontext "NavigatorDraw"
-    if Liste.GetItemCount<>2 Then
-        Warnlog "-  No slide inserted"
-        Kontext "Navigator"
-        Navigator.Close
-        Call hCloseDocument
-        goto endsub
-    else
-        Liste.Select 2
-        Kontext "Navigator"
-        Navigator.Close
-    end if
-    WaitSlot (2000)
-    EditDeleteSlide
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tiEditLinks
-    Call  hNewDocument
-
-    InsertGraphicsFromFile
-    Kontext "GrafikEinfuegenDlg"
-    try
-        if Link.Exists then
-            Link.Check
-        else
-            Warnlog "- Link in Insert graphic is not working"
-        end if
-        Dateiname.settext Convertpath (gTesttoolPath + "global\input\graf_inp\stabler.tif")
-        Oeffnen.Click
-        Kontext "Messagebox"
-        if Messagebox.Exists=True Then
-            Warnlog Messagebox.GetText
-            Messagebox.Ok
-        end if
-        InsertGraphicsFromFile
-        Kontext "GrafikEinfuegenDlg"
-        Link.Check
-        Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-        Oeffnen.Click
-
-        kontext "Messagebox"
-        if Messagebox.Exists( 2 ) then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-            sleep 1
-        end if
-    catch
-        Warnlog "Insert graphic caused errors"
-    endcatch
-
-    WaitSlot (2000)
-    try
-        EditLinksDraw
-        WaitSlot (2000)
-        Kontext "VerknuepfungenBearbeiten"
-        Call DialogTest ( VerknuepfungenBearbeiten )
-        VerknuepfungenBearbeiten.Close
-        WaitSlot (1000)
-    catch
-        Warnlog "- EditLinks could not be executed, could be the graphic was not imported"
-    endcatch
-
-    Call hCloseDocument
-endcase
-
-testcase tiEditImageMap
-    Call  hNewDocument
-
-    EditImageMap
-
-    Kontext "ImageMapEditor"
-    if ImageMapEditor.Exists( 5 ) then
-        printlog "- ImageMap exists"
-        DialogTest ( ImageMapEditor )
-        try
-            ImageMapEditor.Close
-            Printlog "ImageMap closed using the close button"
-        catch
-            EditImageMap
-            Printlog "ImageMap closed using menue 'edit-imagemap'"
-        endcatch
-    else
-        warnlog "ImageMap didn't come up!"
-    end if
-    Call  hCloseDocument
-endcase
-
-testcase tiEditObjectProperties
-    dim i as integer
-
-    Call hNewDocument
-
-    InsertFloatingFrame
-    WaitSlot (2000)
-
-    Kontext "TabEigenschaften"
-    FrameName.SetText "Hello"
-    Inhalt.SetText ConvertPath ( gTesttoolpath + "global\input\graf_inp\desp.bmp" )
-    WaitSlot (2000)
-    TabEigenschaften.OK
-    WaitSlot (2000)
-    gMouseDoubleClick 1,1
-
-    hTypekeys "<tab>"
-
-    kontext
-    WaitSlot (2000)
-    EditObjectProperties
-    WaitSlot (1000)
-    Kontext "TabEigenschaften"
-    DialogTest ( TabEigenschaften )
-    Oeffnen.Click
-    Kontext "OeffnenDlg"
-    Call DialogTest ( OeffnenDlg )
-    OeffnenDlg.Cancel
-    Kontext "TabEigenschaften"
-    TabEigenschaften.Cancel
-
-    Call hCloseDocument
-endcase
-
-testcase tiEditObjectEdit
-    dim i as integer
-    Call hNewDocument
-
-    InsertObjectOLEObject
-    WaitSlot (1000)
-    Kontext "OLEObjektEinfuegen"
-    ObjektTyp.Select 1
-    OLEObjektEinfuegen.OK
-    WaitSlot (1000)
-
-    gMouseClick 20,1
-
-    hTypekeys "<tab>"
-
-    EditObjectEdit
-    ' try EditObjectEdit again, to see, if it is in edit mode !
-    WaitSlot (2000)
-    try
-        ContextNameObject
-        warnlog " Couldn't get into edit mode!"
-    catch
-        printlog "Reached edit mode - ok :-)"
-        gMouseClick 20,1
-    endcatch
-
-    EditSelectAll
-
-    EditObjectSaveCopyAs
-    Kontext "SpeichernDlg"
-    Call DialogTest ( SpeichernDlg )
-    SpeichernDlg.Cancel
-    WaitSlot (2000)
-    Kontext "Active"
-    if Active.Exists(2) then Active.No
-        Call hCloseDocument
-endcase
-
-testcase tiEditPlugIn
-    Call hNewDocument
-
-    InsertObjectPlugin
-    Kontext "PlugInEinfuegen"
-    '    DialogTest ( PlugInEinfuegen)
-    Durchsuchen.click
-    Kontext "OeffnenDlg"
-    '      Call DialogTest ( OeffnenDlg )
-    if OeffnenDlg.exists (5) then
-        OeffnenDlg.Cancel
-    else
-        warnlog "Open file dialog didn't come up"
-    end if
-    WaitSlot (5000)
-    Kontext "PlugInEinfuegen"
-    if PlugInEinfuegen.exists then
-        DateiUrl.SetText (ConvertPath ( gTesttoolpath + "graphics\required\input\sample.mov" ))
-
-        Optionen.SetText "Fiddler's Green"
-        Optionen.TypeKeys "<HOME>"
-        Optionen.TypeKeys "<SHIFT><END>"
-        Optionen.TypeKeys "<delete>"
-        PlugInEinfuegen.Ok
-    else
-        warnlog "Insert plugin isn't visible"
-    end if
-    WaitSlot (5000)
-    kontext "Messagebox"
-    if Messagebox.exists (5) then
-        warnlog "Messagebox: " + Messagebox.gettext
-        Messagebox.ok
-    end if
-    EditPlugIn
-    printlog "Editplugin works!"
-
-    Call hCloseDocument
-endcase
-
-testcase tiEditHyperlink
-    hNewDocument
-    InsertHyperlink
-
-    kontext "HyperlinkDialog"
-    if ( HyperlinkDialog.exists( 2 ) ) then
-        Kontext "Hyperlink"
-        Auswahl.MouseDown 50, 5
-        Auswahl.MouseUp 50, 5
-        Auswahl.typekeys "<PAGEDOWN><PAGEUP>"
-        Auswahl.typekeys "<TAB>"
-        sleep( 1 )
-        Kontext "TabHyperlinkInternet"
-
-        'Workaround to get rid of a Focusing-problem...
-        NameText.Typekeys "alal <RETURN>"
-        NameText.Typekeys "<MOD1 A><DELETE>"
-        TabHyperlinkInternet.Typekeys "<TAB>", 6
-        TabHyperlinkInternet.Typekeys "<LEFT>", 3
-        'End of workaround...
-
-        Internet.Check           'Just to make sure the radio-button is addressable.
-        ZielUrl.Settext "http://www.liegerad-fahrer.de"
-
-        Uebernehmen.Click()
-
-        kontext "HyperlinkDialog"
-        HyperlinkDialog.Close()
-
-        hTypeKeys "<TAB><F2>"
-        EditSelectAll
-        try
-            EditHyperlinkDraw
-            Kontext "HyperlinkDialog"
-            if ( HyperlinkDialog.Exists( 1 ) ) then
-                HyperlinkDialog.Close()
-            else
-                Warnlog "- Hyperlinkdialog not up"
-            end if
-        catch
-            Warnlog "- Not able to edit Hyperlink!"
-        endcatch
-    else
-        warnlog( "Failed to open <HyperlinkDialog>" )
-    endif
-
-    Call hCloseDocument
-endcase
diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc
deleted file mode 100644
index 4ada1beaaea4..000000000000
--- a/testautomation/graphics/optional/includes/global/id_003.inc
+++ /dev/null
@@ -1,264 +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 :
-'*
-'\**********************************************************************************
-
-testcase tiViewNavigator
-    Call hNewDocument
-
-    Kontext "NavigatorDraw"
-    if Not NavigatorDraw.Exists Then
-        ViewNavigator
-    end if
-    Kontext "NavigatorDraw"
-    Call DialogTest ( NavigatorDraw )
-
-    try
-        Kontext "Navigator"
-        Navigator.Close
-    catch
-        Errorlog "  Navigator wasn't closed, second try with Menu"
-        ViewNavigator
-    endcatch
-    Call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tiViewZoom
-    Call  hNewDocument
-    UseBindings
-    ViewZoom
-    Kontext "Massstab"
-    DialogTest ( Massstab )
-    Massstab.Cancel
-    Call  hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tiViewToolbar
-    Call  hNewDocument
-
-    ViewToolbarsThreeDSettings
-    WaitSlot (1000)
-    ViewToolbarsThreeDSettings
-    WaitSlot (1000)
-
-    ViewToolbarsAlign
-    WaitSlot (1000)
-    ViewToolbarsAlign
-    WaitSlot (1000)
-
-    ViewToolbarsTools
-    WaitSlot (1000)
-    ViewToolbarsTools
-    WaitSlot (1000)
-
-    ViewToolbarsBezier
-    WaitSlot (1000)
-    ViewToolbarsBezier
-    WaitSlot (1000)
-
-    ViewToolbarsFontwork
-    WaitSlot (1000)
-    ViewToolbarsFontwork
-    WaitSlot (1000)
-
-    '   if gApplication = "IMPRESS" then
-    '      ViewToolbarsPresentation ' only in impress, not draw
-    '      ViewToolbarsPresentation
-    '   endif
-
-    ViewToolbarsFormControls
-    WaitSlot (1000)
-    ViewToolbarsFormControls
-    WaitSlot (1000)
-
-    '-----------------
-    ViewToolbarsFormDesign
-    WaitSlot (1000)
-    ViewToolbarsFormDesign
-    WaitSlot (1000)
-
-    ViewToolbarsFormNavigation
-    WaitSlot (1000)
-    ViewToolbarsFormNavigation
-    WaitSlot (1000)
-
-    ViewToolbarsGluepoints
-    WaitSlot (1000)
-    ViewToolbarsGluepoints
-    WaitSlot (1000)
-    ViewToolbarsInsert
-    WaitSlot (1000)
-    ViewToolbarsInsert
-    WaitSlot (1000)
-
-    ViewToolbarsGraphic
-    WaitSlot (1000)
-    ViewToolbarsGraphic
-    WaitSlot (1000)
-
-    ViewToolbarsMediaPlayback
-    WaitSlot (1000)
-    ViewToolbarsMediaPlayback
-    WaitSlot (1000)
-
-    ViewToolbarsOptionbar
-    WaitSlot (1000)
-    ViewToolbarsOptionbar
-    WaitSlot (1000)
-
-    ViewToolbarsPicture
-    WaitSlot (1000)
-    ViewToolbarsPicture
-    WaitSlot (1000)
-
-    ViewToolbarsStandard
-    WaitSlot (1000)
-    ViewToolbarsStandard
-    WaitSlot (1000)
-
-    ViewToolbarsStandardView
-    WaitSlot (1000)
-    ViewToolbarsStandardView
-    WaitSlot (1000)
-
-    ViewToolbarsHyperlinkbar
-    WaitSlot (1000)
-    ViewToolbarsHyperlinkbar
-    WaitSlot (1000)
-
-    ViewToolbarsColorBar
-    WaitSlot (1000)
-    ViewToolbarsColorBar
-    WaitSlot (1000)
-
-    ViewToolbarsCustomize
-    WaitSlot (1000)
-    Kontext
-    try
-        Messagebox.SetPage TabCustomizeMenu             ' 1 ------------------
-    catch
-        warnlog "couldn't switch to tabpage 'Menus'"
-    endcatch
-    Kontext "TabCustomizeMenu"
-    if TabCustomizeMenu.exists(5) then
-        Call DialogTest ( TabCustomizeMenu )
-        Menu.typeKeys("<down>")
-        Entries.typeKeys("<down>")
-        sleep 2
-        BtnNew.Click
-        sleep 1
-        Kontext "MenuOrganiser"
-        Call DialogTest ( MenuOrganiser )
-        MenuOrganiser.cancel
-        sleep 1
-        Kontext "TabCustomizeMenu"
-        TabCustomizeMenu.Close
-    end if
-    sleep (1)
-
-    Call  hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tiViewDisplayQuality
-    Call hNewDocument
-
-    Call hRechteckErstellen 20,20,40,40
-
-    try
-        ViewQualityBlackWhite
-        Printlog "- Quality set to black and white"
-    catch
-        Warnlog "- Slot could not be accessed"
-    endcatch
-    WaitSlot (1000)
-    try
-        ViewQualityGreyscale
-        Printlog "- View quality set to greyscale"
-    catch
-        Warnlog "- View quality greyscale could not be accessed"
-    endcatch
-    WaitSlot (1000)
-    try
-        ViewQualityColour
-        Printlog "- View quality set to colour"
-    catch
-        Warnlog "- View quality colour could not be accessed"
-    endcatch
-    Call hClosedocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tiViewLayer
-    Call hNewDocument
-
-    ViewLayer
-    WaitSlot (1000)
-    ViewLayer
-    Call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tViewGrid
-    Call  hNewDocument
-
-    ViewGridVisible
-    ViewGridUse
-    ViewGridFront
-    ViewGridVisible
-    ViewGridUse
-    ViewGridFront
-    WaitSlot (1000)
-    Call  hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tViewSnapLines
-    Call  hNewDocument
-
-    ViewSnapLinesVisible
-    ViewSnapLinesUse
-    ViewSnapLinesFront
-    ViewSnapLinesVisible
-    ViewSnapLinesUse
-    ViewSnapLinesFront
-    WaitSlot (1000)
-    Call  hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/optional/includes/global/id_004.inc b/testautomation/graphics/optional/includes/global/id_004.inc
deleted file mode 100644
index 2e1aa6db3cd1..000000000000
--- a/testautomation/graphics/optional/includes/global/id_004.inc
+++ /dev/null
@@ -1,370 +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 :
-'*
-'\**********************************************************************************
-
-
-testcase tiInsertSlide
-
-    Call  hNewDocument
-    InsertSlide
-    WaitSlot (2000)
-    hTypekeys "<Pagedown>"
-    WaitSlot (2000) 'sleep 2
-    Call  hCloseDocument
-endcase
-
-testcase tiInsertDuplicateSlide
-    Call hNewDocument
-    Call hRechteckErstellen ( 30, 40, 40, 50 )
-    InsertDuplicateSlide
-    WaitSlot (2000)
-    Call  hCloseDocument
-endcase
-
-testcase tiInsertField
-    Call hNewDocument
-
-    InsertFieldsTimeFix
-    WaitSlot (1000)
-    printlog "OK   Time Fix"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsDateFix
-    WaitSlot (1000)
-    printlog "OK   Date Fix"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsTimeVariable
-    WaitSlot (1000)
-    printlog "OK   Time Variabel"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsDateVariable
-    WaitSlot (1000)
-    printlog "OK   Date Variabel"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsAuthorDraw
-    WaitSlot (1000)
-    printlog "OK   Author"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsPageNumberDraw
-    WaitSlot (1000)
-    printlog "OK   Page number"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 1
-
-    InsertFieldsFileName
-    WaitSlot (1000) 'sleep 1
-    printlog "OK   File name"
-    EditSelectAll
-    hTypekeys "<Delete>"
-    sleep 2
-    Call  hCloseDocument
-endcase
-
-testcase tiInsertSpecialCharacter
-    Call hNewDocument
-
-    hTextrahmenErstellen ("This is a testtext",30,40,60,50)
-    sleep 2
-    InsertSpecialCharacterDraw
-
-    Kontext "Sonderzeichen"
-    if ( Sonderzeichen.exists( 2 ) ) then
-        Call DialogTest (Sonderzeichen)
-        hCloseDialog( Sonderzeichen, "Cancel" )
-    else
-        warnlog( "<Special Characters> dialog not open" )
-    endif
-    Call hCloseDocument
-endcase
-
-testcase tiInsertHyperlink
-
-    Call hNewDocument
-    InsertHyperlink
-
-    kontext "HyperlinkDialog"
-    if ( HyperlinkDialog.exists( 2 ) ) then
-
-        Kontext "TabHyperlinkInternet"
-        Auswahl.MouseDown 50, 5
-        Auswahl.MouseUp 50, 5
-        Auswahl.typekeys "<PAGEDOWN><PAGEUP>"
-        Auswahl.typekeys "<TAB>"
-
-        'Workaround to get rid of a Focusing-problem...
-        NameText.Typekeys "alal <RETURN>"
-        NameText.Typekeys "<MOD1 A><DELETE>"
-        TabHyperlinkInternet.Typekeys "<TAB>", 6
-        TabHyperlinkInternet.Typekeys "<LEFT>", 3
-        'End of workaround...
-
-        Internet.Check
-        ZielUrl.SetText( "http://www.nowhere.com" )
-        Uebernehmen.Click()
-
-        kontext "HyperlinkDialog"
-        HyperlinkDialog.Close()
-
-    else
-        warnlog "Failed to open <HyperlinkDialog>"
-    end if
-    Call hCloseDocument
-endcase
-
-testcase tiInsertGraphic
-    Call  hNewDocument
-    InsertGraphicsFromFile
-    WaitSlot (2000) '
-    try
-        Kontext "GrafikEinfuegenDlg"
-        if Link.exists then
-            Link.Check
-        else
-            Warnlog  "Linking grafik doesn't work :-("
-        end if
-        if Preview.exists then
-            Preview.Check
-        else
-            Warnlog "Preview of graphic doesn't work :-("
-        end if
-        DialogTest (GrafikEinfuegenDlg)
-
-        Dateiname.settext Convertpath (gTesttoolPath + "global\input\graf_inp\stabler.tif")
-        Oeffnen.click
-    catch
-        Warnlog "Insert graphic doesn't work :-("
-    endcatch
-
-    Call hCloseDocument
-endcase
-
-testcase tiInsertObjectSound
-    goto endsub ' disabled for final, because always wrong (TZ 01/2002)
-    'TODO: TBO: enhance!
-    Call hNewDocument
-    try
-        InsertObjectSound
-        WaitSlot (1000)
-        Kontext "OeffnenDlg"
-        '       Call Dialogtest (OeffnenDlg) ' just be sure to check one pth and one open dialog : TZ 28.11.201
-
-        OeffnenDlg.Cancel
-    catch
-        printlog "'Insert -> Object -> Sound' not available. TestDevelopmentInProgress (TDIP) ;-)"
-    endcatch
-    Call hCloseDocument
-endcase
-
-testcase tiInsertObjectVideo
-    goto endsub
-    'TODO: TBO: enhance!
-    Call hNewDocument
-    try
-        InsertObjectVideo
-        Kontext "OeffnenDlg"
-        '      Call Dialogtest (OeffnenDlg)
-        WaitSlot (1000)
-        OeffnenDlg.Cancel
-    catch
-        printlog "'Insert -> Object -> Video' not available. (TDIP) ;-)"
-    endcatch
-    Call hCloseDocument
-endcase
-
-testcase tiInsertChart
-    Call hNewDocument
-    InsertChart
-
-    Kontext "Messagebox"
-    if ( Messagebox.Exists( 2 ) ) then
-        Warnlog Messagebox.GetText
-        hCloseDialog( Messagebox, "OK" )
-    end if
-    gMouseClick 1,1
-    sleep 2
-    Call hCloseDocument
-endcase
-
-testcase tiInsertObjectOLEObjects
-    hNewDocument
-    InsertObjectOLEObject
-    Kontext "OLEObjektEinfuegen"
-    '   Call Dialogtest ( OLEObjektEinfuegen )
-    '   NeuErstellen.Check ' is default value
-    Call DialogTest (OLEObjektEinfuegen, 1)
-    AusDateiErstellen.Check
-    Call DialogTest (OLEObjektEinfuegen, 2)
-    Durchsuchen.click
-    Kontext "OeffnenDlG"
-    OeffnenDLG.Cancel
-    Kontext "OLEObjektEinfuegen"
-    OLEObjektEinfuegen.Cancel
-    sleep 1
-    Call hCloseDocument
-endcase
-
-testcase tiInsertSpreadsheet
-    if gtSYSName = "Linux" then
-        printlog "Linux = wont test tiInsertSpreadsheet"
-        goto endsub
-    endif
-
-    Call hNewDocument
-    WaitSlot (2000)
-    InsertSpreadsheetDraw
-    WaitSlot (2000)
-    Kontext "Messagebox"
-    if Messagebox.Exists (5) then
-        Warnlog Messagebox.GetText
-        hCloseDialog( Messagebox, "ok" )
-    end if
-    gMouseClick 1,1
-    sleep 1
-    hTypekeys "<Tab><Delete>"
-    sleep 2
-    Call hCloseDocument
-endcase
-
-testcase tiInsertFormula
-    Call hNewDocument
-    InsertObjectFormulaDraw
-
-    Kontext "Messagebox"
-    if ( Messagebox.Exists( 2 ) ) then
-        Warnlog Messagebox.GetText
-        hCloseDialog( Messagebox, "ok" )
-    end if
-    gMouseClick 1,1
-    sleep 1
-    hTypekeys "<Tab><Delete>"
-    Call hCloseDocument
-endcase
-
-testcase tiInsertFloatingFrame
-    Call hNewDocument
-    InsertFloatingFrame
-    WaitSlot (2000)
-    Kontext "TabEigenschaften"
-    Dialogtest (TabEigenschaften)
-    Oeffnen.Click
-    Kontext "OeffnenDlg"
-    hCloseDialog( OeffnenDlg, "Cancel" )
-    Kontext "TabEigenschaften"
-    TabEigenschaften.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiInsertFile
-    Call  hNewDocument
-    WaitSlot (1000)
-    InsertFileDraw
-    WaitSlot (1000)
-    Kontext "OeffnenDLG"
-    '   	Call Dialogtest ( OeffnenDLG )
-    OeffnenDLG.Cancel
-    Call  hCloseDocument
-endcase
-
-testcase tiInsertPlugin
-    call hNewDocument
-    InsertObjectPlugIn
-    Kontext "PluginEinfuegen"
-    if PluginEinfuegen.exists (5) then
-        call Dialogtest (PluginEinfuegen)
-        Durchsuchen.Click
-        sleep 1
-        Kontext "Messagebox"
-        if Messagebox.Exists (5) Then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-        else
-            printlog "No Messagebox :-)"
-        end if
-        Kontext "OeffnenDlG"
-        if OeffnenDlG.exists (5) then
-            OeffnenDLG.Cancel
-        end if
-        Kontext "PluginEinfuegen"
-        if PluginEinfuegen.exists (5) then PluginEinfuegen.Cancel
-        else
-            warnlog "Insert Plugin does not work :-("
-        end if
-        Call hCloseDocument
-endcase
-
-testcase tiInsertScan
-    goto endsub
-    Call hNewDocument
-    InsertScanRequest ' as long as there is no scanner available, nothing happens
-    WaitSlot (1000)
-    InsertScanSelectSource
-    WaitSlot (1000)
-    printlog "Not testable, not translatable, just callable, because of systemdialog :-("
-    Call hCloseDocument
-endcase
-
-testcase tiInsertSnappointLine
-    Call  hNewDocument
-    InsertSnapPointLine
-    Kontext "NeuesFangobjekt"
-    DialogTest ( NeuesFangobjekt )
-    NeuesFangobjekt.Cancel
-    sleep 2
-    Call  hCloseDocument
-endcase
-
-testcase tdInsertLayer
-    Call  hNewDocument
-    WaitSlot (1000)
-    ViewLayer
-    InsertLayer
-    Kontext "EbeneEinfuegenDlg"
-    DialogTest ( EbeneEinfuegenDlg )
-    EbeneEinfuegenDlg.Cancel
-    Call  hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/optional/includes/global/id_005.inc b/testautomation/graphics/optional/includes/global/id_005.inc
deleted file mode 100644
index 4aefb701a861..000000000000
--- a/testautomation/graphics/optional/includes/global/id_005.inc
+++ /dev/null
@@ -1,808 +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 :
-'*
-'***********************************************************************************
-' #1 tiFormatDefault
-' #1 tiFormatLine
-' #1 tdFormatArea
-' #1 tiFormatText
-' #1 tiFormatPositionAndSize
-' #1 tiFormatCharacter
-' #1 tiFormatControlForm
-' #1 tiFormatDimensions
-' #1 tiFormatConnector
-' #1 tiFormat3D_Effects
-' #1 tiFormatNumberingBullets
-' #1 tiFormatCaseCharacter
-' #1 tiFormatParagraph
-' #1 tiFormatPage
-' #1 tiFormatStylesAndFormatting
-' #1 tiFormatStylesSlideDesign
-' #1 tiFormatFontwork
-' #1 tiFormatGroup
-' #1 hWalkTheStyles
-'\**********************************************************************************
-
-testcase tiFormatDefault
-
-    Call hNewDocument
-    gMouseClick 50,50
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    FormatStandardDraw
-    Call hCloseDocument
-endcase
-
-testcase tiFormatLine
-    hNewDocument
-    gMouseClick 50,50
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    FormatLine
-    Kontext
-    Messagebox.SetPage TabLinie
-    kontext "TabLinie"
-    Call DialogTest ( TabLinie )
-
-    Kontext
-    Messagebox.SetPage TabLinienstile
-    kontext "TabLinienstile"
-    Call DialogTest ( TabLinienstile )
-    Hinzufuegen.click
-    Kontext "NameDLG"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabLinienstile"
-    Aendern.Click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-    kontext "TabLinienstile"
-    Loeschen.Click
-    Kontext "Messagebox"
-    Messagebox.no
-
-    kontext "TabLinienstile"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    kontext "TabLinienstile"
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDLG.Cancel
-    Kontext
-    Messagebox.SetPage TabLinienenden
-    kontext "TabLinienenden"
-    Call DialogTest ( TabLinienenden )
-    Hinzufuegen.Click
-    Kontext "NameDLG"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabLinienenden"
-    Aendern.Click
-    Kontext "Messagebox"
-    try
-        Messagebox.OK
-    catch
-        'print "TabLinienenden"
-    endcatch
-
-    kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabLinienenden"
-    Loeschen.Click
-    Kontext "Messagebox"
-    Messagebox.no
-
-    kontext "TabLinienenden"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    kontext "TabLinienenden"
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDlg.Cancel
-    kontext "TabLinienenden"
-    TabLinienenden.cancel
-    Call hCloseDocument
-endcase
-
-testcase tdFormatArea
-    Call hNewDocument
-    gMouseClick 50,50
-    Call hRechteckErstellen (15,15,65,65)
-    gMouseClick 30,30
-    FormatArea
-    WaitSlot (1000)
-    Kontext
-    Messagebox.SetPage TabArea
-    Kontext "TabArea"
-    Call DialogTest ( TabArea )
-    Kontext
-    Messagebox.SetPage TabSchatten
-    kontext "TabSchatten"
-    Anzeigen.Check
-    Call DialogTest ( TabSchatten )
-    Kontext
-    Messagebox.SetPage TabFarben
-    kontext "TabFarben"
-    Farbe.select 1
-    Farbmodell.Select 1
-    Call DialogTest ( TabFarben,1 )
-    Farbmodell.Select 2
-    Call DialogTest ( TabFarben,2 )
-
-    Hinzufuegen.click
-    Kontext "Messagebox"
-    Messagebox.OK
-    kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-    kontext "TabFarben"
-    Loeschen.click
-    Kontext "Messagebox"
-    Messagebox.no
-
-    kontext "TabFarben"
-    sleep 1
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDlg.Cancel
-    sleep 1
-
-    kontext "TabFarben"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    Kontext "TabFarben"
-
-    Kontext
-    Messagebox.SetPage TabFarbverlaeufe
-    kontext "TabFarbverlaeufe"
-    Call DialogTest ( TabFarbverlaeufe )
-
-    Hinzufuegen.click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabFarbverlaeufe"
-    Aendern.Click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabFarbverlaeufe"
-    loeschen.click
-    try
-        kontext "Messagebox"
-        Messagebox.no
-    catch
-        warnlog "nobody cares about deleting a gradient :-("
-    endcatch
-
-    kontext "TabFarbverlaeufe"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    kontext "TabFarbverlaeufe"
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDLG.Cancel
-
-    Kontext
-    Messagebox.SetPage TabSchraffuren
-    kontext "TabSchraffuren"
-    Call DialogTest ( TabSchraffuren)
-
-    Hinzufuegen.click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabSchraffuren"
-    Aendern.Click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.Cancel
-
-    kontext "TabSchraffuren"
-    Loeschen.click
-    kontext "Messagebox"
-    Messagebox.no
-
-    kontext "TabSchraffuren"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    kontext "TabSchraffuren"
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDLG.Cancel
-
-    Kontext
-    Messagebox.SetPage TabBitmap
-    kontext "TabBitmap"
-    Call DialogTest ( TabBitmap )
-    zurueck.click
-    sleep 1
-    hinzufuegen.click
-    Kontext "NameDlg"
-    Call DialogTest ( NameDlg )
-    NameDlg.cancel
-
-    kontext "TabBitmap"
-    try
-        Aendern.Click
-        Kontext "NameDlg"
-        Call DialogTest ( NameDlg )
-        NameDlg.cancel
-    catch
-        WarnLog "Control is disabled - modify bitmap"
-    endcatch
-    kontext "TabBitmap"
-    Import.Click
-    try
-        Kontext "GrafikEinfuegenDlg"
-        Call DialogTest ( GrafikEinfuegenDlg )
-        Kontext "GrafikEinfuegenDlg"
-        GrafikEinfuegenDlg.Cancel
-    catch
-        Warnlog "Insert graphic does not work"
-    endcatch
-
-    kontext "TabBitmap"
-    loeschen.click
-    kontext "Messagebox"
-    Messagebox.no
-
-    kontext "TabBitmap"
-    Oeffnen.click
-    Kontext "OeffnenDLG"
-    call Dialogtest (OeffnenDLG)
-    OeffnenDLG.Cancel
-    kontext "TabBitmap"
-    Speichern.click
-    Kontext "SpeichernDLG"
-    call Dialogtest (SpeichernDLG)
-    SpeichernDLG.Cancel
-    kontext "TabBitmap"
-    TabBitmap.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormatText
-    Call  hNewDocument
-    FormatTextDraw
-    Kontext
-    Messagebox.SetPage TabText
-    Kontext "TabText"
-    DialogTest ( TabText )
-    Kontext
-    Messagebox.SetPage TabLauftext
-    Kontext "TabLauftext"
-    DialogTest ( TabLauftext )
-    TabLauftext.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormatPositionAndSize
-    Call  hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    ContextPositionAndSize
-    Kontext
-    Messagebox.setpage TabPositionAndSize
-    Kontext "TabPositionAndSize"
-    call Dialogtest ( TabPositionAndSize )
-    kontext "PositionPosition"
-    PositionPosition.TypeKeys ("<right>", 2)
-    kontext "SizePosition"
-    SizePosition.TypeKeys ("<down>", 2)
-    Kontext
-    Messagebox.setPage TabDrehung
-    Kontext "TabDrehung"
-    call Dialogtest ( TabDrehung )
-    Kontext
-    Messagebox.setpage TabSchraegstellen
-    Kontext "TabSchraegstellen"
-    call Dialogtest ( TabSchraegstellen )
-    TabSchraegstellen.cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormatCharacter
-    Call  hNewDocument
-    FormatCharacter
-    WaitSlot (1000)
-    Kontext
-    Messagebox.SetPage TabFont
-    kontext "TabFont"
-    sleep 1
-    Call DialogTest ( TabFont )
-    Kontext
-    Messagebox.SetPage TabFontEffects
-    kontext "TabFontEffects"
-    sleep 1
-    Call DialogTest ( TabFontEffects )
-    sleep 1
-    Kontext
-    Messagebox.SetPage TabFontPosition
-    Kontext "TabFontPosition"
-    sleep 1
-    Call DialogTest ( TabFontPosition )
-    sleep 2
-    TabFontPosition.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormatControlForm
-
-    printlog "testcase: check if controls are available"
-
-    printlog "open new document"
-    Call  hNewDocument
-
-    'click in the document to get the focus into the document
-    if ( UCase(gApplication) = "DRAW" ) then
-        Kontext "DocumentDraw"
-        DocumentDraw.MouseDown(50,50)
-        DocumentDraw.MouseUp(50,50)
-    else 'Impress
-        Kontext "DocumentImpress"
-        DocumentImpress.MouseDown(50,50)
-        DocumentImpress.MouseUp(50,50)
-    endif
-
-    printlog "open the form controls toolbar"
-    call hToolbarSelect("FormControls",true)
-
-    kontext "FormControls"
-    printlog "insert a PushButton"
-    Pushbutton.Click
-    Sleep 1
-    gMouseMove (50, 20,70, 40)
-
-    printlog "open the control properties dialog"
-    FormatControl
-
-    Kontext "ControlPropertiesDialog"
-    WaitSlot (1000)
-    printlog "close the control properties dialog"
-    ControlPropertiesDialog.Close
-
-    printlog "open the form properties dialog"
-    FormatForm
-    Kontext "ControlPropertiesDialog"
-    WaitSlot (1000)
-    printlog "close the form properties dialog"
-    ControlPropertiesDialog.Close
-
-    printlog "close the form control toolbar"
-    call hToolbarSelect("FormControls",false)
-
-    printlog "close application"
-    Call hCloseDocument
-
-endcase
-
-testcase tiFormatDimensions
-    Call  hNewDocument
-    FormatDimensioning
-    Kontext "Bemassung"
-    DialogTest ( Bemassung )
-    Bemassung.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormatConnector
-    Call  hNewDocument
-    FormatConnector
-    Kontext "Verbinder"
-    DialogTest ( Verbinder )
-    Verbinder.Cancel
-    Call hCloseDocument
-endcase
-
-testcase tiFormat3D_Effects
-    Call  hNewDocument
-    Format3D_Effects
-    Kontext "Drei_D_Effekte"
-    Call DialogTest ( Drei_D_Effekte,1 )
-    Geometrie.Click
-    Call DialogTest ( Drei_D_Effekte,2 )
-    Darstellung.Click
-    Call DialogTest ( Drei_D_Effekte,3 )
-    Beleuchtung.Click
-    Call DialogTest ( Drei_D_Effekte,4 )
-    Texturen.Click
-    Call DialogTest ( Drei_D_Effekte,5 )
-    Material.Click
-    Call DialogTest ( Drei_D_Effekte,6 )
-    Kontext "Drei_D_Effekte"
-    Drei_D_Effekte.Close
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatNumberingBullets
-    Call hNewDocument
-    WaitSlot (2000)
-    FormatNumberingBulletsDraw
-    WaitSlot (2000)
-    Kontext
-    Messagebox.SetPage TabBullet
-    Kontext "TabBullet"
-    Call DialogTest ( TabBullet )
-    Kontext
-    Messagebox.SetPage TabNumerierungsart
-    Kontext "TabNumerierungsart"
-    Call DialogTest ( TabNumerierungsart )
-    Kontext
-    Messagebox.SetPage TabGrafiken
-    Kontext "TabGrafiken"
-    Call DialogTest ( TabGrafiken )
-    Kontext
-    Messagebox.SetPage TabPositionNumerierung
-    Kontext "TabPositionNumerierung"
-    Call DialogTest ( TabPositionNumerierung )
-    Kontext
-    Messagebox.SetPage TabOptionenNumerierung
-    Kontext "TabOptionenNumerierung"
-    Call DialogTest ( TabOptionenNumerierung )
-    Numerierung.Select 9 ' last one always ? -> graphics
-    TabOptionenNumerierung.MouseDown 50,60
-    TabOptionenNumerierung.MouseUp 50,60
-    Auswahl.TypeKeys "<SPACE>"
-    hMenuSelectNr (1)
-    sleep 3
-    Kontext "OeffnenDlg"
-    OeffnenDlg.Cancel
-    sleep 1
-    sleep 1
-    Kontext
-    Messagebox.SetPage TabOptionenNumerierung
-    Kontext "TabOptionenNumerierung"
-    sleep 1
-    try
-        Auswahl.TypeKeys "<SPACE>"
-        hMenuSelectNr (2)
-        hMenuSelectNr (3)
-        Sleep 2
-    catch
-        warnlog "couldn't do something :-) (1)"
-        Exceptlog
-        Call hMenuClose
-    endcatch
-    TabOptionenNumerierung.Cancel
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatCaseCharacter
-    Call  hNewDocument
-    Call hTextrahmenErstellen ("testit",20,20,50,30)
-    sleep 1
-    hTypeKeys "<left>"
-
-    FormatChangeCaseUpper
-    WaitSlot (1000)
-    FormatChangeCaseLower
-    WaitSlot (2000)
-    if bAsianLan then
-        if not gAsianSup then
-            qaerrorlog "This is an asian language-office, but asian support was disabled in a previous test?"
-        end if
-        try
-            FormatChangeCaseHalfWidth
-        catch
-            Warnlog "Format / Change Case / Half Width does not work."
-        endcatch
-        WaitSlot (1000)
-        try
-            FormatChangeCaseFullWidth
-        catch
-            Warnlog "Format / Change Case / Full Width does not work!"
-        endcatch
-        sleep 1
-        try
-            FormatChangeCaseHiragana
-        catch
-            Warnlog "Format / Change Case / Hiragana does not work."
-        endcatch
-        sleep 1
-        try
-            FormatChangeCaseKatagana
-        catch
-            Warnlog "Format / Change Case / Katagana does not work."
-        endcatch
-    end if
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatParagraph
-    Call  hNewDocument
-    FormatParagraph
-    Kontext
-    Messagebox.SetPage TabEinzuegeUndAbstaende
-    kontext "TabEinzuegeUndAbstaende"
-    Call DialogTest ( TabEinzuegeUndAbstaende )
-    Kontext
-    Messagebox.SetPage TabAusrichtungAbsatz
-    Kontext "TabAusrichtungAbsatz"
-    Call DialogTest ( TabAusrichtungAbsatz )
-    Kontext
-    Messagebox.SetPage TabTabulator
-    kontext "TabTabulator"
-    Call DialogTest ( TabTabulator )
-    TabTabulator.Cancel
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatPage
-    Call hNewDocument
-    FormatSlideDraw
-    kontext
-    if Messagebox.exists (5) then
-        Messagebox.SetPage TabSeite
-        Kontext "TabSeite"
-        if TabSeite.exists (5) then
-            Call Dialogtest (TabSeite)
-        else
-            warnlog "nope :-(1"
-        endif
-        sleep 1
-        kontext
-        Messagebox.SetPage TabArea
-        sleep 1
-        kontext
-        if messagebox.GetRT = 304 then
-            printlog "active about pagesize != printersettings, will say NO: " + Messagebox.GetText
-            try
-                Messagebox.No
-            catch
-                warnlog messagebox.getText
-                Messagebox.ok ' should be Error loading BASIC of document ##?
-                kontext
-                if messagebox.GetRT = 304 then
-                    try
-                        warnlog messagebox.getText
-                        Messagebox.ok
-                    catch
-                        printlog "not expected state."
-                    endcatch
-                endif
-            endcatch
-        endif
-        sleep 1
-        kontext
-        Messagebox.SetPage TabArea
-        Kontext "TabArea"
-        if TabArea.exists (5) then
-            Call Dialogtest (TabArea)
-        endif
-        sleep 1
-        TabArea.Cancel
-    else
-        warnlog "FormatPage doesn't come up with dialog :-("
-    endif
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatStylesAndFormatting
-    Dim sTemp as String
-    dim sSettings(20,3) ' Control_name; control_type; value
-    dim i as integer
-    dim abctemp
-
-    Call  hNewDocument
-    sleep 5
-
-    hTextrahmenErstellen ("I love Wednesdays...",20,20,80,40)
-    sleep 1
-    printlog "Checking if TextObjectBar is up"
-    Kontext "TextObjectbar"
-    if TextObjectbar.Exists Then
-        printlog "TextObjectbar.Exists = " + TextObjectbar.Exists
-    else
-        ViewToolbarsTextFormatting
-    endif
-    FormatStylist
-    WaitSlot (1000)
-    Kontext "Stylist"
-    if (Stylist.NotExists) then
-        qaErrorLog "There is no stylist open, trying again now"
-        FormatStylist
-    end if
-    WaitSlot (1000)
-    Vorlagenliste.TypeKeys "<End>"
-    Vorlagenliste.TypeKeys "<Up>"
-    Vorlagenliste.TypeKeys "<Up>"
-    sleep 1
-    Vorlagenliste.OpenContextMenu
-    sleep 1
-    hMenuSelectNr (1)
-    sleep 1
-
-    Kontext
-    if Messagebox.exists (5) then
-        try
-            Messagebox.SetPage TabVerwalten
-            Kontext "TabVerwalten"
-            TabVerwalten.TypeKeys "<TAB>"
-            VorlagenName.setText("1Test")
-            sTemp = VorlagenName.getText
-            VerknuepftMit.getSelText
-            Bereich.getSelText
-            TabVerwalten.OK
-        catch
-            warnlog "Under Gnome we have a focus problem here."
-        endcatch
-    end if
-    sleep 1
-    Kontext "Stylist"
-    Vorlagenliste.TypeKeys "<Home>"  'to go to the style we've created ourselves.
-    sleep 1
-    Vorlagenliste.OpenContextMenu
-    sleep 1
-    hMenuSelectNr (2) 'modify...
-    sleep 1
-    Kontext
-    if Messagebox.exists (5) then
-        try
-            Messagebox.SetPage TabVerwalten
-            Kontext "TabVerwalten"
-            VorlagenName.setText("2Test")
-            TabVerwalten.OK
-        catch
-            warnlog "Under Gnome we have a focus problem here."
-        endcatch
-    end if
-
-    sleep 3
-    Kontext "Stylist"
-    Vorlagenliste.TypeKeys "<Home>"  'to go to the style we've created ourselves.
-    sleep 1
-    try
-        Vorlagenliste.TypeKeys "<Delete>" 'To delete the style.
-        Kontext "Active" 'do you really wish to delete?
-        Active.YES
-        sleep 2
-    catch
-        Warnlog "Couldnt delete the new Style, or maybe wrong position?"
-    endcatch
-    Kontext "Stylist"
-    if (Stylist.NotExists) then
-        ErrorLog "There was no Stylist open, should be."
-    else
-        if lcase(gPlatform) = "osx" then
-            hTypekeys "<mod1 t>"
-        else
-            hTypekeys "<F11>"
-        endif
-        Kontext "Stylist"
-        if (Stylist.Exists) then
-            ErrorLog "The Stylist should be closed now."
-        endif
-    endif
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatFontwork
-    Call hNewDocument
-    Call hTextrahmenErstellen ("Flightplanning via www.aua.com is hard!",20,20,50,30)
-    sleep 1
-    FormatFontwork
-    Kontext "FontWork"
-    if FontWork.exists (5) then
-        DialogTest ( FontWork )
-        sleep 1
-        FontWork.Close
-    else
-        warnlog "FontWork didn't came up :-("
-    endif
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatGroup
-    Call hNewDocument
-    hRechteckErstellen ( 10, 10, 20, 20 )
-    hRechteckErstellen ( 30, 30, 40, 40 )
-    EditSelectAll
-    FormatGroupDraw
-    WaitSlot (1000)
-    FormatEditGroupDraw
-    WaitSlot (1000)
-    FormatExitGroupDraw
-    WaitSlot (1000)
-    FormatUngroupDraw
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
-
-testcase tiFormatStylesSlideDesign
-    ' create recktanglr; click outside ?
-    Call hNewDocument
-    WaitSlot (3000)
-    FormatModifyLayout ' is OK : Format->Styles->Slide Design; 27064; SID_PRESENTATION_LAYOUT
-    WaitSlot (1000)
-    Kontext "Seitenvorlage"
-    Call DialogTest ( Seitenvorlage )
-    HintergrundseiteAustauschen.check
-    DeleteUnusedBackgrounds.check
-    Laden.Click
-    kontext "Neu"
-    Zusaetze.click
-    sleep 1
-    kontext "Neu"
-    try
-        Vorschau.check
-    catch
-        printlog "Preview wasn't checkable :-( hopfully now:"
-        Zusaetze.click
-        sleep 1
-        Vorschau.check
-        printlog "... OK :-)"
-    endcatch
-    Neu.cancel
-    Kontext "Seitenvorlage"
-    Seitenvorlage.Cancel
-    sleep 2
-    Call hCloseDocument
-endcase
-
-'---------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc
deleted file mode 100644
index bcbfa3d7c24b..000000000000
--- a/testautomation/graphics/optional/includes/global/id_006.inc
+++ /dev/null
@@ -1,362 +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 :
-'*
-'***********************************************************************************
-' #1 tiToolsSpellchecking
-' #1 tiToolsSpellcheckingAutomatic
-' #1 tiToolsThesaurus
-' #1 tiToolsHyphenation
-' #1 tiToolsAutoCorrect
-' #1 tChineseTranslation
-' #1 tiToolsMacro
-' #1 tiToolsGallery
-' #1 tiToolsEyedropper
-' #1 tiToolsOptions
-'\**********************************************************************************
-
-
-testcase tiToolsSpellchecking
-
-    if not gOOO then ' Spellcheck doesn't work in OOo builds.
-        Call hNewDocument
-        WaitSlot (2000)    'sleep 2
-        call hSetSpellHypLanguage
-        Call hTextrahmenErstellen ("Whaaaat", 10, 10, 30, 40)
-        sleep 1
-        ToolsSpellCheck
-        WaitSlot (1000)    'sleep 1
-        Kontext "MessageBox"
-        if MessageBox.exists(2) then
-            qaerrorlog "Messagebox : " + MessageBox.gettext() + " appear."
-            qaerrorlog "Maybe no spellchecking for this languages is available."
-            MessageBox.OK
-        else
-            Kontext "Rechtschreibung"
-            if Rechtschreibung.exists then
-                Call DialogTest ( Rechtschreibung )
-                Rechtschreibung.Close
-            else
-                warnlog " Spellcheck dialog didn't came up :-("
-            end if
-        end if
-        sleep 1
-        Kontext "Messagebox"
-        if Messagebox.exists (5) then
-            warnlog "Shouldn't be any messagebox after pressing close in spellchecker"
-            Messagebox.OK
-            sleep (2)
-            Kontext
-        end if
-        Call hCloseDocument
-    else goto endsub
-    endif
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsSpellcheckingAutomatic
-    Call hNewDocument
-    ToolsSpellcheckAutoSpellcheck
-    Call hTextrahmenErstellen ("What", 10, 10, 30, 40)
-    sleep 2
-    ToolsSpellcheckAutoSpellcheck
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsThesaurus
-    if not gOOO then ' Thesaurus doesn't work in OOo builds.
-
-        dim sFileName as String
-
-        call hSetSpellHypLanguage
-        if (gApplication = "IMPRESS") then
-            sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odp"))
-        else
-            sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg"))
-        end if
-        if FileExists ( sFileName ) = FALSE then
-            warnlog "The language-file was not found or accessible! The test ends."
-            goto endsub
-        end if
-        Call hFileOpen (sFileName)
-        sleep (2)
-
-        hTypeKeys "<TAB><RETURN>"
-        hTypeKeys "<END><SHIFT HOME>"
-
-        '   Call hTextrahmenErstellen ("SimpleTest" + "<Mod1 Shift left>", 10, 10, 30, 40)
-        try
-            ExtrasThesaurusDraw
-            Kontext "Thesaurus"
-            Call DialogTest ( Thesaurus )
-            Sprache.Click
-            Kontext "SpracheAuswaehlen"
-            Call DialogTest ( SpracheAuswaehlen )
-            SpracheAuswaehlen.cancel
-            Kontext "Thesaurus"
-            Nachschlagen.Click
-            kontext
-            if Messagebox.exists (5) then
-                printlog "Messagebox: word not in thesaurus: '"+Messagebox.gettext+"'"
-                Messagebox.ok
-            end if
-            sleep 1
-            Kontext "Thesaurus"
-            Thesaurus.Cancel
-        catch
-            warnlog "Thesaurus didn't work :-("
-        endcatch
-        sleep 1
-        Call hCloseDocument
-    else goto endsub
-    endif
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsHyphenation
-    Call hNewDocument
-    ToolsLanguageHyphenationDraw
-    WaitSlot (2000)    'sleep 2
-    ToolsLanguageHyphenationDraw
-    Call hCloseDocument
-endcase
-
-testcase tiToolsAutoCorrect
-    dim iLanguage as integer ' for resetting the language
-    Call hNewDocument
-    WaitSlot (1000)    'sleep 1
-    ToolsAutocorrect
-    WaitSlot (2000)    'sleep 1
-    Kontext
-    Messagebox.SetPage TabErsetzung
-    Kontext "TabErsetzung"
-    Call DialogTest ( TabErsetzung )
-    iLanguage = WelcheSprache.GetSelIndex
-    WelcheSprache.Select 1 ' select language with empty list
-    Kuerzel.SetText "a"
-    ErsetzenDurch.SetText "b"
-    Neu.Click
-    sleep 1
-    Loeschen.Click
-    sleep 1
-    try
-        Loeschen.Click
-    catch
-        printlog "ok was CRASH before" '#
-    endcatch
-    WelcheSprache.select (iLanguage)
-    Kontext
-    Messagebox.SetPage TabAusnahmen
-    Kontext "TabAusnahmen"
-    Call DialogTest ( TabAusnahmen )
-    Abkuerzungen.settext "Lala"
-    AbkuerzungenNeu.click
-    AbkuerzungenLoeschen.click
-    Woerter.settext "LALA"
-    WoerterAutomatisch.Check
-    WoerterNeu.click
-    WoerterLoeschen.click
-    WoerterAutomatisch.UnCheck
-    Kontext
-    Messagebox.SetPage TabOptionen
-    Kontext "TabOptionen"
-    Call DialogTest ( TabOptionen )
-    Kontext
-    Messagebox.SetPage TabLocalizedOptions
-    Kontext "TabLocalizedOptions"  ' 1a
-    SingleQuotesReplace.Check
-    SingleQuotesStart.Click
-    Kontext "Sonderzeichen"
-    Call DialogTest ( Sonderzeichen, 1 )
-    Sonderzeichen.Cancel
-    Kontext "TabLocalizedOptions"  ' 1b
-    SingleQuotesEnd.Click
-    Kontext "Sonderzeichen"
-    Call DialogTest ( Sonderzeichen, 2 )
-    Sonderzeichen.Cancel
-    Kontext "TabLocalizedOptions"  ' 1s
-    SingleQuotesDefault.Click
-
-    Kontext "TabLocalizedOptions"  ' 2a
-    DoubleQuotesStart.Click
-    Kontext "Sonderzeichen"
-    Call DialogTest ( Sonderzeichen, 3 )
-    Sonderzeichen.Cancel
-    Kontext "TabLocalizedOptions"  ' 2b
-    DoubleQuotesEnd.Click
-    Kontext "Sonderzeichen"
-    Call DialogTest ( Sonderzeichen, 4 )
-    Sonderzeichen.Cancel
-    Kontext "TabLocalizedOptions"  ' 2s
-    DoubleQuotesDefault.Click
-    SingleQuotesReplace.UnCheck
-    TabLocalizedOptions.cancel
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tChineseTranslation
-
-    qaerrorlog( "#i89634# - Chinese Translation dialog does not close" )
-    goto endsub
-
-    dim sFileName   as string
-    dim bSavedAsianSupport as boolean
-
-    if uCase(gApplication) = "IMPRESS" then
-        sFileName = "graphics\required\input\tchinese.odp"
-    else
-        sFileName = "graphics\required\input\tchinese.odg"
-    end if
-
-    Call hNewDocument
-    WaitSlot (2000)    'sleep 1
-    bSavedAsianSupport = ActiveDeactivateAsianSupport(TRUE)
-    Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
-    sleep (2)
-    Kontext "Standardbar"
-    if Bearbeiten.GetState(2) <> 1 then
-        Bearbeiten.Click '0 = not pressed. 1 = pressed.
-        Kontext
-        if Active.Exists(1) then
-            Active.Yes
-        else
-            warnlog "No messagebox after making document editable? - Test canceled here"
-            goto endsub
-        end if
-    end if
-    if uCase(gApplication) = "IMPRESS" then
-        Kontext "DocumentImpress"
-    else
-        Kontext "DocumentDraw"
-    end if
-    EditSelectAll
-    hTypeKeys "<RETURN>"
-    hTypeKeys "<MOD1 HOME><RIGHT><RIGHT><SHIFT RIGHT RIGHT>"
-    ToolsChineseTranslation
-    WaitSlot (2000)    'sleep 1
-    kontext "ChineseTranslation"
-    Call DialogTest ( ChineseTranslation )
-    EditTerms.Click
-    kontext "ChineseDictionary"
-    Call DialogTest ( ChineseDictionary )
-    ChineseDictionary.Ok
-    kontext "ChineseTranslation"
-    ChineseTranslation.OK
-    kontext
-    if Messagebox.exists (5) then
-        printlog "Messagebox: "+Messagebox.gettext+"'"
-        Messagebox.ok
-    end if
-    ActiveDeactivateAsianSupport(bSavedAsianSupport)
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsMacro
-    Call hNewDocument
-    WaitSlot (2000)    'sleep 2
-    ToolsMacro
-    Kontext "Makro"
-    Call DialogTest ( Makro )
-    Verwalten.Click
-
-    Kontext
-    Messagebox.SetPage TabModule
-    Kontext "TabModule"
-    Call DialogTest ( TabModule )
-
-    Kontext
-    Messagebox.SetPage TabBibliotheken
-    Kontext "TabBibliotheken"
-    Call DialogTest ( TabBibliotheken )
-    Hinzufuegen.Click
-    Kontext "Messagebox"
-    if Messagebox.Exists (5) then
-        if Messagebox.GetRT = 304 then
-            Warnlog Messagebox.Gettext
-            Messagebox.Ok
-        end if
-    end if
-    Kontext "OeffnenDlg"
-    OeffnenDlg.Cancel
-    Kontext "TabBibliotheken"
-    Neu.Click
-    kontext "NeueBibliothek"
-    sleep 1 'Bibliotheksname
-    NeueBibliothek.cancel
-    Kontext "TabBibliotheken"
-    TabBibliotheken.Close
-
-    Kontext "Makro"
-    Makro.Cancel
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsGallery
-    Call hNewDocument
-    ToolsGallery
-    WaitSlot (2000)    'sleep 1
-    ToolsGallery
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsEyedropper
-    Call hNewDocument
-    ToolsEyedropper
-    Kontext "Pipette"
-    Call DialogTest (Pipette)
-    Pipette.Close
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tiToolsOptions
-    Call hNewDocument
-    ToolsOptions
-    WaitSlot (2000)    'sleep 1
-    kontext "OptionenDlg"
-    OptionenDlg.Close
-    Call hCloseDocument
-endcase
-
-'--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/id_007.inc b/testautomation/graphics/optional/includes/global/id_007.inc
deleted file mode 100644
index bbc870953f3a..000000000000
--- a/testautomation/graphics/optional/includes/global/id_007.inc
+++ /dev/null
@@ -1,426 +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 :
-'*
-'***********************************************************************************
-' #1 tdModifyFlipVertikal
-' #1 tdModifyFlipHorizontal
-' #1 tdContextConvertIntoCurve
-' #1 tdContextConvertIntoPolygon
-' #1 tdContextConvertIntoContour
-' #1 tdContextConvertInto3D
-' #1 tdContextConvertIntoRotationObject
-' #1 tdContextConvertIntoBitmap
-' #1 tdContextConvertIntoMetaFile
-' #1 tdModifyArrange
-' #1 tdModifyArrangeObjects
-' #1 tdModifyAlignment
-' #1 tdContextDistribution
-' #1 tdContextDescriptionObject
-' #1 tdContextNameObject
-' #1 tdModifyConnectBreak
-' #1 tdModifyShapes
-' #1 tdModifyCombineSplit
-'\**********************************************************************************
-
-testcase tdModifyFlipVertikal
-
-    Call hNewDocument            ' imp: contextmenue same SID!
-    sleep 1
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    try
-        ContextFlipVerticalDraw
-        Printlog "- Flip-vertical is working"
-    catch
-        Warnlog "- Flip-Vertical does not work"
-    endcatch
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyFlipHorizontal
-    Call hNewDocument            ' imp: contextmenue same SID!
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    try
-        ContextFlipHorizontalDraw
-        Printlog "- Flip-horizontal is working"
-    catch
-        Warnlog "- Flip-horizontal does not work"
-    endcatch
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoCurve
-    Call hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    ContextConvertIntoCurve
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoPolygon
-    dim iWaitIndex as integer
-    Call hNewDocument            ' imp: contextmenue same SID!
-    InsertGraphicsFromFile
-    Kontext "GrafikEinfuegenDlg"
-    iWaitIndex = 0
-    do while NOT GrafikEinfuegenDlg.Exists AND iWaitIndex < 10
-        sleep(1)
-        iWaitIndex = iWaitIndex + 1
-    loop
-    if NOT GrafikEinfuegenDlg.Exists AND iWaitIndex = 10 then
-        warnlog "Dialogue Insert Graphics didnt work. Ending testcase."
-        Call hCloseDocument
-        goto endsub
-    end if
-    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
-    Oeffnen.Click
-    sleep 3
-    ContextConvertIntoPolygon
-    Kontext "InPolygonUmwandeln"
-    Call DialogTest (InPolygonUmwandeln)
-    LoecherFuellen.Check
-    Farbanzahl.More
-    Punktreduktion.More
-    Kachelgroesse.More
-    Vorschau.Click
-    sleep 10
-    InPolygonUmwandeln.Cancel
-    sleep (2)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoContour
-    Call hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    ContextConvertIntoContour
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertInto3D
-    Call hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    ContextConvertInto3D
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoRotationObject
-    Call hNewDocument
-    WaitSlot (1000)
-    Call hRechteckErstellen (20,20,50,50)
-    sleep 2
-    ContextConvertInto3DRotationObject
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoBitmap
-    Call hNewDocument
-    WaitSlot (3000)
-    InsertGraphicsFromFile
-    WaitSlot (3000)
-    Kontext "GrafikEinfuegenDlg"
-    sleep 2
-    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf")
-    sleep 2
-    Oeffnen.Click
-    sleep 2
-    try
-        ContextConvertIntoBitmap
-        Printlog "- Convert into bitmap is working"
-    catch
-        Warnlog "- Convert into bitmap does not work"
-    endcatch
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextConvertIntoMetaFile
-    Call hNewDocument
-    WaitSlot (3000)
-    InsertGraphicsFromFile
-    WaitSlot (1000)
-    kontext "Messagebox"
-    if Messagebox.Exists (5) Then Messagebox.OK
-        sleep 1
-        Kontext "GrafikEinfuegenDlg"
-        sleep 2
-        Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-        sleep 2
-        Preview.Click
-        sleep 3
-        Oeffnen.Click
-        sleep 5
-        try
-            ContextConvertIntoMetafile
-            Printlog "- convert into meta file does work"
-        catch
-            Warnlog "- convert into meta file does not work"
-        endcatch
-        Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyArrange
-    Call hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    hTypeKeys("<escape>")
-    Call hRechteckErstellen ( 30, 30, 50, 60 )
-    FormatArrangeBringToFront
-    WaitSlot (1000)
-    ContextArrangeBringForward
-    WaitSlot (1000)
-    ContextArrangeBringBackward
-    WaitSlot (1000)
-    FormatArrangeSendToBack
-    WaitSlot (1000)
-    EditSelectAll
-    ContextArrangeReverse
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyArrangeObjects
-    Call hNewDocument
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 20, 20, 30, 50 )
-    hTypeKeys("<escape>")
-    Call hRechteckErstellen ( 30,30,50,50 )
-    ContextArrangeInFrontOfObject
-    gMouseClick 11,11
-    ContextArrangeBehindObject
-    gMouseClick 45,45
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyAlignment
-    Call hNewDocument
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 20, 20, 30, 50 )
-    ContextAlignmentLeft
-    WaitSlot (1000)
-    ContextAlignmentCentered
-    WaitSlot (1000)
-    ContextAlignmentRight
-    WaitSlot (1000)
-    ContextAlignmentTop
-    WaitSlot (1000)
-    ContextAlignmentBottom
-    WaitSlot (1000)
-    ContextAlignmentCenter
-    WaitSlot (1000)
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextDistribution
-    Call hNewDocument
-    WaitSlot (3000)
-    Call hRechteckErstellen (20,20,30,30)
-    Call hRechteckErstellen (40,40,50,50)
-    Call hRechteckErstellen (60,60,70,70)
-    sleep 1
-    EditSelectAll
-    sleep 1
-    ContextDistribution
-    Kontext "VerteilenDlg"
-    sleep 1
-    Call DialogTest (VerteilenDlg)
-    sleep 1
-    Links.Check
-    MitteHorizontal.Check
-    AbstandHorizontal.Check
-    Rechts.Check
-    KeineHorizontal.Check
-    Oben.Check
-    MitteVertikal.Check
-    AbstandVertikal.Check
-    Unten.Check
-    KeineVertikal.Check
-    VerteilenDlg.Cancel
-    sleep 2
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextDescriptionObject
-    Call hNewDocument
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    ContextDescriptionObject
-    Kontext "DescriptionObject"
-    Call DialogTest (DescriptionObject)
-    DescriptionObject.Cancel
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdContextNameObject
-    Call hNewDocument
-    WaitSlot (1000)
-    Call hRechteckErstellen ( 20, 20, 30, 50 )
-    hTypeKeys("<escape>")
-    Call hRechteckErstellen ( 30, 40, 50, 60 )
-    sleep 1
-    gMouseMove 1,1,95,95
-    sleep 1
-    FormatGroupGroup
-    WaitSlot (1000)
-    ContextNameObject
-    Kontext "NameDlgObject"
-    Call DialogTest (NameDlgObject)
-    NameDlgObject.Cancel
-    FormatUngroupDraw
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyConnectBreak
-    Call hNewDocument
-    sleep 1
-    Call hRechteckErstellen (10,10,30,30)
-    Call hRechteckErstellen (35,35,50,50)
-    sleep 1
-    EditSelectAll
-    ContextConnect
-    sleep 1
-    try
-        ContextBreak
-    catch
-        Warnlog "- Modify-Break does not work"
-    endcatch
-    sleep 1
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyShapes
-    Call hNewDocument
-    sleep 1
-    gMouseClick 50,50
-    Call hRechteckErstellen (30,30,50,50)
-    Call hRechteckErstellen (60,60,80,80)
-    sleep 1
-    EditSelectAll
-    sleep 1
-    try
-        ModifyShapesMerge         ' 1
-        WaitSlot (1000)    'sleep 1
-        Printlog "- Modify-Shape merge is working"
-    catch
-        Warnlog "- Modify-shape merge is not working"
-    endcatch
-    EditSelectAll
-    sleep 1
-    hTypeKeys "<DELETE>"
-    sleep 1
-    Call hRechteckErstellen (30,30,50,50)
-    Call hRechteckErstellen (60,60,80,80)
-    sleep 1
-    EditSelectAll
-    sleep 1
-    try
-        ModifyShapesSubstract     ' 2
-        Printlog "- Modify-shape-substract is working"
-    catch
-        Warnlog "- Modify-shape substract is not working"
-    endcatch
-    sleep 1
-    EditSelectAll
-    sleep 1
-    hTypeKeys "<DELETE>"
-    sleep 1
-    Call hRechteckErstellen (30,30,50,50)
-    sleep 1
-    Call hRechteckErstellen (60,60,80,80)
-    sleep 1
-    EditSelectall
-    sleep 1
-    try
-        ModifyShapesIntersect      ' 3
-        Printlog "- Modify-shape intersect is working"
-    catch
-        Warnlog "- Modify-Shape intersect is not working"
-    endcatch
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
-
-testcase tdModifyCombineSplit
-    Call hNewDocument
-    sleep 1
-    Call hRechteckErstellen (30,30,50,50)
-    Call hRechteckErstellen (60,60,80,80)
-    sleep 1
-    EditSelectAll
-    sleep 1
-    try
-        ContextCombine
-        Printlog "- Modify combine is working"
-        ContextSplit
-        Printlog "- Modify-split is working"
-    catch
-        Warnlog "- Modify-combine and split are not working"
-    endcatch
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/id_008.inc b/testautomation/graphics/optional/includes/global/id_008.inc
deleted file mode 100644
index 654cae0f00df..000000000000
--- a/testautomation/graphics/optional/includes/global/id_008.inc
+++ /dev/null
@@ -1,71 +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 :
-'*
-'******************************************************************
-' #1 tiWindowNewWindow
-' #1 tidWindow123       'wrn:2
-'\*****************************************************************
-
-testcase tiWindowNewWindow
-
-    Call  hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    WindowNewWindow
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
-testcase tidWindow123
-    goto endsub '' testing TBO: 29.03.2002
-    dim iMenues as integer
-    Call  hNewDocument
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-
-    Kontext "DocumentImpress"
-    DocumentImpress.UseMenu
-    iMenues = MenuGetItemCount
-    warnlog "---- Number of Main menus: " & iMenues
-    MenuSelect(Menugetitemid(8))
-    sleep 1
-    iMenues = MenuGetItemCount
-    printlog "---- Number of Main menus: " & iMenues
-    '     MenuSelect(Menugetitemid(14))
-    sleep 1
-    i=1
-    printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-    i=2
-    printlog "count: " + i + "; of submenu: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-    warnlog "Dynamic entries not accessible ? :-((((("
-    '   i=3
-    '   printlog "count: " + i + "; of submenue: " + MenuGetItemCount + "; SID: " + MenuGetItemId (i) + "; Text: " + MenuGetItemText (Menugetitemid(i)) + "; Command: " + MenuGetItemCommand(Menugetitemid(i)) + "; Seperator?: " + MenuIsSeperator(i) + "; Enabled: " + MenuIsItemEnabled(Menugetitemid(i)) + "; Checked: " + MenuIsItemChecked(Menugetitemid(i)) + ";"
-    Call hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/optional/includes/global/id_009.inc b/testautomation/graphics/optional/includes/global/id_009.inc
deleted file mode 100644
index 7096a1a860a9..000000000000
--- a/testautomation/graphics/optional/includes/global/id_009.inc
+++ /dev/null
@@ -1,243 +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 : Testcases to test the Help-Menu.
-'*
-'***********************************************************************************
-' #1 tmHelpHelpAgent
-' #1 tmHelpTips
-' #1 tmHelpExtendedTips
-' #1 tmHelpAboutStarOffice
-' #1 tmHelpContents
-' #1 tCheckIfTheHelpExists
-'\**********************************************************************************
-'
-testcase tmHelpHelpAgent
-
-    Call hNewDocument
-
-    hTBOtypeInDoc
-
-    HelpHelpAgent         ' it's just a switch
-    sleep 2
-    HelpHelpAgent
-
-    Call hCloseDocument
-endcase
-
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
-
-testcase tmHelpTips
-    Call hNewDocument
-    hTBOtypeInDoc
-
-    HelpTips
-    Sleep 2
-    HelpTips
-
-    Call hCloseDocument
-endcase
-
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
-
-testcase tmHelpExtendedTips
-    Call hNewDocument
-    hTBOtypeInDoc
-
-    HelpEntendedHelp
-    Sleep (2)
-    HelpEntendedHelp
-
-    Call hCloseDocument
-endcase
-
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
-
-testcase tmHelpAboutStarOffice
-    Call hNewDocument
-    hTBOtypeInDoc
-
-    HelpAboutStarOffice
-    Kontext "UeberStarMath"
-    DialogTest (UeberStarMath)
-    UeberStarMath.OK
-
-    Call hCloseDocument
-endcase
-
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
-
-testcase tmHelpContents
-    goto endsub '"#i84486# - tmHelpContents outcommented due to crash."
-    dim i as integer
-
-    Call hNewDocument
-    HelpContents
-    sleep(8)
-    kontext "StarOfficeHelp"
-    if Not StarOfficeHelp.Exists then
-        Warnlog "Help is not up!"
-    else
-        Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'"
-        '################ left half ################
-        TabControl.SetPage ContentPage
-        Printlog "SearchContent: '" + SearchContent.GetItemCount + "'"
-        TabControl.SetPage IndexPage
-        Printlog "SearchIndex: '" + SearchIndex.GetItemCount + "'"
-        sleep 5
-        DisplayIndex.Click
-        sleep 5
-        TabControl.SetPage FindPage
-        Printlog "SearchFind: '" + SearchFind.GetItemCount + "'"
-        if SearchFind.GetSelText = "" then
-            if FindButton.IsEnabled then
-                warnlog "   The Find-Button should have been inactive, but was active."
-            endif
-        else
-            warnlog "   The Search-Text-Field shouldn't contain any text. But contained: " + SearchFind.GetSelText
-        endif
-        SearchFind.SetText "Doobbidedooo"
-        FindButton.Click
-        kontext
-        if (active.exists (2) )then
-            Printlog "active came up: '" + active.gettext + "'"
-            active.ok
-        endif
-        kontext "StarOfficeHelp"
-        FindFullWords.Check
-        FindInHeadingsOnly.Check
-        Printlog "Result: '" + Result.GetItemCount + "'"
-        DisplayFind.Click
-        TabControl.SetPage BookmarksPage
-        Printlog "Bookmarks: '" + Bookmarks.GetItemCount + "'"
-        DisplayBookmarks.Click
-        '################ right half ################
-        '################ toolbar ################
-        Kontext "TB_Help"
-        Index.Click
-        sleep 1
-        Index.Click
-        sleep 1
-        GoToStart.Click
-        sleep 1
-        Backward.Click
-        sleep 1
-        Forward.Click
-        sleep 1
-        PrintButton.Click
-        sleep (1)
-
-        kontext "Active"
-        if Active.Exists( 2 ) then
-            qaerrorlog "No default printer defined: " & Active.GetText
-            Active.Ok
-        end if
-
-        kontext "Printing"
-        if Printing.Exists( 2 ) then
-            Printing.cancel
-        else
-            warnlog "the Print-Dialogue didnt appear."
-        end if
-        Kontext "TB_Help"
-        sleep 1
-        SetBookmarks.Click
-        sleep 1
-        Kontext "AddBookmark"
-        Printlog "Bookmarkname: '" + Bookmarkname.GetText + "'"
-        AddBookmark.Cancel
-        sleep 1
-        '################ help display ################
-        kontext "HelpContent"
-        HelpContent.OpenContextMenu
-
-        sleep 1
-        Printlog " i: " + hMenuItemGetCount
-        hMenuClose()
-        '################ right scroolbar ################
-        kontext "HelpContent"
-        if HelpContentUP.IsVisible then
-            HelpContentUP.Click
-            sleep 1
-        endif
-        if HelpContentNAVIGATION.IsVisible then
-            HelpContentNAVIGATION.Click
-            sleep 1
-        endif
-        kontext "NavigationsFenster"
-        NavigationsFenster.Close
-        sleep 1
-        kontext "HelpContent"
-        if HelpContentDOWN.IsVisible then
-            HelpContentDOWN.Click
-            sleep 1
-        endif
-        kontext "StarOfficeHelp"
-        Printlog "trying to close the help now"
-        try
-            StarOfficeHelp.TypeKeys "<Mod1 F4>" ' strg F4   supported since bug  #103586#
-        catch
-            Warnlog "failed to close the help window :-("
-        endcatch
-        kontext "StarOfficeHelp"
-        if StarOfficeHelp.Exists then
-            warnlog "Help still up!"
-        endif
-    endif
-    Call hCloseDocument
-endcase
-
-'...---....---.-.-.-.-.....---......--.-.-.-.....----..-........................---.......
-
-testcase tCheckIfTheHelpExists
-    Call hNewDocument
-    HelpContents
-    kontext "HelpContent"
-    sleep (5)
-    HelpContent.TypeKeys "<MOD1 A>"
-    sleep (1)
-    HelpContent.TypeKeys "<MOD1 C>"
-    if GetClipBoard = "" then
-        Warnlog "   No content in the Help-Content -view."
-    else
-        Printlog "   The Help-Content -view contained content. Good."
-    endif
-    kontext "StarOfficeHelp"
-    try
-        StarOfficeHelp.TypeKeys "<MOD1 F4>"
-    catch
-        Warnlog "   Failed to close the help window :-("
-    endcatch
-    kontext "StarOfficeHelp"
-    if StarOfficeHelp.Exists then
-        warnlog "Help was still visible!"
-    endif
-    hTypeKeys "."
-    Call hCloseDocument
-endcase 'tCheckIfTheHelpExists
diff --git a/testautomation/graphics/optional/includes/global/id_011.inc b/testautomation/graphics/optional/includes/global/id_011.inc
deleted file mode 100644
index b1880d0982e8..000000000000
--- a/testautomation/graphics/optional/includes/global/id_011.inc
+++ /dev/null
@@ -1,995 +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 :
-'*
-'\******************************************************************************
-
-testcase tiTextToolbar
-
-    Dim iWaitIndex as integer
-    Dim Zufall as integer
-    Dim i as integer
-
-    Call hNewDocument
-
-    hTextrahmenErstellen ("This is a Text, which will be formatted in several ways", 20,20,40,80)
-    sleep 2
-    EditSelectAll
-    sleep 2
-    Kontext "TextObjectbar"
-    if TextObjectbar.Exists <> TRUE then  'isVisible
-        ViewToolbarsTextFormatting
-    endif
-    WaitSlot (3000)    'sleep (3)
-    Kontext "TextObjectbar"
-    Printlog "- choose random font"
-    randomize
-    Zufall=((2*Rnd)+1)      ' wird nicht auf den verfuegbaren bereich getreckt :-( TODO TBO!
-    Schriftart.GetItemcount
-    Schriftart.GetSelText
-    Schriftart.Select (Zufall)
-    Printlog Schriftart.GetSelText + " chosen"
-
-    Kontext "TextObjectbar"
-    sleep 2
-    Printlog "- Change size of font"
-    Schriftgroesse.Select (Zufall)
-    Printlog Schriftgroesse.GetSelText + " chosen"
-
-    Kontext "TextObjectbar"
-    Printlog "- Font attribute bold"
-    Fett.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Font attribute cursive"
-    Kursiv.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Font attribute cursiv"
-    Unterstrichen.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- font attribute color"
-    sleep 3
-    FontColorGraphics.TearOff
-    Kontext "TB_Farbe"
-    TB_Farbe.Move 20, 20
-    Sleep 2
-    TB_Farbe.MouseDoubleClick 50, 50
-    Sleep 2
-    TB_Farbe.Close
-
-    Kontext "TextObjectbar"
-    Printlog "- Allign text left"
-    Linksbuendig.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Allign text centered"
-    Zentriert.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- align text to right"
-    Rechtsbuendig.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Justified"
-    Blocksatz.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    if TextObjectbar.isEnabled <> TRUE then
-        warnlog "Couldn't access TextObjectbar - known bug with bars - FHA"
-        ViewToolbarsTextFormatting
-    endif
-    WaitSlot (2000)    'sleep 2
-    Printlog "- Raising Font spacing"
-
-    kontext "TextObjectbar"
-    sleep 1
-    iWaitIndex = 0
-    do while NOT TextObjectbar.isEnabled AND iWaitIndex < 10
-        sleep(1)
-        iWaitIndex = iWaitIndex + 1
-    loop
-    if NOT TextObjectbar.isEnabled AND iWaitIndex = 10 then
-        warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
-        Call hCloseDocument
-        goto endsub
-    endif
-    TextObjectbar.OpenContextMenu
-    sleep 2
-    hMenuselectNr (1)
-    sleep 2
-    hMenuItemCheck (13)
-    sleep 2
-    TextObjectbar.OpenContextMenu
-    sleep 2
-    hMenuselectNr (1)
-    sleep 2
-    hMenuItemCheck (14)
-    sleep 2
-    ZeilenabstandErhoehen.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Decrease Spacing"
-    ZeilenabstandVerringern.Click
-    sleep 2
-
-    Kontext "TextObjectbar"
-    Printlog "- Numbering and Bullets"
-    sleep 2
-    BulletsOnOff.Click
-    sleep 2
-    BulletsOnOff.Click
-
-    Kontext "TextObjectBar"
-    Printlog "- Increase Font /Reduce Font"
-    sleep 2
-    printlog "Click on Increase Font"
-    IncreaseFont.Click
-    sleep 2
-    printlog "Click on Reduce Font"
-    ReduceFont.Click
-
-    Kontext "TextObjectbar"
-    Printlog "- Text direction from left to right"
-    sleep 2
-    Printlog "- click button 'Text direction from left to right
-    try
-        TextdirectionLeftToRight.Click
-        printlog "hor does work :-)"
-        if (NOT gAsianSup) then
-            warnlog " this doesn't have to work if asian lang support is disabled :-)"
-        endif
-    catch
-        if (gAsianSup) then
-            warnlog "hor does NOT work :-("
-        endif
-    endcatch
-    Printlog "- click button 'Text direction from top to bottom"
-    try
-        TextdirectionTopToBottom.Click
-        printlog "ver does work :-)"
-        if (gAsianSup = FALSE) then
-            warnlog " this doesnt have to work if asian lang support is disabled :-)"
-        endif
-    catch
-        if (gAsianSup = TRUE) then
-            warnlog "ver does NOT work :-( , AsianLanguage support is enabled !"
-        endif
-    endcatch
-
-    Printlog "- open character dialog"
-    Kontext "TextObjectbar"
-    sleep 2
-    Zeichenformat.Click
-    sleep 2
-
-    Kontext
-    Active.SetPage TabFont
-
-    Kontext "TabFont"
-    sleep 2
-    if TabFont.Exists Then
-        TabFont.Cancel
-        Printlog "- Tabfont exists"
-    else
-        Warnlog "- No dialog exists "
-    endif
-
-    Kontext "TextObjectbar"
-    sleep 2
-    Printlog "- call properties for paragraph using text object toolbar"
-    Absatzformat.Click
-    sleep 2
-
-    Kontext
-    Active.SetPage TabTabulator
-
-    Kontext "TabTabulator"
-    if TabTabulator.Exists Then
-        Printlog "- TabTabulator exists"
-        TabTabulator.Cancel
-    else
-        Warnlog "- TabTabulator does not exist"
-    endif
-
-    if ( gApplication = "IMPRESS" ) then  ' IMPRESS only
-
-        Kontext "TextObjectbar"
-        OutlineBullet.Click
-        kontext
-        if active.exists (5) then
-            messagebox.SetPage TabOptionenNumerierung
-
-            kontext "TabOptionenNumerierung"
-            if (TabOptionenNumerierung.exists (5) ) then
-                Printlog "Numbering/Bullets window came up :-)"
-                TabOptionenNumerierung.cancel
-            else
-                warnlog "no Numbering/Bullets window came up :-("
-            endif
-        else
-            warnlog "no Numbering/Bullets window came up :-( 2"
-        endif
-
-        Printlog "-change order of outline points"
-        sleep 3
-        ViewWorkspaceOutlineView
-        WaitSlot (2000)    'sleep (3)
-
-        Kontext "DocumentImpressOutlineView"
-        sleep 1
-        DocumentImpressOutlineView.TypeKeys "Bla bla bla <RETURN><TAB>bla bla bla bla bla <MOD1 SHIFT LEFT>"
-        sleep 1
-
-        Kontext "TextObjectbar"
-        HierachieRunter.Click
-        sleep 1
-        Printlog "- Move back down"
-        HierachieHoch.Click
-        sleep 1
-        HierachieHoch.Click
-        sleep 1
-        Printlog "- Move paragraph up"
-        AbsatzHoch.Click
-        sleep 1
-        Printlog "- move paragraph back down and switch to drawing view"
-        AbsatzRunter.Click
-        sleep 1
-
-        Kontext "Vorschau"
-        if Vorschau.Exists then
-            printlog "- - - - preview window is open, hope there is no problem"
-            '    Vorschau.Close
-        endif
-
-    else '      DRAW only
-        Kontext "TextObjectbar"
-        Printlog "- Double"
-        LineSpacing2.Click
-        sleep 2
-
-        Kontext "TextObjectbar"
-        Printlog "- 1.5 lines"
-        LineSpacing15.Click
-        sleep 2
-
-        Kontext "TextObjectbar"
-        Printlog "- Single"
-        LineSpacing1.Click
-        sleep 2
-    endif
-
-    iWaitIndex = 0
-
-    Kontext "TextObjectbar"
-    do while TextObjectbar.isEnabled = FALSE AND iWaitIndex < 10
-        sleep(1)
-        iWaitIndex = iWaitIndex + 1
-    loop
-    if TextObjectbar.isEnabled = FALSE AND iWaitIndex = 10 then
-        warnlog "Dialogue TextObjectbar didnt work. Ending testcase."
-        Call hCloseDocument
-        goto endsub
-    endif
-    sleep 2
-
-    Kontext "TextObjectbar"
-    TextObjectbar.OpenContextMenu
-    sleep 2
-    hMenuselectNr (1)
-    sleep 2
-    hMenuItemUnCheck (13)
-    sleep 2
-    TextObjectbar.OpenContextMenu
-    sleep 2
-    hMenuselectNr (1)
-    sleep 2
-    hMenuItemUnCheck (14)
-    sleep 2
-    ViewToolbarsTextFormatting
-    WaitSlot (2000)    'sleep 1
-    if ( gApplication = "IMPRESS" ) then
-        Kontext "DocumentImpressOutlineView"
-        DocumentImpressOutlineView.TypeKeys "<ESCAPE>"
-        hUseAsyncSlot( "EditSelectAll" )
-        DocumentImpressOutlineView.TypeKeys "<DELETE>"
-        sleep (3)
-        ViewWorkspaceDrawingView
-
-        Kontext "DocumentImpress"
-        WaitSlot (2000)    'sleep 1
-        DocumentImpress.TypeKeys "<ESCAPE>"
-        hUseAsyncSlot( "EditSelectAll" )
-        DocumentImpress.TypeKeys "<DELETE>"
-    else
-        Kontext "DocumentDraw"
-        DocumentDraw.TypeKeys "<ESCAPE>"
-        hUseAsyncSlot( "EditSelectAll" )
-        DocumentDraw.TypeKeys "<DELETE>"
-    endif
-    Printlog "Test ended."
-
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
-
-testcase tiDrawObjectBar
-    Dim a as string
-    Dim Zaehler as integer
-    Dim i as integer
-    Dim x as integer
-
-    Call hNewDocument
-
-    Call hRechteckErstellen (20,20,70,70)
-    sleep 1
-    '--------------------------- format line ------------------------
-    Printlog "- call format line using graphic object toolbar"
-    Kontext "DrawingObjectbar"
-    if DrawingObjectbar.Exists = FALSE then
-        ViewToolbarsGraphic
-    endif
-    if DrawingObjectbar.Exists = FALSE then
-        warnlog "Drawing-Objectbar should have been opened, but wasnt"
-        ViewToolbarsGraphic
-    endif
-
-    sleep 3
-    Linie.Click
-    sleep 2
-    Kontext
-    Active.SetPage TabLinie
-    Kontext "TabLinie"
-    if TabLinie.Exists Then
-        TabLinie.Cancel
-        Printlog "- TabLinie exists "
-    else
-        Warnlog "- TabLinie does not exist"
-    endif
-
-    '--------------------------- Linienendenstil --------------------
-    Printlog "- Style of line ends"
-    Kontext "DrawingObjectbar"
-    sleep 1
-    Linienendenstil.TearOff
-    sleep 2
-    Kontext "Linienenden"
-    if Linienenden.Exists Then
-        Printlog "- dialog exists"
-        Linienenden.Close
-    else
-        Warnlog "- Arrowheads does not exist"
-    endif
-
-    '--------------------------- Linienstil -------------------------
-    Printlog "- choose style of lines using graphic object toolbar"
-
-    Kontext "DrawingObjectbar"
-    sleep 1
-    Linienstil.Select 2
-    Printlog Linienstil.GetSelText + " chosen"
-    Linienstil.Select Linienstil.GetItemCount
-    Printlog  Linienstil.GetSelText + " chosen"
-    sleep 2
-
-    '--------------------------- Linienbreite------------------------
-    Printlog "- check style of lines using graphic object toolbar"
-    Kontext "DrawingObjectbar"
-    sleep 1
-    a = Linienbreite.GetText
-    SetClipboard a
-    sleep 1
-    Linienbreite.SetText "0,5"
-    sleep 2
-    if Linienbreite.GetText = a Then
-        Warnlog "- changes in edit field did not happen; is: '"+Linienbreite.GetText+"', should be : '"+"0,5"+"'"
-    else
-        Printlog "- Width of lines changed"
-    endif
-
-    '--------------------------- Linienfarbe ------------------------
-    Printlog "- change line color"
-    Kontext "DrawingObjectbar"
-    sleep 1
-    Zaehler = Linienfarbe.GetItemCount
-    randomize
-    i = Int(Zaehler*Rnd+1)
-    Linienfarbe.Select i
-    Printlog Linienfarbe.GetSelText + " chosen"
-
-    '--------------------------- Flaechenformatierung ---------------
-    Printlog "- Call Format area using graphic object toolbar"
-    Kontext "DrawingObjectbar"
-    sleep 1
-    try
-        Flaeche.Click
-    catch
-        printlog "clicking on area took ages :-("
-    endcatch
-    sleep 5
-    Kontext
-    Active.SetPage TabArea
-    Kontext "TabArea"
-    if TabArea.Exists Then
-        Printlog "- TabArea exists "
-        TabArea.Cancel
-    else
-        Warnlog "- TabArea does not exist"
-    endif
-
-    '---
-    sleep 1
-    Kontext "DrawingObjectbar"
-    sleep 1
-    x = AreaStyle.GetItemCount
-    i = 1
-    for i = i to x
-        AreaStyle.Select i
-        Printlog "Area Style: (" + i + "/" + x + ") - " + AreaStyle.GetSelText
-        sleep 1
-        if AreaStyle.GetSelIndex > 1 then
-            Printlog "     Area Filling " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetItemCount
-            if (i <> 1) AND (AreaFilling.GetItemCount <> 0) then
-                if (AreaFilling.GetSelIndex = 0) AND (AreaFilling.GetItemCount > 0) then
-                    printlog "default item is 0 => means nothing; NO BUG! 100909"
-                endif
-                AreaFilling.Select (AreaFilling.GetItemCount)
-                Printlog "           Selected: " + AreaFilling.GetSelIndex + " - " + AreaFilling.GetSelText
-            endif
-        endif
-    next i
-
-    '---------------------------- Schatten --------------------------
-    Printlog "- Assign shadow using graphic object toolbar"
-    Kontext "DrawingObjectbar"
-    sleep 1
-    Schatten.Click
-    sleep 1
-    Printlog "- shadow assigned"
-
-    '---------------------------- Praesentationsflyer ---------------
-    if ( gApplication = "IMPRESS" ) then  ' IMPRESS only
-        Printlog "- Call presentation flyer"
-        Kontext "CommonTaskbar" ' first check , if presentation flyer is up! if not -> make it up :-)
-        if CommonTaskbar.Exists Then
-            printlog "- flyer is already visible :-)"
-        else
-            printlog "- flyer wasn't visible :-( -will be now!"
-            Kontext "DrawingObjectbar"
-            sleep 1
-            ViewToolbarsPresentation    ' put it up again!
-        endif
-    endif
-    if ((UCase(gApplication)) = "IMPRESS") then    ' IMPRESS only
-        Kontext "DrawingObjectbar"
-        if DrawingObjectbar.isVisible = FALSE then
-            ViewToolbarsGraphic
-        endif
-    endif
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
-
-testcase tiGraphicsObjectBar
-    dim i as integer
-    Call hNewDocument
-
-    hGrafikeinfuegen ConvertPath (gTesttoolPath & "global\input\graf_inp\desp.bmp")
-    sleep 1
-    Kontext "GraphicObjectbar"
-    if ( NOT GraphicObjectbar.Exists() ) then
-        ViewToolbarsPicture
-    endif
-    sleep 1
-    Filter.TearOff
-    sleep 1
-    Kontext "GraphicFilterBar"
-    sleep 1
-    Printlog "invert"
-    Invert.Click
-    sleep 3
-    Printlog "smooth"
-    Smooth.Click
-    sleep 3
-    Printlog "sharpen"
-    Sharpen.Click
-    sleep 3
-    Printlog "remove noise"
-    Remove.Click
-    sleep 3
-    Printlog "solarization"
-    Solarization.Click
-    sleep 3
-    Kontext "Solarization"
-    if Solarization.exists (5) then
-        sleep 1
-        Call Dialogtest ( Solarization )
-        sleep 1
-        Value.More
-        Value.Less
-        Invert.Check
-        Solarization.OK
-    else
-        warnlog "solarization didn't came up :-("
-    endif
-    sleep 1
-    Kontext "GraphicFilterBar"
-    sleep 1
-    Printlog "aging"
-    Aging.Click
-    Kontext "Aging"
-    sleep 1
-    Call Dialogtest ( Aging )
-    AgingDegree.More
-    AgingDegree.Less
-    sleep 1
-    Aging.OK
-    sleep 1
-    Kontext "GraphicFilterBar"
-    sleep 1
-    Printlog "poster"
-    Posterize.Click
-    sleep 1
-    Kontext "Posterize"
-    sleep 1
-    Call Dialogtest ( Posterize )
-    PosterColors.More
-    PosterColors.Less
-    sleep 1
-    Posterize.OK
-    sleep 2
-    kontext "GraphicFilterBar"
-    sleep 1
-    Printlog "pop"
-    Art.Click
-    sleep 3
-    Printlog "charcoal"
-    CharcoalSketch.Click
-    sleep 3
-    Printlog "relief"
-    Relief.Click
-    Kontext "Relief"
-    sleep 1
-    Call Dialogtest ( Relief )
-    LightSource.TypeKeys "<left><up>"
-    Relief.OK
-    sleep 3
-    Kontext "GraphicFilterBar"
-    Printlog "mos"
-    Mosaic.Click
-    sleep 1
-    Kontext "Mosaic"
-    sleep 1
-    Call Dialogtest ( Mosaic )
-    Width.More
-    Width.Less
-    Height.More
-    Height.Less
-    EnhanceEdges.Check
-    Mosaic.OK
-    sleep 3
-    Kontext "GraphicFilterBar"
-    GraphicFilterBar.Close
-
-    Kontext "GraphicObjectbar"
-    if GraphicObjectbar.Exists = FALSE then
-        ViewToolbarsPicture
-    endif
-    sleep 1
-    for i = 1 to Grafikmodus.GetItemCount
-        Grafikmodus.select i
-        sleep 1
-    next i
-
-    ColorSettings.Click
-    Kontext "ColorBar"
-
-    try
-        Rotanteil.More
-        Rotanteil.Less
-    catch
-        warnlog "not working from testtool redvalue "+   rotanteil.GetRT
-    endcatch
-    try
-        Gruenanteil.More
-        Gruenanteil.Less
-    catch
-        warnlog "not working from testtool Greenvalue."
-    endcatch
-    try
-        Blauanteil.More
-        Blauanteil.Less
-    catch
-        warnlog "not working from testtool Bluevalue."
-    endcatch
-    try
-        Helligkeit.More
-        Helligkeit.Less
-    catch
-        warnlog "not working from testtool Brightness."
-    endcatch
-    try
-        Kontrast.More
-        Kontrast.Less
-    catch
-        warnlog "not working from testtool Contrast."
-    endcatch
-    try
-        Gamma.More
-        Gamma.Less
-    catch
-        warnlog "not working from testtool Gamma."
-    endcatch
-
-    ColorBar.Close
-    Kontext "GraphicObjectbar"
-
-    try
-        Transparenz.More
-        Transparenz.Less
-    catch
-        warnlog "Not working from testtool Transparency."
-    endcatch
-
-    Crop.click
-    FormatCropPicture
-
-    kontext "TabZuschneiden"
-    GroesseBeibehalten.Check
-    MassstabBeibehalten.Check
-    Links.More
-    Links.Less
-    Rechts.More
-    Rechts.Less
-    Oben.More
-    Oben.Less
-    Unten.More
-    Unten.Less
-    MassstabBreite.More
-    MassstabBreite.Less
-    MassstabHoehe.More
-    MassstabHoehe.Less
-    GroesseBreite.More
-    GroesseBreite.Less
-    GroesseHoehe.More
-    GroesseHoehe.Less
-    Originalgroesse.Click
-    TabZuschneiden.Cancel
-
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
-
-testcase tiGluepointToolbar
-    Call hNewDocument
-
-    Call hRechteckErstellen 20,20,40,40
-    Call hRechteckErstellen 60,60,80,80
-    sleep 2
-    ViewToolbarsOptionbar
-    sleep 2
-
-    Kontext "Optionsbar"
-    if Optionsbar.Exists = False Then
-        ViewToolbarsOptionbar
-        Kontext "Optionsbar"
-        if Optionsbar.Exists = False Then
-            warnlog "Can't open Optionsbar."
-        endif
-    endif
-    sleep 2
-    Kontext "Toolbar"
-    sleep 1
-    Verbinder.Click
-    gMouseMove 30,30,70,70
-    sleep 3
-    Kontext "Toolbar"
-    GluePoints.Click
-    sleep 1
-    Kontext "Gluepointsobjectbar"
-    if Gluepointsobjectbar.Exists = False Then
-        ViewToolbarsGluepoints
-    endif
-    sleep 3
-    '-------------------------------------- Klebepunkt einfuegen ----
-    try
-        PunkteEinfuegen.Click
-        sleep 2
-        gMouseClick 25,30
-        sleep 1
-        gMouseclick 25,30
-        Printlog "- insert gluepoint works"
-    catch
-        Warnlog "- gluepoint could not be insert. Following errors might have their reason here"
-    endcatch
-    sleep 3
-    Kontext "Gluepointsobjectbar"
-
-    '-------------------------------------- Links -------------------
-    try
-        Links.Click
-        Printlog "- gluepoint left works"
-    catch
-        Warnlog "- gluepoint left does not work"
-    endcatch
-    sleep 1
-    '-------------------------------------- Rechts ------------------
-    try
-        Rechts.Click
-        Printlog "- gluepoint right works"
-    catch
-        Warnlog "- gluepoint right does not work"
-    endcatch
-    sleep 1
-    '-------------------------------------- Oben --------------------
-    try
-        Oben.Click
-        Printlog "- gluepoint top works"
-    catch
-        Warnlog "- gluepoint top does not work"
-    endcatch
-    sleep 1
-    '-------------------------------------- Unten -------------------
-    try
-        Unten.Click
-        Printlog "- gluepoint bottom works"
-    catch
-        Warnlog "- gluepoint bottom does not work"
-    endcatch
-    sleep 1
-    '---------------------- Position an Objekt anpassen -------------
-    try
-        PositionAnObjektAnpassen.Click
-        Printlog "- align position to object works"
-        gMouseClick 25,30      ' if you don't click onto an existing point, the state changes back :-[
-    catch
-        Warnlog "- align position to object does not work"
-    endcatch
-    Kontext "Gluepointsobjectbar"
-    sleep 1
-    '------------------------------------- Horizontal links ---------
-    if PositionAnObjektAnpassen.exists then
-        printlog "PositionAnObjektAnpassen = Exists"
-    endif
-    if PositionAnObjektAnpassen.GetState(2) <> 0 then
-        PositionAnObjektAnpassen.Click ' make unpressed!
-    endif
-    '0 = not pressed. 1 = pressed.
-    sleep 2
-    try
-        Kontext "Gluepointsobjectbar"
-        HorizontalLinks.Click
-        Printlog "- align horizontal left works"
-    catch
-        Warnlog "- align horizontal left does not work"
-        PositionAnObjektAnpassen.Click ' that's the middle button, it has to be UP/not activated!
-        for i = 1 to Gluepointsobjectbar.GetItemCount
-            if (Gluepointsobjectbar.GetState ( i, 0 ) <> 0 ) then ' is no seperator
-                printlog "----------------------------------------------------------------------"
-                printlog "helpid  : " + Gluepointsobjectbar.Getstate ( i, 0 ) + "  number in row: " + i
-                printlog "itemtype: " + Gluepointsobjectbar.GetState ( i, 1 )
-                printlog "state   : " + Gluepointsobjectbar.GetState ( i, 2 )
-                printlog "----------------------------------------------------------------------"
-            endif
-        next i
-    endcatch
-    sleep 2
-    '------------------------------------- Horizontal rechts --------
-    try
-        HorizontalRechts.Click
-        Printlog "- Align horizontal right does work"
-    catch
-        Warnlog "- Align horizontal right does notwork"
-    endcatch
-    sleep 1
-    '------------------------------------- Horizontal zentriert -----
-    try
-        HorizontalZentriert.Click
-        Printlog "- align horizontal center does work"
-    catch
-        Warnlog "- align horizontal center does work"
-    endcatch
-    sleep 1
-    '------------------------------------- Vertikal oben ------------
-    try
-        VertikalOben.Click
-        sleep 1
-        Printlog "- Align vertical top does work"
-    catch
-        Warnlog "- Align vertical top does not work"
-    endcatch
-    '------------------------------------- Vertikal unten -----------
-    try
-        VertikalUnten.Click
-        sleep 1
-        printlog "- Align vertical bottom does work"
-    catch
-        Warnlog "- Align vertical bottom does not work"
-    endcatch
-    '------------------------------------- Vertikal zentriert -------
-    try
-        VertikalZentriert.Click
-        sleep 1
-        Printlog "- Align vertical center does work"
-    catch
-        Warnlog "- Align vertical center does not work"
-    endcatch
-
-    Printlog "- End of testing gluepoints"
-
-    ViewToolbarsOptionbar
-    sleep 2
-    Kontext "Optionsbar"
-    if Optionsbar.Exists Then
-        warnlog "Couldnt close Optionsbar."
-    endif
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
-
-testcase tdBezierToolbar
-    Call hNewDocument
-
-    Call hRechteckErstellen ( 10, 10, 30, 40 )
-    sleep (1)
-
-    Call hOpenContextMenu
-    sleep (1)
-
-    Call hOpenContextMenu
-    sleep (2)
-
-    Kontext "Bezierobjectbar"
-    if Bezierobjectbar.Exists <> TRUE then
-        ViewToolbarsBezier
-        Sleep (2)
-        if Bezierobjectbar.Exists <> TRUE then
-            warnlog "Bezierobjectbar did not show up. Check why."
-        endif
-    endif
-
-    '----------------------------------- Punkte verschieben ------------------------------------
-
-    Kontext "Bezierobjectbar"
-    if Bezierobjectbar.Exists <> TRUE then
-        ViewToolbarsBezier
-        Sleep 2
-    endif
-    if Bezierobjectbar.Exists <> TRUE then
-        Warnlog "The Bezier-Objectbar should have been opened, but wasnt."
-        ViewToolbarsBezier
-        Sleep 2
-    endif
-
-    Kontext "Bezierobjectbar"
-    sleep 1
-    Printlog "- Move points"
-    Verschieben.Click
-    sleep 2
-
-    hTypeKeys "<MOD1 TAB>"
-
-    Printlog "- Insert points"
-    Kontext "Bezierobjectbar"
-    Einfuegen.Click
-    sleep 2
-    Bezierobjectbar.Move 20, 20
-    sleep (1)
-    Printlog "- Delete points"
-
-    gMouseMove 25,25,45,45
-
-
-    sleep 2
-    Kontext "Bezierobjectbar"
-    sleep 2
-    Printlog "- Convert into curve"
-    InKurve.Click
-    sleep 2
-    Printlog "- Place edge point"
-    Ecke.Click
-    sleep 2
-    Printlog "- Smooth transition"
-    Glatt.Click
-    sleep 2
-    Printlog "- Symetric transition"
-    Symmetrisch.Click
-    sleep 2
-
-    Kontext "Bezierobjectbar"
-    PunkteReduzieren.Click
-    sleep 2
-
-    hTypeKeys "<MOD1 TAB>"
-    hTypeKeys "<MOD1 SHIFT SPACE>"
-
-    Kontext "Bezierobjectbar"
-    try
-        Auftrennen.Click
-    catch
-        Warnlog "- 'Break' could not be executed"
-    endcatch
-    sleep 2
-
-    hTypeKeys "<MOD1 TAB>"
-    hTypeKeys "<MOD1 A>"
-
-    Printlog "- Close bezier"
-    Kontext "Bezierobjectbar"
-    try
-        Schliessen.Click
-    catch
-        InKurve.Click
-        sleep 2
-        try
-            Schliessen.Click
-        catch
-            warnlog "Couldn't push button :-( can't reproduce it now, mostly seen on linux, if i loop this test, it happens only 1/5 of the time ... :-)"
-        endcatch
-    endcatch
-    sleep 2
-
-    hTypeKeys "<MOD1 TAB>"
-    hTypeKeys "<MOD1 A>"
-
-    Kontext "Bezierobjectbar"
-    Printlog "- Break curve"
-    try
-        Loeschen.Click
-        sleep 2
-    catch
-        warnlog "Delete didn't work... why?"
-    endcatch
-
-    Kontext "Toolbar"
-    sleep 2
-    Toolbar.OpenContextMenu   ' Enable forms button in menuebar
-    sleep 2
-    hMenuselectNr (1)
-    sleep 2
-    hMenuItemUnCheck (7)
-    sleep 2
-    Call hCloseDocument
-endcase
-
-'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------'
diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index eeeeb5effb6b..1db9740b577a 100644
--- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
@@ -37,14 +37,13 @@ testcase i_us2_pres1
     dim iPictures as integer
     dim PresentationFile1 as string
     PresentationFile1 = (ConvertPath (gOfficePath + "user\work\PwrPres1.odp"))
+
     kontext "DocumentImpress"
-    printlog "New - Wizard - Presentation."
+    printlog "Starting with New - Wizard - Presentation."
     FileAutopilotPresentation
-    printlog "Called File-Autopilot-Presentation."
-    printlog "Create from Template"
+    printlog "Called File-Autopilot-Presentation, create from template."
     kontext "AutoPilotPraesentation1"
     FromTemplate.Check
-    'This part is for language-indepencancy
     if gOOO = TRUE then
         TemplateRegion.Select (1)
         printlog "Choose a Presentation"
@@ -56,7 +55,7 @@ testcase i_us2_pres1
             if TemplateList.GetItemCount < 40 then
                 TemplateRegion.Select (3)
                 if TemplateList.GetItemCount < 40 then
-                    Warnlog "   No Templates selectable in the wizard. Please check."
+                    Warnlog "No Templates selectable in the wizard. Please check."
                     goto endsub
                 endif
             endif
@@ -71,29 +70,29 @@ testcase i_us2_pres1
     sleep (1)
     Nextbutton.Click
 
-    printlog "   Switched to the second Wizard-page."
+    printlog "Switched to the second Wizard-page."
     sleep (1)
     printlog "Presentations"
     kontext "AutoPilotPraesentation2"
     printlog "Output: Screen"
-    if gOOO = TRUE then  'OpenOffice.org
+    if gOOO = TRUE then 
         Background.Select (2)
         if Backgroundchoice.GetItemCount < 2 then
             Background.Select (1)
             if Backgroundchoice.GetItemCount = 0 then
-                Warnlog "   No Backgrounds selectable in the wizard. Please check."
+                Warnlog "No Backgrounds selectable in the wizard. Please check."
                 goto endsub
             endif
         endif
         Backgroundchoice.Select (2)
-    else  'StarOffice
+    else 
         Background.Select (3)
         if Backgroundchoice.GetItemCount < 10 then
             Background.Select (2)
             if Backgroundchoice.GetItemCount < 10 then
                 Background.Select (3)
                 if Backgroundchoice.GetItemCount < 10 then
-                    Warnlog "   No Backgrounds selectable in the wizard. Please check."
+                    Warnlog "No Backgrounds selectable in the wizard. Please check."
                     goto endsub
                 endif
             endif
@@ -104,7 +103,7 @@ testcase i_us2_pres1
     printlog "Next"
     Nextbutton.Click
 
-    printlog "   Switched to the third Wizard-page."
+    printlog "Switched to the third Wizard-page."
     sleep (1)
     kontext "AutoPilotPraesentation3"
     printlog "Random Effect. Random Speed. Click through every choice."
@@ -118,7 +117,7 @@ testcase i_us2_pres1
     printlog "Next"
     Nextbutton.Click
 
-    printlog "   Switched to the fourth Wizard-page."
+    printlog "Switched to the fourth Wizard-page."
     sleep (1)
     kontext "AutoPilotPraesentation4"
     printlog "Fill in some company-name-subject-text"
@@ -136,36 +135,50 @@ testcase i_us2_pres1
     AutoPilotPraesentation5.OK
 
     sleep (1)
-    printlog "   Pressed 'Create'."
+    printlog "Pressed 'Create'."
     printlog "Add a Slide via Insert - Slide."
     Kontext "DocumentImpress"
-    hTypeKeys "What we will talk about"
-    gMouseClick 1,1
-    Kontext "DocumentImpress"
     DocumentImpress.UseMenu
     hMenuSelectNr (4)
     hMenuSelectNr (1)
-    call sSelectEmptyLayout
+
+    Kontext "DocumentImpress"
+    DocumentImpress.UseMenu
+    hMenuSelectNr (5)
+    hMenuSelectNr (13)
+    printlog "Changing focus to TaskPane."
+    kontext "Tasks"
+    sleep (1)
+    printlog "Selecting 5th layout."
+    LayoutsPreview.TypeKeys "<HOME>"
+    sleep (1)
+    LayoutsPreview.TypeKeys "<RIGHT>", 4
+    LayoutsPreview.TypeKeys "<RETURN>"
     sleep (1)
+    kontext "DocumentImpress"
+
+    sleep (1)
+    hTypeKeys "What we will talk about"
+    gMouseClick 1,1
 
     kontext "Slides"
-    SlidesControl.TypeKeys "<HOME><RETURN>"
+    SlidesControl.TypeKeys "<HOME>"
     kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<TAB>Text we just wrote..."
+    DocumentImpress.TypeKeys "<TAB>"
+    DocumentImpress.TypeKeys "Text we just wrote..."
+    DocumentImpress.TypeKeys "<ESCAPE>"
     printlog "Switch to the second slide."
     kontext "Slides"
-    SlidesControl.TypeKeys "<DOWN><RETURN>"
-    SlidesControl.TypeKeys "<RETURN>"
+    SlidesControl.TypeKeys "<DOWN>"
     kontext "DocumentImpress"
     printlog "Insert three lines with text, all with different formatting."
     call hTextrahmenErstellen ("First line with text",20,50,70,50)
     call hTextrahmenErstellen ("Second line with text",20,60,70,60)
     call hTextrahmenErstellen ("Third line with text",20,70,70,70)
-    printlog "Go down to the eleventh slide."
+    printlog "Go down to the third slide."
     kontext "Slides"
     SlidesControl.TypeKeys "<HOME>"
-    SlidesControl.TypeKeys "<PAGEDOWN>", 10
-    SlidesControl.TypeKeys "<RETURN>"
+    SlidesControl.TypeKeys "<PAGEDOWN>", 3
     printlog "Insert Smiley, + two circles around the eyes, + two new pupils,"
     printlog "placed at some interesteing place inside the circles."
     Kontext "Toolbar"
@@ -202,12 +215,12 @@ testcase i_us2_pres1
     hTypeKeys "<Escape>"
     sleep (1)
 
-    printlog "Insert new slide."
     kontext "Slides"
     printlog "get to the last slide."
-    SlidesControl.TypeKeys "<PAGEDOWN>", 15
+    SlidesControl.TypeKeys "<PAGEDOWN>", 3
+    printlog "Insert 4th slide."
     SlidesControl.TypeKeys "<RETURN>"
-    printlog "Delete the two fields the stylist has."
+    printlog "Delete everything on the page."
     kontext "DocumentImpress"
     gMouseClick 1,1
     EditSelectAll
@@ -220,22 +233,25 @@ testcase i_us2_pres1
     Oeffnen.Click
     gMouseClick 1,1
     printlog "Add a text above the picture. 'There is movement..."
-    call hTextrahmenErstellen ("There is movement...",20,20,70,30)
+    call hTextrahmenErstellen ("There is movement...",20,40,70,30)
 
     printlog "Add a new slide."
     InsertSlide
-    printlog "   Inserted new slide."
+    printlog "Inserted new slide."
     kontext "DocumentImpress"
     printlog "Bla bla about everything..."
-    call hTextrahmenErstellen ("Bla bla about everything...",20,20,70,30)
+    DocumentImpress.TypeKeys "<TAB>"
+    DocumentImpress.TypeKeys "Bla bla about everything..."
+    DocumentImpress.TypeKeys "<ESCAPE>",2
 
     printlog "Add a new slide."
     InsertSlide
     printlog "   Inserted new slide."
     kontext "DocumentImpress"
     printlog "Write text:  Q & A"
-    call hTextrahmenErstellen ("Q & A",20,20,70,30)
-    DocumentImpress.TypeKeys "<SHIFT HOME>"
+    DocumentImpress.TypeKeys "<TAB>"
+    DocumentImpress.TypeKeys "Q & A"
+    DocumentImpress.TypeKeys "<ESCAPE>",2
     sleep (1)
 
     printlog "Add a new slide."
@@ -243,11 +259,13 @@ testcase i_us2_pres1
     kontext "DocumentImpress"
 
     printlog "Thanks for listening, time for coffee... (ending)"
-    call hTextrahmenErstellen ("Class dismissed...",20,20,70,30)
+    DocumentImpress.TypeKeys "<TAB>"
+    DocumentImpress.TypeKeys "Class dismissed..."
+    DocumentImpress.TypeKeys "<ESCAPE>",2
 
     printlog "Save Document"
     call hFileSaveAsKill (PresentationFile1)
-    printlog "OK   saved at ", PresentationFile1
+    printlog "OK, saved at ", PresentationFile1
     sleep (1)
 
     printlog "Close Document"
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 599f89abe4f1..ea0d1ff3af2d 100644
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -31,20 +31,36 @@
 '*
 '\********************************************************************
 
-testcase i_us_presentation1
+testcase i_us_presentation
 
-    dim iPictures as integer
-    dim PresentationFile1 as string
+    dim iPictures as integer 'variable for the number of the used picture gallery theme
+    dim iAnimations as Integer 'variable used for the number of the used animation gallery theme
+    dim iSize as integer 'step variable
+    dim sFileName as string 'name for ppt export file
+    dim iKeyStroke as integer 'counter variable for hitting space in running presentation
+    dim PresentationFile as string 'variable for the file name
 
-    PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" )
 
-    printlog "New impress document"
+    PresentationFile = ConvertPath( gOfficePath + "user\work\PowerPres1.odp" )
+    printlog "Setting up an impress document in several steps..."
+    printlog "1. New impress document"
     Call hNewDocument
-    Call sSelectEmptyLayout
+    Kontext "DocumentImpress"
+    printlog "Selecting layout: Centered Text"
+    DocumentImpress.UseMenu
+    hMenuSelectNr (5)
+    hMenuSelectNr (13)
+    printlog "Changing focus to TaskPane."
+    sleep 1
+    Kontext "Tasks"
+    printlog "to get to the very first position"
+    LayoutsPreview.TypeKeys "<HOME>"
+    printlog "'to get to the right position"
+    LayoutsPreview.TypeKeys "<RIGHT>", 5
+    LayoutsPreview.TypeKeys "<RETURN>"
     WaitSlot (2000)
     kontext "DocumentImpress"
-
-    printlog "Add second Master-Page "
+    printlog "Add a second Master-Page "
     ViewMasterPage
     kontext "Slides"
     SlidesControl.OpenContextMenu(true)
@@ -56,6 +72,7 @@ testcase i_us_presentation1
 
     printlog "set background to picture(Gallery)"
     Kontext "Gallery"
+
     if Gallery.Exists(2) then
         warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency."
         sleep (2)
@@ -110,20 +127,22 @@ testcase i_us_presentation1
     MenuSelect 27353
     sleep (2)
     Kontext "ExportierenDlg"
+
     if ExportierenDlg.IsVisible(5) then
         printlog "Gallery-object correctly copied into Slide."
         ExportierenDlg.Close
         WaitSlot (2000)
     end if
+
     kontext "GraphicObjectbar"
+
     if GraphicObjectbar.Exists(5) = FALSE then
         kontext "DocumentImpress"
         ViewToolbarsPicture
     end if
 
-    kontext "Gallery"
-    Gallerys.Select (iPictures)
-    printlog " 50% Transparency"
+    kontext "GraphicObjectbar"
+    printlog "50% Transparency"
     WaitSlot (2000)
     kontext "GraphicObjectbar"
     Transparenz.SetText "50"
@@ -139,9 +158,10 @@ testcase i_us_presentation1
         Height.SetText "16"
         Mosaic.OK
     else
-        warnlog( "Dialog <Mosaic> did not open" )
+        warnlog "Dialog did not came up."
     endif
     kontext "GraphicFilterBar"
+    printlog "Closing dialog and Gallery."
     GraphicFilterBar.Close
     ToolsGallery
     WaitSlot (1000)
@@ -149,13 +169,12 @@ testcase i_us_presentation1
     gMouseClick 50,50
     sleep (1)
     FormatPositionAndSize
-
     kontext
     if ( Active.exists( 2 ) ) then
         active.setPage(TabPositionAndSize)
         kontext "TabPositionAndSize"
-        Width.SetText "15"
-        Height.SetText "11"
+        Width.SetText "28"
+        Height.SetText "21"
         SizePosition.TypeKeys "<RIGHT><DOWN>"
         TabPositionAndSize.OK
     else
@@ -164,31 +183,26 @@ testcase i_us_presentation1
 
     printlog "Close Master"
     hUseAsyncSlot( "ViewNormal" )
-
+    kontext "DocumentImpress"
+    printlog "Inserting title on first slide."
+    DocumentImpress.TypeKeys "<TAB>"
+    DocumentImpress.TypeKeys "<RETURN>"
+    DocumentImpress.TypeKeys "WELCOME!"
+    DocumentImpress.TypeKeys "<ESCAPE>", 2
+    sleep 1
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile1)
-
+    call hFileSaveAsKill (PresentationFile)
     ActiveDeactivateCTLSupport (FALSE)
-
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation1
-
-'-------------------------------------------------------------------------------
+    printlog "-------------------------------------------------------------------------------"
 
-testcase i_us_presentation2
-
-    dim PresentationFile1 as string
-    dim PresentationFile2 as string
-
-    PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" )
-    PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" )
-
-     if ( FileExists( PresentationFile1 ) ) then 'if file exists...
-        hFileOpen (PresentationFile1)
+    printlog "2. Loading file again..."
+    if ( FileExists(PresentationFile) ) then 'if file exists...
+        hFileOpen (PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
     sleep (2)
@@ -197,55 +211,46 @@ testcase i_us_presentation2
     SlidesControl.TypeKeys( "<PAGEDOWN>", 3 )
     SlidesControl.TypeKeys "<SHIFT F10>"   'OpenContextMenu(true)
     sleep (1)
-
     MenuSelect(MenuGetItemID(1)) 'New Slide  'No 2
-    printlog "   Inserted second normal Slide"
-    call sSelectEmptyLayout
-    printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif"
+    printlog "Inserted second normal Slide"
+    printlog "Select 4th Layout: Title and 2 Content blocks"
     Kontext "Tasks"
     printlog "to get to the very first position"
     LayoutsPreview.TypeKeys "<HOME>"
     printlog "'to get to the right position"
-    LayoutsPreview.TypeKeys "<RIGHT>", 9
+    LayoutsPreview.TypeKeys "<RIGHT>", 3
     LayoutsPreview.TypeKeys "<RETURN>"
-
     hUseAsyncSlot( "ViewNormal" )
-
-    printlog "3. Hide Slidepane (Oops! The user were too fast: accidently hide the pane)"
+    printlog "Hide Slidepane (Oops! The user were too fast: accidently hide the pane)"
     kontext "Slides"
     SlidesControl.FadeOut
     WaitSlot (1000)
-
-    printlog "4. Restore Pane."
+    printlog "Restore Pane."
     SlidesControl.FadeIn
-
-    printlog "   Did the 'mistake' to FadeIn/Out the Slidepane"
-
-InsertGraphicsFromFile
-Kontext "GrafikEinfuegenDlg"
-if GrafikEinfuegenDlg.exists(5) then
-printlog "   The Insertgraphics-dialogue showed up correctly."
-sleep (5)
-else
-warnlog "   The Insertgraphics-dialogue didn't show up."
-endif
+    printlog "Did the 'mistake' to FadeIn/Out the Slidepane"
+    InsertGraphicsFromFile
+    Kontext "GrafikEinfuegenDlg"
+    if GrafikEinfuegenDlg.exists(5) then
+    printlog "   The Insertgraphics-dialogue showed up correctly."
+    sleep (5)
+    else
+    warnlog "   The Insertgraphics-dialogue didn't show up."
+    endif
 
     printlog "Graphics-Import-dialogue. Select i_us_large.jpg"
     Kontext "GrafikEinfuegenDlg"
-    if ( GrafikEinfuegenDlg.exists( 2 ) ) then
 
+    if ( GrafikEinfuegenDlg.exists( 2 ) ) then
         Dateiname.SetText ConvertPath (gTesttoolPath + "graphics\required\input\i_us_large.jpg")
         Oeffnen.Click
-
         Kontext "DocumentImpress"
         printlog "Deselect graphic"
-        DocumentImpress.MouseDoubleClick 90,90
-        printlog "   Inserted Graphic into the second Slide"
-
+        DocumentImpress.TypeKeys "<ESCAPE>"
+        printlog "Inserted Graphic into the second Slide"
         printlog "Change text on the two text-boxes"
         DocumentImpress.TypeKeys "<TAB>" 'First text.
         DocumentImpress.TypeKeys "<RETURN>" 'To get into edit-mode.
-        DocumentImpress.TypeKeys "The World has just become a bit easier"
+        DocumentImpress.TypeKeys "The World has just become easier now.."
         DocumentImpress.TypeKeys "<ESCAPE><ESCAPE>"
         DocumentImpress.TypeKeys "<TAB><TAB><TAB>"
         DocumentImpress.TypeKeys "<RETURN>"
@@ -253,9 +258,9 @@ endif
         DocumentImpress.TypeKeys "<RETURN>"
         DocumentImpress.TypeKeys "Very durable"
         DocumentImpress.TypeKeys "<RETURN>"
-        DocumentImpress.TypeKeys "Priced lower than its predecessor!"
+        DocumentImpress.TypeKeys "Priced lower!"
         DocumentImpress.TypeKeys "<RETURN>"
-        DocumentImpress.TypeKeys "Sexy"
+        DocumentImpress.TypeKeys "Astonishing!"
         DocumentImpress.TypeKeys "<RETURN>"
         DocumentImpress.TypeKeys "Energy-efficient"
         DocumentImpress.TypeKeys "<ESCAPE><ESCAPE>"
@@ -264,52 +269,36 @@ endif
     endif
 
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile2)
-
-    ActiveDeactivateCTLSupport (FALSE)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation2
-
-'-------------------------------------------------------------------------------
+    printlog "-------------------------------------------------------------------------------"
 
-testcase i_us_presentation3
-
-    dim PresentationFile2 as string
-    dim PresentationFile3 as string
-
-    PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" )
-    PresentationFile3 = ConvertPath( gOfficePath + "user\work\PowerPes3.odp" )
-
-    if ( FileExists( PresentationFile2 ) ) then 'if file exists...
-        hFileOpen( PresentationFile2 )
+    printlog "3. Loading file again.."
+    if ( FileExists(PresentationFile) ) then 'if file exists...
+        hFileOpen(PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
 
-    printlog "Insert New Slide"
+    printlog "Insert New Slide, 3rd one"
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 3 )
-
     kontext "DocumentImpress"
-    InsertSlide 'No 3
-
-    printlog "5. Layout. Clip/Text"
+    InsertSlide 
+    printlog "5. Layout. Title only"
     kontext "Tasks"
     LayoutsPreview.TypeKeys "<HOME>"     'to get to the very first position
     LayoutsPreview.TypeKeys "<RIGHT>", 4 'to get to the right position
     LayoutsPreview.TypeKeys "<RETURN>"
-
     hUseAsyncSlot( "ViewNormal" )
-
     kontext "DocumentImpress"
     Call gMouseClick 50,50
     DocumentImpress.TypeKeys "<TAB><RETURN>"
     DocumentImpress.TypeKeys "A new form"
-
+    DocumentImpress.TypeKeys "<ESCAPE>", 2
     printlog "6. (Fat picture) InsertPictureFromFile: (empty slide) (ev size-fit)"
     printlog "insert graphic file (i_us_large.jpg)"
     InsertGraphicsFromFile
@@ -320,39 +309,21 @@ testcase i_us_presentation3
     Oeffnen.Click
     WaitSlot (2000)
     Kontext "DocumentImpress"
-
     printlog "The user corrects the picture"
     DocumentImpress.MouseDown 50,50
     DocumentImpress.MouseUp 50,50
     DocumentImpress.TypeKeys "<DOWN>", 30
-
     printlog "Deselect graphic"
     DocumentImpress.MouseDoubleClick 90,90
-
-    printlog "   Wrote Text, Inserted Graphic, and moved it in the third Slide"
-
+    printlog "Wrote Text, Inserted Graphic, and moved it in the third Slide"
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile3)
-
-    ActiveDeactivateCTLSupport (FALSE)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation3
-
-'-------------------------------------------------------------------------------
-
-testcase i_us_presentation4
-
-    dim PresentationFile3 as string
-    dim PresentationFile4 as string
-    dim iAnimations as Integer
-    dim iSize as integer
-
-    PresentationFile3 = ConvertPath( gOfficePath + "user\work\PowerPes3.odp" )
-    PresentationFile4 = ConvertPath( gOfficePath + "user\work\PowerPes4.odp" )
+    printlog "-------------------------------------------------------------------------------"
 
+    printlog "4. reopening file..."
     select case iSprache
     case 01   : iAnimations = 01 'English
     case 07   : iAnimations = 01 'Russian
@@ -373,167 +344,126 @@ testcase i_us_presentation4
         warnlog "Please insert the entrienumbers for 'Backgrounds'. Language: " + iSprache
     end select
 
-    if ( FileExists( PresentationFile3 ) ) then 'if file exists...
-        hFileOpen( PresentationFile3 )
+    if ( FileExists(PresentationFile) ) then 'if file exists...
+        hFileOpen( PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
 
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 5 )
-
     kontext "DocumentImpress"
     printlog "insert slide no 4"
     hUseAsyncSlot( "InsertSlide" )
-
     printlog "Background: picture (Gallery)"
     Kontext "Gallery"
+
     if ( Not Gallery.Exists() ) then
         ToolsGallery
     end if
 
     kontext "Gallery"
+
     if ( Gallery.exists( 2 ) ) then
         Gallerys.Select (iAnimations)
 
         kontext "Gallery"
         View.TypeKeys "<HOME><RIGHT><RIGHT>"
-        wait( 200 )
+        sleep 1
         View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-        wait( 200 )
+        sleep 1
         MenuSelect(MenuGetItemID(1))   'Insert
-        wait( 200 )
+        sleep 1
         MenuSelect(MenuGetItemID(1))   'Copy
     else
         warnlog( "Could not access Gallery" )
     endif
 
-    printlog "Check that we really got a copy of the object"
+    sleep 1
     kontext "DocumentImpress"
-    DocumentImpress.OpenContextMenu(true)
-    WaitSlot (1000)
-    MenuSelect 27353
-
-    Kontext "ExportierenDlg"
-    if ( ExportierenDlg.exists( 5 ) ) then
-        printlog "   Gallery-object correctly copied into Slide."
-        ExportierenDlg.Close
-    else
-        warnlog "   Doesn't seem like we copied anything from the Gallery... ?"
-    end if
-
-    kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<UP>", 82
-    DocumentImpress.TypeKeys "<LEFT>", 130
-
+    DocumentImpress.TypeKeys "<UP>", 75
+    DocumentImpress.TypeKeys "<LEFT>", 100
     printlog "Deselect graphic"
     DocumentImpress.MouseDoubleClick 90,90
-
     printlog "Close the Gallery"
     ToolsGallery
-
     printlog "Change Text on slide"
     DocumentImpress.TypeKeys "<TAB>"
     DocumentImpress.TypeKeys "<RETURN>"
-    DocumentImpress.TypeKeys "The process starts to flourish"
+    DocumentImpress.TypeKeys "The process starts here.."
     DocumentImpress.TypeKeys "<ESCAPE><ESCAPE>"
     gMouseClick 50,50
-
-    ActiveDeactivateCTLSupport (TRUE)
-
     printlog( "Decrease..." )
-    for iSize = 100 to 25 step -25
+
+    for iSize = 80 to 20 step -20
         CreateTextSetEffectAndAngle
-        DocumentImpress.TypeKeys "<DOWN>", 80
+        DocumentImpress.TypeKeys "<DOWN>", 70
         DocumentImpress.TypeKeys "<LEFT>", iSize
         gMouseClick 90,90
     next iSize
 
     printlog( "Increase..." )
-    for iSize = 25 to 100 step 25
+
+    for iSize = 20 to 80 step 20
         CreateTextSetEffectAndAngle
-        DocumentImpress.TypeKeys "<DOWN>", 80
-        DocumentImpress.TypeKeys "<LEFT>", iSize
+        DocumentImpress.TypeKeys "<DOWN>", 70
+        DocumentImpress.TypeKeys "<RIGHT>", iSize
         gMouseClick 90,90
     next iSize
 
-    printlog "   Inserted fourth slide with Gallery-object."
-
+    printlog "Inserted fourth slide with Gallery-object."
+    printlog "Switching back task pane to default..."
+    Kontext "DocumentImpress"
+    DocumentImpress.UseMenu
+    hMenuSelectNr (5)
+    hMenuSelectNr (13)
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile4)
-
-    ActiveDeactivateCTLSupport (FALSE)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation4
+    printlog "-------------------------------------------------------------------------------"
 
-'-------------------------------------------------------------------------------
-
-testcase i_us_presentation5
-
-    dim PresentationFile4 as string
-    dim PresentationFile5 as string
-
-    PresentationFile4 = ConvertPath( gOfficePath + "user\work\PowerPes4.odp" )
-    PresentationFile5 = ConvertPath( gOfficePath + "user\work\PowerPes5.odp" )
-
-    if ( FileExists( PresentationFile4 ) ) then 'if file exists...
-        hFileOpen( PresentationFile4 )
+    printlog "5. reloading file..."
+    if ( FileExists(PresentationFile) ) then
+        hFileOpen(PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
 
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 7 )
-
     kontext "DocumentImpress"
-    printlog "8. New Slide. (Insert Menu) (Duplicate slide)"
-    InsertDuplicateSlide 'No 5
+    printlog "New Slide. (Insert Menu) (Duplicate slide)"
+    InsertDuplicateSlide 
     printlog "Change the text in some way. (the user is making a joke with the audience)"
     gMouseClick 90,90
     DocumentImpress.TypeKeys "<TAB>"
     DocumentImpress.TypeKeys "<RETURN>"
     hUseAsyncSlot( "EditSelectAll" )
     DocumentImpress.TypeKeys "And does it with strength..."
-
-    printlog "   Inserted fifth slide with audience-joke."
-
+    printlog "Inserted fifth slide with audience-joke."
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile5)
-
-    ActiveDeactivateCTLSupport (FALSE)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation5
-
-'-------------------------------------------------------------------------------
-
-testcase i_us_presentation6
-
-    dim PresentationFile5 as string
-    dim PresentationFile6 as string
+    printlog "-------------------------------------------------------------------------------"
 
-    PresentationFile5 = ConvertPath( gOfficePath + "user\work\PowerPes5.odp" )
-    PresentationFile6 = ConvertPath( gOfficePath + "user\work\PowerPes6.odp" )
-
-    if ( FileExists( PresentationFile5 ) ) then 'if file exists...
-        hFileOpen( PresentationFile5 )
+    printlog "6. reloading file..."
+    if ( FileExists(PresentationFile) ) then 'if file exists...
+        hFileOpen(PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
 
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 6 )
-
     kontext "DocumentImpress"
-    printlog "9. Q&A Slide"
+    printlog "Q&A Slide"
     InsertSlide
     WaitSlot (1000)
     kontext "DocumentImpress"
@@ -542,15 +472,15 @@ testcase i_us_presentation6
     DocumentImpress.TypeKeys "Q&A"
     DocumentImpress.TypeKeys "<SHIFT HOME>"
     wait( 500 )
-
     Kontext "TextObjectbar"
+
     if ( not TextObjectbar.Exists() ) then
         ViewToolbarsTextFormatting
     end if
 
     Kontext "TextObjectbar"
     wait( 500 )
-    Printlog "- Change size of font"
+    Printlog "Change size of font"
     Schriftgroesse.Select "26"
     Schriftgroesse.TypeKeys "<RETURN>"
     Fett.Click
@@ -560,77 +490,59 @@ testcase i_us_presentation6
     Auswahl.Click
     gMouseClick 60,60
     hUseAsyncSlot( "EditSelectAll" )
-
     DocumentImpress.TypeKeys "<DOWN>", 50
     kontext "DocumentImpress"
-    printlog "   Inserted sixth slide with Q&A."
-
+    printlog "Inserted sixth slide with Q&A."
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile6)
-
-    ActiveDeactivateCTLSupport (FALSE)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog "Close Document"
     hFileCloseAll()
 
-endcase 'i_us_presentation6
-
-'-------------------------------------------------------------------------------
-
-testcase i_us_presentation7
-
-    const KEY_STROKE_REPEAT = 8
+    printlog "-------------------------------------------------------------------------------"
 
-    dim sFilter as string
-    dim sFileName as string
-    dim PresentationFile6 as string
-    dim PresentationFile7 as string
-    dim iKeyStroke as integer
+    printlog "7. reloading file..."
+    sFileName = ConvertPath( gOfficePath + "user\work\export-test.ppt" )
 
-    PresentationFile6 = ConvertPath( gOfficePath + "user\work\PowerPes6.odp" )
-    PresentationFile7 = ConvertPath( gOfficePath + "user\work\PowerPes7.odp" )
-    sFileName         = ConvertPath( gOfficePath + "user\work\export-test.ppt" )
-
-    if ( FileExists( PresentationFile6 ) ) then 'if file exists...
-        hFileOpen( PresentationFile6 )
+    if ( FileExists(PresentationFile) ) then 'if file exists...
+        hFileOpen(PresentationFile)
     else
-        warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
+        warnlog "Testdoc is missing or did not get saved."
         goto endsub
     end if
 
     kontext "slides"
-    SlidesControl.TypeKeys( "<PAGEDOWN>", KEY_STROKE_REPEAT )
-
+    SlidesControl.TypeKeys( "<PAGEDOWN>",7)
     kontext "DocumentImpress"
-    printlog " inserting Ending Slide"
+    printlog "inserting Ending Slide"
     InsertSlide 'No 7
-    DocumentImpress.TypeKeys "Ende"
-    printlog "   Inserted ending -slide."
-
+    DocumentImpress.TypeKeys "End"
+    printlog "Inserted ending -slide."
     Kontext "Gallery"
+
     if Gallery.Exists(2) then
-        warnlog "   The Gallery was visible. Closed it. Check earlier ran tests for inconsistency."
+        warnlog "The Gallery was visible. Closed it. Check earlier ran tests for inconsistency."
         ToolsGallery
         WaitSlot (2000)
     end if
 
     kontext "slides"
-    for i = 1 to 7
+
+    for i = 1 to 8
         sleep 1
         SlidesControl.TypeKeys "<PAGEUP>"
     next i
-    SlidesControl.TypeKeys "<RETURN>" 'At the first slide
 
     hTypeKeys "<F5>"
-
     kontext "DocumentPresentation"
-    for iKeyStroke = 1 to KEY_STROKE_REPEAT
+
+    for iKeyStroke = 1 to 8
         wait( 3000 )
         DocumentPresentation.TypeKeys "<PAGEDOWN>"
         wait( 2000 )
     next iKeyStroke
 
     kontext "DocumentPresentation"
+
     if ( DocumentPresentation.notExists( 5 ) ) then
         printlog( "Presentation closed. Good." )
     else
@@ -647,17 +559,15 @@ testcase i_us_presentation7
 
     kontext "DocumentImpress"
     printlog "Save Document"
-    call hFileSaveAsKill (PresentationFile7)
-
+    call hFileSaveAsKill (PresentationFile)
     printlog( "Save as Powerpoint-file (Using filter at pos. 5 in the filter list)" )
     FileSaveAs
-
     Kontext "SpeichernDlg"
-    if ( SpeichernDlg.exists( 2 ) ) then
 
+    if ( SpeichernDlg.exists( 2 ) ) then
         Dateiname.SetText sFileName
         Dateityp.Select 5  ' Powerpoint (possibly)
-        printlog "Trying to save with filter: " + Dateityp.GetSelText + sFilter(5)
+        printlog "Trying to save with filter: " + Dateityp.GetSelText
         Speichern.Click
 
         Kontext "Messagebox"
@@ -671,15 +581,11 @@ testcase i_us_presentation7
 
     printlog "Close all open documents"
     hFileCloseAll()
-
     printlog( "Reload file: " & sFileName )
     hFileOpen sFileName
     sleep( 3 )
-
     printlog "Close the office-session"
-    ActiveDeactivateCTLSupport (FALSE)
-
     printlog "Close Documents"
     hFileCloseAll()
 
-endcase 'i_us_presentation7
+endcase 'i_us_presentation
\ No newline at end of file
diff --git a/testautomation/graphics/optional/includes/impress/im_002_.inc b/testautomation/graphics/optional/includes/impress/im_002_.inc
deleted file mode 100644
index d1fa457ae8b2..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_002_.inc
+++ /dev/null
@@ -1,52 +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 Required Test Library (2)
-'*
-'\*****************************************************************
-
-testcase tiEditDeleteSlide
-'/// open application ///'
-   Call hNewDocument
-'/// Insert->Slide; press 'OK' ///'
-   InsertSlide
-   sleep 2
-   hTypekeys "<Pagedown>"
-   sleep 2
-'/// Edit->Delete Slide ///'
-   try
-      EditDeleteSlide
-   catch
-      warnlog "Error when deleting slide"
-   endcatch
-   Call hCloseDocument
-'/// close application ///'
-endcase
-
-
diff --git a/testautomation/graphics/optional/includes/impress/im_003_.inc b/testautomation/graphics/optional/includes/impress/im_003_.inc
deleted file mode 100644
index 1db0627e4a4e..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_003_.inc
+++ /dev/null
@@ -1,254 +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 Resource Test: View Menu
-'*
-'***********************************************************************************
-' #1 tiViewPanes
-' #1 tiViewMasterView
-' #1 tiViewSlideMaster
-' #1 tiViewToolbar_1
-'\**********************************************************************************
-
-testcase tiViewPanes
-    goto endsub 'TODO WG, tiViewPanes outcommented due to reconstruction of test
-    dim bState as boolean
-    '/// open application ///'
-    Call hCloseDocument
-    Call hNewDocument
-    sleep 1
-    kontext "Tasks"
-    if (NOT Tasks.exists) then
-        warnlog "Tasks Panel not visible on opening application. Opening now."
-        ViewTaskPane
-    endif
-    kontext "Slides"
-    if (NOT Slides.exists) then
-        warnlog "Slides Panel not visible on opening application. Opening now."
-        ViewTaskSlide
-    endif
-    kontext "Tasks"
-    '/// Deactivate all but "masterpages" ///'
-    View.OpenMenu
-    hMenuSelectNr (2)
-    View.OpenMenu
-    hMenuSelectNr (3)
-    View.OpenMenu
-    hMenuSelectNr (4)
-
-    sleep 1
-
-    Tasks.TypeKeys ("<RIGHT><RIGHT><RIGHT>")
-
-    try
-        kontext "recentlyUsed"
-        printlog "Toggeling Master Pages now with <space>"
-        kontext "MasterPages"
-        MasterPages.typeKeys "<space>"
-        kontext "recentlyUsed"
-        if (recentlyUsed.IsVisible = FALSE) then   'exists = FALSE) then
-            warnlog "View-menu didn't work"
-        endif
-        kontext "Tasks"
-        sleep 1
-        '/// View->Task Pane ///'
-        ViewTaskPane
-        sleep 1
-        if (Tasks.exists) then
-            warnlog "View->Task Panel failed"
-            ViewTaskPane
-        endif
-        '/// View->Task Pane ///'
-        ViewTaskPane
-        sleep 1
-        if (NOT Tasks.exists) then
-            warnlog "View->Task Panel failed"
-            ViewTaskPane
-        endif
-    catch
-        warnlog "View->Task Pane couldn't get executed"
-    endcatch
-    kontext "Slides"
-    try
-        ViewTaskSlide
-        if (Slides.exists) then
-            warnlog "View->Slide Panel failed."
-            ViewTaskSlide
-        endif
-        '/// View->Slide Pane ///'
-        ViewTaskSlide
-        sleep 1
-        if (NOT Slides.exists) then
-            warnlog "View->Slide Panel failed."
-            ViewTaskSlide
-        endif
-    catch
-        warnlog "View->Slide Pane couldn't get executed"
-    endcatch
-
-    '/// Reactivate all pages in the Task-panel ///'
-    kontext "Tasks"
-    View.OpenMenu
-    hMenuSelectNr (2)
-    View.OpenMenu
-    hMenuSelectNr (3)
-    View.OpenMenu
-    hMenuSelectNr (4)
-endcase
-
-testcase tiViewMasterView
-'/// open application ///'
-   Call hNewDocument
-'/// View->Master View->Drawing View ///'
-   sleep 1
-   ViewWorkspaceDrawingView
-'     Kontext "DocumentImpress"
-'     gMouseClick 70,70
-     sleep 5
-'/// View->Master View->Outline View ///'
-   ViewWorkspaceOutlineView
-'     Kontext "DocumentImpressOutlineView"
-'     DocumentImpressOutlineView.MouseDown 70,70
-'     DocumentImpressOutlineView.MouseUp 70,70
-     sleep 1
-'/// View->Master View->Slides View ///'
-   ViewWorkspaceSlidesView
-'     Kontext "DocumentImpressSlideView"
-'     DocumentImpressSlideView.MouseDown 70,70
-'     DocumentImpressSlideView.MouseUp 70,70
-     sleep 1
-'/// View->Master View->Notes View ///'
-   ViewWorkspaceNotesView
-      sleep 1
-'/// View->Master View->Handout View ///'
-   ViewWorkspaceHandoutView
-      sleep 1
-'/// View->Master View->Drawing View ///'
-   ViewWorkspaceDrawingView
-'/// close application ///'
-      sleep 1
-   Call hCloseDocument
-endcase
-
-testcase tiViewSlideMaster
-'/// open application with : File->Autopilot->Presentation; OK; OK ///'
-'   Call  hNewDocument
-      FileAutopilotPresentation                ' to get a title :-)
-      sleep 2
-      Kontext "AutopilotPraesentation1"
-      AutopilotPraesentation1.Ok
-      sleep 1
-      Kontext "Seitenlayout"  ' aka: Modify Slide
-      if Seitenlayout.exists(5) then
-           warnlog "Slidelayout has to vanish; moved to sidebar"
-           Seitenlayout.OK
-      endif
-   kontext "DocumentImpress"
-   sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Drawing ///'
-   ViewDrawing
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Title ///'
-   try
-      ViewTitle
-      Errorlog "View - Master - Title Slide Master should NOT be accessable"
-   catch
-      printlog "View - Master - Title Slide Master not accessable - good"
-   endcatch
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// View->Master->Handout ///'
-   ViewHandout
-   Sleep 1
-'   ViewSlide
-   Sleep 1
-'/// View->Master->Notes ///'
-   ViewNotes
-   kontext "DocumentImpress"
-   Sleep 1
-'/// View->Slide ///'
-   ViewSlide
-   Sleep 1
-'/// close application ///'
-   Call  hCloseDocument
-endcase
-
-testcase tiViewToolbar_1
-  Dim Zaehler as integer
-  Dim i as integer
-
-'/// open application ///'
- Call hNewDocument
-  sleep 2
-'/// Insert->Graphic... : "global\input\graf_inp\desp.bmp" ///'
-  InsertGraphicsFromFile
-  sleep 2
-   Kontext "GrafikEinfuegenDlg"
-   sleep 1
-   Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 1
-   Oeffnen.Click
-   sleep 3
-   Kontext "Messagebox"
-    if Messagebox.Exists then
-      Warnlog Messagebox.GetText
-      Messagebox.OK
-    end if
-   Kontext "DocumentImpress"
-'/// select graphic ///'
-   EditSelectAll
-   sleep 2
-   Kontext "GraphicObjectbar"
-    sleep 1
-'/// The Graphics Toolbar has to be visible now; If not -> ERROR ///'
-    if GraphicObjectbar.Exists Then
-       Printlog "- graphic object toolbar exists"
-       Zaehler=Grafikmodus.GetItemCount
-       for i = 1 to Zaehler
-           Printlog "- access all controls in the toolbar (" +i+"/"+Zaehler+")"
-           Grafikmodus.Select i
-           sleep 3
-       next i
-       sleep 3
-    else
-       Warnlog "- No graphic function toolbar visible"
-    end if
-'/// close application ///'
-  Call hCloseDocument
-endcase
-
-
diff --git a/testautomation/graphics/optional/includes/impress/im_004_.inc b/testautomation/graphics/optional/includes/impress/im_004_.inc
deleted file mode 100644
index 17d00addc847..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_004_.inc
+++ /dev/null
@@ -1,58 +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 Required Test Library (4)
-'*
-'\*****************************************************************
-
-testcase tiInsertSlideExpandSummary
-
-'/// open application ///'
-   Call hNewDocument
-   ' presupposition
-'/// View->Master View->Outline View ///'
-      ViewWorkspaceOutlineView
-      Sleep 1
-      Kontext "DocumentImpressOutlineView"
-'/// Type 2 rows ///'
-      DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi"
-'/// View->Master View->Drawing View ///'
-      ViewWorkspaceDrawingView
-      Sleep 1
-   ' test menue entries
-'/// Insert->Summery Slide ///'
-   InsertSummerySlide
-   Sleep 1
-'/// Insert->Expand Slide ///'
-   InsertExpandSlide
-   Sleep 2
-'/// close application ///'
-   Call  hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/optional/includes/impress/im_005_.inc b/testautomation/graphics/optional/includes/impress/im_005_.inc
deleted file mode 100644
index 1aa218f3ecba..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_005_.inc
+++ /dev/null
@@ -1,50 +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 Required Test Library (5)
-'*
-'\*****************************************************************
-
-testcase tiFormatModifyLayout
-
-'/// open application ///'
-   Call  hNewDocument
-'/// Impress: Format->Modify Layout ///'
-'/// Draw   : kontext menu: Slide-> Modify Slide (always disabled :-( ?///'
-   FormatPage ' 27046 SID_MODIFYPAGE
-      Kontext "SeitenLayout"
-      DialogTest ( SeitenLayout )
-      sleep 1
-'/// cancel dialog 'Page Setup' ///'
-      SeitenLayout.Cancel
-'/// close application ///'
-   Call hCloseDocument
-endcase
-
-
diff --git a/testautomation/graphics/optional/includes/impress/im_007_.inc b/testautomation/graphics/optional/includes/impress/im_007_.inc
deleted file mode 100644
index fc9ba2800e0c..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_007_.inc
+++ /dev/null
@@ -1,693 +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 Required Test Library (7)
-'*
-'\*****************************************************************
-
-' this menue is only in impress availble
-testcase tSlideShowSlideShow
-    '/// open application ///'
-    Call hNewDocument
-    '/// Slide Show->Slide Show Settings ///'
-    SlideShowPresentationSettings
-    Kontext "Bildschirmpraesentation"
-    '/// check if 'type' 'default' is checked, it has to be the default !///'
-    if standard.IsChecked then
-        if LogoAnzeigen.isEnabled then
-            Warnlog "'Show Logo' is Enabled :-("
-        endif
-    else
-        Warnlog "type 'default' is not checked as default :-("
-    endif
-    '/// check checkbox 'Window' ///'
-    Fenster.Check
-    Printlog "-  Presentation in window mode is checked"
-    '/// close dialog with OK 'Slide Show' ///'
-    Bildschirmpraesentation.Ok
-    sleep 3
-    '/// Slide Show->Slide Show ///'
-    SlideShowSlideshow
-    Sleep 5
-    try
-        Kontext "DocumentPresentation"
-        sleep 3
-        '/// Press <Esc> to leave presentation mode ///'
-        DocumentPresentation.Typekeys ("<Escape>")
-        Sleep 3
-        Kontext "DocumentImpress"
-        DocumentImpress.MouseDoubleClick ( 50, 50 )
-        Sleep 3
-    catch
-        '       FileClose
-        warnlog "had to catch <the ball> :-( "
-        '   	 Kontext "Messagebox"
-        '       if Messagebox.Exists (5) Then Messagebox.No
-        '       Kontext
-        '       sleep (12)
-        '       start sAppExe$
-        '       sleep (6)
-        '       Kontext
-        '       if Office.Exists(2) then Resetapplication
-        '       Warnlog "Slide didn't end, application wasn't in document edit mode"
-    endcatch
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowRehearseTimings
-    goto endsub
-    '/// open application ///'
-    Call hNewDocument
-    '/// Slide Show->Slide Show Settings ///'
-    SlideShowPresentationSettings
-    Kontext "Bildschirmpraesentation"
-    '/// check checkbox 'Window' ///'
-    Fenster.Check
-    '/// close dialog with OK 'Slide Show' ///'
-    Bildschirmpraesentation.Ok
-    '/// Slide Show->Rehearse Timings ///'
-    SlideShowRehearseTimings
-    sleep 2
-    Kontext "DocumentPresentation"
-    '/// Press <Esc> to leave presentation mode ///'
-    if DocumentPresentation.Exists (5) then
-        DocumentPresentation.Typekeys ("<Escape>")
-    else
-        Warnlog "SlideShowRehearseTimings mode not accessible"
-    endif
-    Sleep 3
-    if DocumentPresentation.Exists then ' the kontext hasnt to be available, else ERROR
-        DocumentPresentation.TypeKeys "<ESCAPE>" ' => I mustn't be here ever !
-        Warnlog "- Slide show mode should have ended"
-    else
-        printlog "SlideShowRehearseTimings mode not accessible :-) "
-    end if
-    sleep 3
-    try
-        Kontext "DocumentImpress"
-        DocumentImpress.MouseDoubleClick ( 50, 50 )
-
-        sleep 3
-    catch
-        warnlog "Had to catch <the ball> :-( "
-    endcatch
-    sleep 3
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowSlideShowSettings
-    '/// open application ///'
-    Call hNewDocument
-    sleep 2
-    '/// Slide Show->Slide Show Settings ///'
-    SlideShowPresentationSettings
-    Kontext "Bildschirmpraesentation"
-    call Dialogtest (Bildschirmpraesentation)
-    '/// check checkbox in section 'Range' - 'From: ///'
-    AbDia.Check
-    '/// select the 3rd item from the top from listbox 'From:' ///'
-    AbDiaName.GetSelText
-    '/// check checkbox 'All Slides' ///'
-    AlleDias.Check
-    '///'      RangeCustomSlideShow         ' gets tested in tSlideShowCustomSlideShow ///'
-    '         IndividuellePraesentationName
-    '///<b> check checkbox 'window' </b>///'
-    Fenster.Check
-    '/// check checkbox 'default' ///'
-    Standard.Check
-    '///<b> check check box 'Auto' -> implies looping of slideshow in fullscreen mode </b>///'
-    Auto.Check
-    '/// set duration of pause to '00:00:05' ///'
-    Zeit.GetText
-    '/// check check box 'Show logo' ///'
-    LogoAnzeigen.Check
-    '///<b> check checkbox 'Change slides maually' </b>///'
-    DiawechselManuel.Check
-    '///<b> check checkbox 'Mouse pointer as pen' </b>///'
-    MauszeigerAlsStift.Check
-    '///<b> UNcheck checkbox 'Mouse pointer visible' </b>///'
-    MauszeigerSichtbar.UnCheck
-    '///<b> check checkbox 'Navigator visible' </b>///'
-    NavigatorSichtbar.Check
-    '///<b> UNcheck checkbox 'animations allowed' </b>///'
-    AnimationenZulassen.UnCheck
-    '///<b> UNcheck checkbox 'Change slides by clicking on background' </b>///'
-    DiaWechselAufHintergrund.UnCheck
-    '///<b> check checkbox 'Presentation always on top' </b>///'
-    PraesentationImmerImVordergrund.Check
-    '/// cancel dialog 'Slide Show' ///'
-    Bildschirmpraesentation.Cancel
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowCustomSlideShow
-    '/// open application ///'
-    Call hNewDocument
-    sleep 2
-    '/// Slide Show->Custom Slide Show ///'
-    SlideShowCustomSlideshow
-    Kontext "IndividuellePraesentation"
-    call Dialogtest (IndividuellePraesentation)
-    '/// click button 'New' ///'
-    Neu.Click
-    Kontext "IndividuellePraesentationDefinieren"
-    Call DialogTest (IndividuellePraesentationDefinieren)
-    '/// select the first entry in the list 'Existing Slides' ///'
-    SeitenPraesentation.Select 1
-    '/// click button '>>' ///'
-    Hinzufuegen.Click
-    '/// close dialog 'Define Custom Slide Show' with OK ///'
-    IndividuellePraesentationDefinieren.OK
-    Kontext "IndividuellePraesentation"
-    '/// click button 'Copy' ///'
-    Kopieren.Click
-    '/// click button 'Delete' ///'
-    Loeschen.Click
-    '/// click button 'Edit' ///'
-    Bearbeiten.Click
-    Kontext "IndividuellePraesentationDefinieren"
-    '/// select 1st entry in the list 'Selected Slides' ///'
-    SelectedSlides.Select 1
-    '/// click button '<<' ///'
-    Entfernen.Click
-    '/// close dialog 'Define Custom Slide Show' with Cancel ///'
-    IndividuellePraesentationDefinieren.Cancel
-    Kontext "IndividuellePraesentation"
-    '/// check checkbox 'Use Custom Slide Show' ///'
-    IndividuellePraesentationBenutzen.Check
-    sleep 1
-    '///+ UNcheck checkbox 'Use Custom Slide Show' ///'
-    IndividuellePraesentationBenutzen.UnCheck
-    '/// click button 'Start...' ///'
-    Starten.Click
-    sleep 5
-    '/// press key [space] 2 times ///'
-    kontext "DocumentPresentation"
-    DocumentPresentation.TypeKeys "<space>"
-    sleep 1
-    DocumentPresentation.TypeKeys "<space>"
-    sleep 1
-    '/// close dialog 'Custom Slide Shows' ///'
-    '   IndividuellePraesentation.Close ' slide show ends dialog !
-    '/// Slide Show->Slide Show Settings ///'
-    try
-        SlideShowPresentationSettings
-    catch
-        warnlog "Presentation did not end :-("
-        DocumentPresentation.TypeKeys "<escape>"
-    endcatch
-    Kontext "Bildschirmpraesentation"
-    if Bildschirmpraesentation.exists (5) then
-        '/// check checkbox 'Custom Slide Show' ///'
-        RangeCustomSlideShow.Check
-        printlog "check: '" + IndividuellePraesentationName.GetSelText + "'"
-        '/// cancel dialog 'Slide Show' ///'
-        Bildschirmpraesentation.Cancel
-    else
-        warnlog "Dialog not open? SlideShowPresentationSettings"
-    endif
-    '/// Slide Show->Custom Slide Show ///'
-    SlideShowCustomSlideshow
-    Kontext "IndividuellePraesentation"
-    if (IndividuellePraesentation.exists (5)) then
-        '/// click button 'Delete' ///'
-        Loeschen.Click
-        '/// close dialog 'Custom Slide Shows' ///'
-        IndividuellePraesentation.Close
-    else
-        warnlog "Dialog not open? SlideShowCustomSlideshow"
-    endif
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowSlideTransition
-    goto endsub '"#149943# - Outcommented tSlideShowSlideTransition due to bug."
-    dim i as integer
-    dim a as integer
-    dim iCount as integer
-
-    '/// open application ///'
-    Call hNewDocument
-    '/// create rectangle ///'
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    sleep 1
-    '/// Slide Show->Slide Transition ///'
-    SlideShowSlideTransition
-    sleep 2
-    '/// The 'Slide Transition' in the right 'Tasks' Pane has to come up ///'
-    Kontext "Tasks"
-    '/// Select the second entry from teh Listbox 'Applay to selected slides' ///'
-    TransitionApplyToSelectedSlide.select (2)
-    sleep 5 ' takes some time, until it is run
-    Printlog "Count of effects : "+TransitionApplyToSelectedSlide.GetItemCount
-    Printlog "Count of Speeds  : "+TransitionSpeed.GetItemCount
-    iCount = TransitionSound.GetItemCount
-    Printlog "Count of Sounds  : " + iCount
-
-    '/// One Entry of the Listbox 'Sound' is 'Other sound...', select it ///'
-    TransitionSound.typeKeys "<home>"
-    i = 0
-    for a = 1 to iCount
-        TransitionSound.select (a)
-        kontext "OeffnenDlg"
-        if (OeffnenDlg.exists (5)) then
-            if (0=i) then
-                ' remember when dialog came up
-                i = a
-                OeffnenDlg.cancel
-            else
-                warnlog "File Open Dialog comes up a second time!"
-                OeffnenDlg.cancel
-            endif
-        endif
-        kontext "Tasks"
-        ' the Checkbox is disabled on teh first three entries: <No Sound>, <Stop previous sound>...
-        if (TransitionLoopUntilNextSound.isEnabled AND (a<4)) then
-            qaErrorLog "May be Language specific -> Evaluation of TBO; " + a
-        endif
-    next a
-    TransitionSound.select (i)
-    '/// The dialog 'Open' comes up///'
-    sleep 1
-    kontext "OeffnenDlg"
-    if (OeffnenDlg.exists (5)) then
-        '/// Read all entries in Listbox 'File type' ///'
-        for i = 1 to Dateityp.getItemCount
-            printlog "" + i + ":" + Dateityp.getItemText(i)
-        next i
-        '/// cancel dialog 'Open' ///'
-        OeffnenDlg.cancel
-    else
-        warnlog "Impress:Tasks Pane:Slide Transition:Sound:Other sound... disdn't bring up teh File Open Dialog!"
-    endif
-    kontext "Tasks"
-    sleep (2)
-    '/// check checkbox 'Automatically after' ///'
-    TransitionAutomaticallyAfter.check
-    sleep (2)
-    '/// press key 'Page Up' in box ///'
-    TransitionAutomaticallyAfterTime.typeKeys "<PageUp>"
-    sleep 9
-    '/// check the standard checkbox 'On mouse click' ///'
-    TransitionOnMouseClick.check
-    sleep (2)
-    '/// press button 'Apply to All Slides' ///'
-    TransitionApplyToAllSlides.click
-    sleep (2)
-    '/// press button 'Play' ///'
-    TransitionPlay.click
-    sleep 10
-    '/// press button 'Slide Show' ///'
-    TransitionSlideShow.click
-    sleep 2
-    kontext "DocumentPresentation"
-    if DocumentPresentation.exists (10) then
-        printlog "Presentation started :-)"
-        DocumentPresentation.typeKeys "<escape>"
-    else
-        warnlog "Impress:Tasks Pane:Slide Transition:Slide Show button doesn't start slideshow!"
-    endif
-    kontext "Tasks"
-
-    '/// uncheck and check Checkbox 'Automatic Preview' ///'
-    '/// default is checked ///'
-    if (NOT TransitionAutomaticPreview.isChecked) then
-        warnlog "Impress:Tasks Pane:Slide Transition: Automatic preview has to be checked by default, wasn't!"
-    endif
-    sleep (2)
-    TransitionAutomaticPreview.unCheck
-    sleep (2)
-    TransitionAutomaticPreview.Check
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowShowHideSlide
-    '/// open application ///'
-    Call hNewDocument
-    '/// create rectangle ///'
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    '/// View->Master View->Slides View ///'
-    ViewWorkspaceSlidesView
-    sleep 1
-    '/// Slide Show->Hide Slide ///'
-    SlideShowHideSlide
-    sleep 1
-    '/// Slide Show->Show Slide ///'
-    SlideShowShowSlide
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowAnimation
-    '/// open application ///'
-    Call hNewDocument
-    sleep 1
-    '/// create rectangle ///'
-    Call hRechteckErstellen ( 10, 10, 20, 40 )
-    sleep 1
-    '/// Insert ->Animated image ///'
-    Opl_SD_EffekteZulassen
-    Kontext "Animation"
-    sleep 1
-    '/// click button 'Apply Object' ///'
-    BildAufnehmen.Click  'BildAufnehmen
-    '/// click button 'Create' ///'
-    Erstellen.Click
-    sleep 1
-    '/// Select 1st entry from top in 'Alignment' ///'
-    Anpassung.Select 1
-    sleep 1
-    '/// click button 'Create' ///'
-    Erstellen.Click
-    sleep 1
-    '/// click button 'Apply Objects Individually' ///'
-    AlleAufnehmen.Click
-    sleep 1
-    '/// click button 'First Image' ///'
-    ErstesBild.Click
-    sleep 1
-    '/// click button 'Last Image' ///'
-    LetztesBild.Click
-    sleep 1
-    '/// click button 'BAckwards' ///'
-    Rueckwaerts.Click
-    sleep 1
-    '/// click button 'Play' ///'
-    Abspielen.Click
-    sleep 1
-    '/// click in Number field 'Image Number' Less - More ///'
-    AnzahlBilder.Less
-    sleep 1
-    AnzahlBilder.More
-    sleep 1
-    '/// check 'Bitmap Object' ///'
-    AnimationsgruppeBitmapobjekt.Check
-    sleep 1
-    '/// Type '10' into the field 'Duration' ///'
-    AnzeigedauerProBild.SetText "10"
-    '/// click button 'Play' ///'
-    Abspielen.Click
-    '/// wait 5 seconds ///'
-    sleep 5
-    '/// click button 'Stop' ///'
-    try
-        Stopp.Click
-    catch
-        warnlog "Stopbutton doesn't work"
-    endcatch
-    sleep 1
-    '/// Select 1st entry from top in 'Loop Count' ///'
-    AnzahlDurchlaeufe.Select 1
-    sleep 1
-    '/// click button 'Delete Current Image' ///'
-    BildLoeschen.Click
-    sleep 1
-    '/// check 'Group Object' ///'
-    AnimationsgruppeGruppenobjekt.Check
-    sleep 1
-    '/// click button 'Delete All Images' ///'
-    AlleLoeschen.Click
-    kontext "Messagebox"
-    '/// there has to be a messagebox 'Really delete?' say YES!; else ERROR ///'
-    if Messagebox.exists (5) then
-        Messagebox.YES
-    else
-        warnlog "No one cares about my data :-( No one asked if all shall be deleted :-( "
-    endif
-    sleep 1
-    kontext "Animation"
-    '/// close dialog 'Animation' ///'
-    Animation.Close
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowCustomAnimation
-    dim bError as boolean
-
-    '/// open application ///'
-    Call hNewDocument
-    '/// create textbox with text ///'
-    Call hTextrahmenErstellen ("Test text to test text effects", 10, 10, 20, 40 )
-    '/// Slide Show->Custom Animation... ///'
-    SlideShowCustomAnimation
-    Kontext "Tasks"
-    '/// click button 'Add...' ///'
-    EffectAdd.click
-    '/// Dialog 'Custom Animation' comes up ///'
-    kontext
-    '/// Switch to TabPage: Entrance ///'
-    active.setPage(TabEntrance)
-    kontext "TabEntrance"
-    if TabEntrance.exists(5) then
-        DialogTest(TabEntrance)
-        '/// select in the listbox 'Effects' the second entry///'
-        Effects.select(2)
-        Speed.getItemCount
-        AutomaticPreview.unCheck
-        sleep 1
-        AutomaticPreview.Check
-        kontext
-        '/// Switch to TabPage: Emphasis ///'
-        active.setPage(TabEmphasis)
-        kontext "TabEmphasis"
-        if TabEmphasis.exists(5) then
-            DialogTest(TabEmphasis)
-        else
-            bError = true
-            warnlog "Impress:Tasks Pane:Custom Animation:TabEmphasis tabPage doesn't work."
-        endif
-        kontext
-        '/// Switch to TabPage: Exit ///'
-        active.setPage(TabExit)
-        kontext "TabExit"
-        if TabExit.exists(5) then
-            DialogTest(TabExit)
-        else
-            bError = true
-            warnlog "Impress:Tasks Pane:Custom Animation:TabExit tabPage doesn't work."
-        endif
-        kontext
-        '/// Switch to TabPage: Motion Paths ///'
-        active.setPage(TabMotionPaths)
-        kontext "TabMotionPaths"
-        if TabMotionPaths.exists(5) then
-            DialogTest(TabMotionPaths)
-            Effects.select(7)
-        else
-            bError = true
-            warnlog "Impress:Tasks Pane:Custom Animation:TabMotionPaths tabPage doesn't work."
-        endif
-        '/// Close dialog 'Custom Animation' with 'OK' ///'
-        TabMotionPaths.OK
-        bError = false
-    else
-        bError = true
-        warnlog "Impress:Tasks Pane:Custom Animation:Add... button didn't work."
-    endif
-    Kontext "Tasks"
-    if (NOT bError) then
-        '/// click button 'Change...' ///'
-        EffectChange.click
-        '/// Dialog 'Custom Animation' comes up ///'
-        kontext
-        '/// Switch to TabPage: Entrance ///'
-        active.setPage(TabEntrance)
-        kontext "TabEntrance"
-        if (NOT TabEntrance.exists(5)) then
-            warnlog "Impress:Tasks Pane:Custom Animation:Change... button didn't work."
-        endif
-        TabEntrance.cancel
-        Kontext "Tasks"
-        EffectStart.getItemCount
-        if EffectProperty.isEnabled then
-            EffectProperty.getItemCount
-        endif
-        '/// CLick on button '...' (Options) ///'
-        EffectOptions.click
-        kontext "TabEffect"
-        if TabEffect.exists(5) then
-            dialogTest(TabEffect)
-            Sound.getItemCount
-            AfterAnimation.getItemCount
-            '/// switch to TabPage 'Timing' ///'
-            Kontext
-            active.setPage TabTiming
-            kontext "TabTiming"
-            if TabTiming.exists(5) then
-                dialogTest(TabTiming)
-                TimingStart.getItemCount
-                Delay.getText
-                Speed.getItemCount
-                Repeat.getItemCount
-                Rewind.ischecked
-                TriggerAnimate.isChecked
-                TriggerStart.isChecked
-                Shape.getItemCount
-            else
-                warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: Timing TabPage didn't work."
-            endif
-            '/// switch to TabPage 'Timing' ///'
-            Kontext
-            active.setPage TabTextAnimation
-            kontext "TabTextAnimation"
-            if TabTextAnimation.exists(5) then
-                dialogTest(TabTextAnimation)
-                GroupText.getItemCount
-                AnimateAttachedShape.isChecked
-                TabTextAnimation.cancel
-            else
-                warnlog "Impress:Tasks Pane:Custom Animation:Effect Options: TextAnimation TabPage didn't work."
-            endif
-        else
-            warnlog "Impress:Tasks Pane:Custom Animation:... button didn't work."
-        endif
-        Kontext "Tasks"
-        EffectSpeed.getItemCount
-        EffectList.getItemCount
-        EffectPlay.click
-        '/// Wait five seconds so the Playfunction has ended ///'
-        sleep 5
-        EffectSlideShow.click
-        sleep 1
-        kontext "DocumentPresentation"
-        if DocumentPresentation.exists (5) then
-            printlog "Presentation started :-)"
-            DocumentPresentation.typeKeys "<escape>"
-        else
-            warnlog "Impress:Tasks Pane:Custom Animation:Slide Show button doesn't start slideshow!"
-        endif
-        kontext "Tasks"
-        EffectAutomaticPreview.isChecked
-        '/// click button 'Remove' ///'
-        EffectRemove.click
-    endif
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-testcase tSlideShowInteraction
-    '/// open application ///'
-    Call hNewDocument
-    sleep 2
-    '/// create rectangle ///'
-    Call hRechteckErstellen (10, 10, 20, 20)
-    sleep 3
-    '/// Slide Show->Interaction ///'
-    SlideShowInteraction
-    Kontext "TabInteraktion"
-    Call DialogTest (TabInteraktion, 1)
-    '///+ Select 6th entry from top in 'Action at mouse click' : 'Go to page or object' ///'
-    AktionBeiMausklick.select 6
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    Call DialogTest (TabInteraktion, 2)
-    '///+ click button 'Find' ///'
-    sleep 1
-    suchen.click
-    Kontext "TabInteraktion"
-    '/// Select 7th entry from top in 'Action at mouse click' : 'Go to document' ///'
-    sleep 1
-    AktionBeiMausklick.select 7
-    sleep 1
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    Kontext "TabInteraktion"
-    Call DialogTest (TabInteraktion, 3)
-    '///+ click button 'Browse...' ///'
-    Durchsuchen.click
-    sleep 1
-    kontext "OeffnenDlg"
-    call Dialogtest (OeffnenDlg)
-    '///+ cancel dialog 'open' ///'
-    OeffnenDlg.cancel
-    Kontext "TabInteraktion"
-    sleep 1
-    '/// Select 9th entry from top in 'Action at mouse click' : 'Play Sound' ///'
-    AktionBeiMausklick.select 8
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    Call DialogTest (TabInteraktion, 4)
-    '///+ click button 'Browse...' ///'
-    Durchsuchen.click
-    sleep 1
-    Kontext "OeffnenDlg"
-    Call dialogTest (OeffnenDlg)
-    '///+ cancel dialog 'open' ///'
-    OeffnenDlg.Cancel
-    sleep 1
-    Kontext "TabInteraktion"
-    '/// Select 8th entry from top in 'Action at mouse click' : 'Run Program' ///'
-    AktionBeiMausklick.select 9
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    Call DialogTest (TabInteraktion, 7)
-    Kontext "TabInteraktion"
-    '///+ click button 'Browse...' ///'
-    Durchsuchen.Click
-    sleep 1
-    Kontext "OeffnenDlg"
-    Call dialogTest (OeffnenDlg)
-    '///+ cancel dialog 'open' ///'
-    OeffnenDlg.Cancel
-    sleep 1
-    '/// Select 9th entry from top in 'Action at mouse click' : 'Run Macro' ///'
-    Kontext "TabInteraktion"
-    AktionBeiMausklick.select 10
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    sleep 3
-    Call DialogTest (TabInteraktion, 6)
-    '///+ click button 'Browse...' ///'
-    Durchsuchen.Click
-    sleep 1
-    Kontext "ScriptSelector"
-    sleep 1
-    Call DialogTest ( ScriptSelector, 1)
-    sleep 1
-    '///+ cancel dialog 'ScriptSelector' ///'
-    ScriptSelector.Cancel
-    sleep 1
-    '/// Select 10th entry from top in 'Action at mouse click' : 'Exit Presentation' ///'
-    Kontext "TabInteraktion"
-    AktionBeiMausklick.select 11
-    Printlog AktionBeiMausklick.GetSelText + " chosen"
-    Call DialogTest (TabInteraktion, 7)
-    Kontext "TabInteraktion"
-    '/// close dialog 'Interaction' ///'
-    TabInteraktion.Close
-    sleep 2
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
-
-
-
-
diff --git a/testautomation/graphics/optional/includes/impress/im_011_.inc b/testautomation/graphics/optional/includes/impress/im_011_.inc
deleted file mode 100644
index 30ab1bebb74e..000000000000
--- a/testautomation/graphics/optional/includes/impress/im_011_.inc
+++ /dev/null
@@ -1,173 +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 Required Test Library (11)
-'*
-'\*****************************************************************
-
-testcase tiDiaLeiste
-
-' only in IMPRESS
-  dim sTemp as string
-  Dim i,x as integer
-
-'/// open application ///'
-   Call hNewDocument
-   sleep 1
-'/// Change options so the presentation won't start from the current, but the first slide. ///'
-   ToolsOptions
-   hToolsOptions ( "IMPRESS", "General" )
-   MitAktuellerSeite.Uncheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-'/// insert a graphic: "global\input\graf_inp\desp.bmp") ///'
-  Printlog "- Insert graphic from file so there is something for the slide mode"
-   hGrafikEinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 3
-'///+ Insert->Slide ///'
-   InsertSlide
-   sleep 2
-   hTypekeys "<Pagedown>"
-   sleep 2
-'///+ insert a graphic: "global\input\graf_inp\desp.bmp") ///'
-   hGrafikeinfuegen ConvertPath (gTesttoolPath + "global\input\graf_inp\desp.bmp")
-   sleep 3
-'///+ View->Master View->Slides View ///'
-   ViewWorkspaceSlidesView
-   sleep 2
-'-------------------------------- Ueberblendeffekt ----------------------------------------
-   Printlog "- Test blend effect"
-   Kontext "SlideViewObjectbar"  ' CORRECT
-   sleep 5
-
-   if Ueberblendeffekt.GetItemCount <> 57 then warnlog "these are not 57: " + Ueberblendeffekt.GetItemCount
-'/// select last entry 'Automatic (random)' in listbox 'Slide Effects' on object toolbar ///'
-   Ueberblendeffekt.Select (Ueberblendeffekt.GetItemCount)
-   Printlog " select last effect (random effect): " + Ueberblendeffekt.GetSelText
-
-'   Printlog Geschwindigkeit.GetRT  ' 341 listbox
-'   Printlog Diawechsel.GetRT       ' 341 listbox
-'   Printlog Zeit.GetRT             ' 353 spinfield
-'   Printlog DiasProReihe.GetRT     ' 353 spinfield
-'   Printlog PraesentationMitZeitnahme.GetRT doesn't work, but behave as button
-'   Printlog DiaAnzeigen.GetRT               doesn't work, but behave as button
-
-'-------------------------------- Geschwindigkeit -----------------------------------------
-  Printlog "- Check different speed settings"
-   Kontext "SlideViewObjectbar"
-'/// select every item in list 'Transition Speed' ///'
-   x = Geschwindigkeit.GetItemCount
-   for i = 1 to x
-       Geschwindigkeit.Select i
-       Printlog "     changed to: " + Geschwindigkeit.GetSelText
-   next i
-'-------------------------------- Diawechsel ----------------------------------------------
-   Printlog "- Style of slide change"
-   Kontext "SlideViewObjectbar"
-'/// select every item in list 'Auto Transition' ///'
-   x = Diawechsel.GetItemCount
-   for i = 1 to x
-       Diawechsel.Select i
-       Printlog "     Changed to: " + Diawechsel.GetSelText + "; is time enabled ?: "+Zeit.IsEnabled
-   next i
-'-------------------------------- Diawechsel Zeitintervall --------------------------------
-   Printlog "- Zeitintervall testen"
-   Kontext "SlideViewObjectbar"
-'/// select last entry 'Automatic' in listbox 'Auto Transition' ///'
-   Diawechsel.Select (Diawechsel.GetItemCount) ' automatic is usually the last one
-   sleep 1
-   if (Zeit.IsEnabled = FALSE) Then Warnlog "- Time should be editable, if automatic is chosen"
-'/// type "15" into the field 'Time' ///'
-   Zeit.SetText "15"
-   sleep 1
-   Printlog "    Time set to: " + Zeit.GetText
-'-------------------------------- Praesentation mit Zeitnahme ------------------------------
-   Printlog "- Presentation with rehearsed timings"
-   Kontext "SlideViewObjectbar"
-'/// click button 'Rehearse Timings' ///'
-   PraesentationMitZeitnahme.Click
-   sleep 2
-   Kontext "DocumentPresentation"
-   if DocumentPresentation.exists (5) then
-      sleep 5
-'/// wait some seconds and click with mouse ///'
-      DocumentPresentation.MouseDown 50,50
-      DocumentPresentation.MouseUp 50,50
-      sleep 2
-'/// wait some seconds and click with mouse ///'
-      DocumentPresentation.MouseDown 50,50
-      DocumentPresentation.MouseUp 50,50
-      sleep 3
-   else
-      warnlog "Didn't switch into presentation mode :-("
-   endif
-   Kontext "DocumentPresentation"
-   if DocumentPresentation.exists (5) then
-      warnlog "We are still in presentation mode :-( WHY!!!!???"
-   endif
-'------------------------------- Dia anzeigen ja/nein --------------------------------------
-   Printlog "- Show slide yes/no"
-   Kontext "SlideViewObjectbar"
-'/// click button 'Show/Hide Slide' ///'
-   DiaAnzeigen.Click
-   sleep 3
-'/// click button 'Show/Hide Slide' ///'
-   DiaAnzeigen.Click
-'------------------------------- Dias pro Reihe --------------------------------------------
-   Printlog "- Presentation with rehearsed timings"
-   Kontext "SlideViewObjectbar"
-   sTemp = DiasProReihe.GetText
-'/// press button 'less' in field 'Slides Per Row' ///'
-      DiasProReihe.Less
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (less)"
-   sTemp = DiasProReihe.GetText
-'/// press button 'more' in field 'Slides Per Row' ///'
-      DiasProReihe.more
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 1)"
-   sTemp = DiasProReihe.GetText
-'/// press button 'more' in field 'Slides Per Row' ///'
-      DiasProReihe.more
-      if sTemp = DiasProReihe.GetText then warnlog "   nothing changed (more 2)"
- kontext
- if active.exists then
-   warnlog "active (1): '"+active.gettext+"'"
- endif
-'/// Restore default settings in ToolsOptions ///'
-   ToolsOptions
-   hToolsOptions ( "IMPRESS", "General" )
-   MitAktuellerSeite.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-'/// close application ///'
- Call hCloseDocument
- sleep 2
-endcase
-
-
diff --git a/testautomation/graphics/required/includes/global/gallery.inc b/testautomation/graphics/required/includes/global/gallery.inc
deleted file mode 100644
index cfdac0029ec1..000000000000
--- a/testautomation/graphics/required/includes/global/gallery.inc
+++ /dev/null
@@ -1,987 +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 : Global Required/resource test: Checking the gallery
-'*
-'\******************************************************************************
-testcase tGallery_DialogTest
-    '///Open a new Writer document
-    '///Tools / Gallery
-    printlog "- Working with Gallery-Beamer!"
-    gApplication = "WRITER"
-    call hNewDocument
-    call hOpenGallery
-    Kontext "DocumentWriter"
-        '///+Undock the <i>Gallery Beamer</i>
-        printlog "- undock the Gallery Beamer"
-        Kontext "Gallery"
-            Gallery.Undock ( AlignTop )
-            sleep(2)
-            '///+<ul><li>Move the gallery-window</li></ul>
-            printlog "  - move the gallery window"
-            Gallery.move ( 20, 20 )
-            sleep(2)
-            '///+Dock the <i>Gallery Beamer</i>
-            printlog "- dock the Gallery Beamer"
-            Gallery.Dock ( AlignTop )
-            sleep(2)
-            '///+Close the <i>Gallery Beamer</i> (Tools / Gallery)
-            printlog "- close the Gallery Beamer"
-        ToolsGallery
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_ActivateAndUpdateAllThemes
-    Dim iThemeCount as Integer
-    Dim i as Integer 
-    Dim j as Integer
-    Dim Gallerytext as string
-    '///Activate and update all gallery themes (NET installation: Activate only!)
-    '///Open a new Writer document
-    '///+Tools / Gallery
-    '///+Click on each theme and update it (via context menu)
-    printlog "activate and update all gallery-themes"
-    gApplication = "WRITER"
-    call hNewDocument
-    Kontext
-    call hOpenGallery
-    Kontext "Gallery"
-        iThemeCount = Gallerys.GetItemCount
-        for i=1 to iThemeCount
-            if gNetzInst = FALSE then
-                Kontext "Gallery"
-                    Gallerytext = Gallerys.GetItemText(i)
-                    printlog "- " + i + ". entry (" & Gallerytext & ")"
-                    Gallerys.Select i
-                    Gallerys.MouseMove ( 10, 10 )
-                    Gallerys.OpenContextMenu
-                    sleep (3)
-                    printlog "  - update"
-                    hMenuSelectNr (1)
-                    sleep (3)
-                    Kontext "Messagebox"
-                    if Messagebox.Exists(3) then
-                        if Messagebox.getRT=304 then
-                            printlog "- 'MyTheme' is the " & i & "'s entry."
-                            Messagebox.No
-                        end if
-                    else
-                        for j = 1 to 800
-                            Kontext "AktualisierenGallery"
-                                if AktualisierenGallery.Exists then
-                                    printlog "DEBUG (j): " & j
-                                    sleep (1)
-                                else
-                                    printlog "DEBUG: 800 reached!"
-                                    j=801
-                                end if
-                        next j
-                    end if
-            end if
-        next i
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_CheckNames
-    Dim iThemeCount as Integer
-    Dim i as Integer
-    Dim j as Integer
-    Dim ssList (100) as String
-    Dim siList (100) as String
-    Dim sFileName as String
-    Dim iGalleryThemes as integer
-
-    if gOOO = true then 
-        sFileName = ConvertPath ( gTesttoolPath + "graphics\required\input\gallery\gal_oo_" + iSprache + ".txt" )
-    else
-        sFileName = ConvertPath ( gTesttoolPath + "graphics\required\input\gallery\gal_" + iSprache + ".txt" )
-    end if
-
-    '///Check the names for the gallery themes
-    '///Open a new Writer document
-    '///+Tools / Gallery
-    gApplication = "WRITER"
-    call hNewDocument
-    Kontext
-    call hOpenGallery
-    '///+Check the number of gallery themes. For StarOffice: should be 32. For OpenOffice.Org: should be 6.
-    printlog "- check the number of gallery-themes"
-    Kontext "Gallery"
-        if NOT gOOO then 
-            if bAsianLan then
-                iGalleryThemes = 29 ' Flags are not allowed!
-            else
-                iGalleryThemes = 30
-            end if
-        else
-            if bAsianLan then
-                iGalleryThemes = 6  ' Flags are not allowed!
-            else
-                iGalleryThemes = 6
-            end if
-        end if
-        iThemeCount = Gallerys.GetItemCount
-        if (iThemeCount <> iGalleryThemes) then
-            warnlog "Difference in count of gallery themes; found: '" + iThemeCount + "'; expected: '"+ iGalleryThemes +"'"
-        end if
-        for i=1 to iThemeCount
-        Gallerys.Select i
-        ListAppend ( siList(), Gallerys.GetSelText )
-    next i
-    '///+Check all names with a list which depends on language (<i>gTestToolPath</i>/graphics/udpate/input/gallery)
-    printlog "- check the names of gallery-themes"
-    if Dir ( sFilename ) = "" then
-        warnlog "The file for comparison does not exists. The file will be written!"
-        warnlog "Please control : " + sFilename
-        ListWrite ( siList(), sFilename, "utf8" )
-    else
-        printlog "  file for comparison is : " + sFilename
-        ListRead ( ssList (), sFilename, "uft8" )
-        gCompare2Lists ( siList(), ssList () )
-    end if
-    ToolsGallery
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_CheckContextMenuForGalleryThemes
-    Dim iForBidden as Integer
-    Dim iMenuEntries as Integer
-    Dim i as Integer
-    Dim iThemeCount as Integer
-    '/// Check the contextmenu for the gallery themes
-    '/// Open a new Writer document
-    '/// +Tools / Gallery
-    printlog "check the contextmenu for the gallery-themes"
-    gApplication = "WRITER"
-    call hNewDocument
-    call hOpenGallery
-    '/// +Testing <i>rename</i> and <i>properties</i> for each gallery theme (via context-menu)
-    '/// +<ul><li>Only the private gallery theme must be deleteable (different 3 entries in the context-menu than the rest)</li></ul>
-    Kontext "Gallery"
-        iThemeCount = Gallerys.GetItemCount
-        Gallerys.MouseMove ( 10, 10 )
-        for i=1 to iThemeCount
-            Kontext "Gallery"
-                printlog "- " + i + ". entry"
-                sleep 1
-                Gallerys.Select 1
-                sleep (1)
-                Gallerys.Select i
-                sleep (1)
-                Gallerys.OpenContextMenu
-                sleep (2)
-                iMenuEntries = hMenuItemGetCount
-                if iMenuEntries <> 3 then
-                    if gNetzInst = FALSE then
-                        warnlog "There are not 3 entries! => no test on the contextmenu!"
-                    else
-                        if iMenuEntries <> 1 then
-                            warnlog "Net-Inst : There are not 1 entries! => no test on the contextmenu!"
-                        else
-                            sleep (3)
-                            hMenuSelectNr(1)
-                            Kontext
-                            if Active.GetPageCount <> 1 then
-                                warnlog "There are more than 1 Tabpage in Net-Installation ( perhaps no root-installation )!"
-                            end if
-                            Active.SetPage TabAllgemeinGallery
-                            Kontext "TabAllgemeinGallery"
-                                TabAllgemeinGallery.Cancel
-                                sleep (1)
-                        end if
-                    end if
-                else
-                    sleep (1)
-                    hMenuSelectNr(2)
-                    Kontext "GalleryNewTitle"
-                        GalleryNewTitle.Cancel
-                        sleep(1)
-                        Kontext "Gallery"
-                            Gallerys.OpenContextMenu
-                            sleep (3)
-                            hMenuSelectNr (3)
-                            Kontext
-                            Active.SetPage TabAllgemeinGallery
-                            Active.SetPage TabDateien
-                            Kontext "TabDateien"
-                                TabDateien.Cancel
-                                sleep(1)
-                end if
-        next i
-        ToolsGallery
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_CreateAndWorkWithANewGalleryThemes
-    Dim iMenuEntries as Integer
-    Dim j as Integer
-    '/// Open a new Writer document
-    '/// Tools / Gallery
-    printlog "create a new gallery-theme ( TT-theme )"
-    gApplication = "WRITER"
-    call hNewDocument
-    call hOpenGallery
-    iMenuEntries = Gallerys.GetItemCount
-    printlog "- Clicking on 'New Theme' and creating a new theme"
-    '/// Create a new gallery-theme
-    '/// + by clicking on <i>New Theme</i>
-    NewTheme.Click
-    '/// +Activate <i>General</i> tabpage and insert <b><i>TT-theme</b></i> as name
-    Kontext
-    Active.SetPage TabAllgemeinGallery
-    Kontext "TabAllgemeinGallery"
-        NeuesThema.SetText "TT-theme"
-        sleep (1)
-        printlog "  - named the new theme 'TT-theme' on the general-page"
-        printlog "  - insert all files out of '[gTestToolpath]\global\input\graf_inp' in the files-page"
-        '/// +Activate <i>Files</i> tabpage
-        Kontext
-        Active.SetPage TabDateien
-        Kontext "TabDateien"
-            printlog "     - click 'add' without a selected file => insert-graphic-dialog has to be be visible"
-            '/// +Click on <i>Add</i> (If no file is selected the <i>Graphic-Insert</i> dialog has to be be opened -> close it)
-            Hinzufuegen.Click
-            sleep (1)
-            Kontext "GrafikEinfuegenDlg"
-                GrafikEinfuegenDlg.Cancel
-                sleep (1)
-                printlog "     - click 'find files' to insert the path for graphics"
-                '///+Click on <i>Find Files</i> => <i>select-path</i> dialog will be visible
-        Kontext "TabDateien"
-            Suche.Click
-            sleep (1)
-            '/// +Insert [gTesttoolPath]/input/global/graf_inp as path-name as click on <i>Select</i>
-        Kontext "OeffnenDlg"
-            Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
-            sleep (1)
-            Auswaehlen.Click
-            sleep (10)
-            '/// +Click on <i>Add</i> for some graphics
-            printlog "     - 'add' one by one"
-        Kontext "TabDateien"
-        DateiListe.Select 1
-        WaitSlot(1000)
-        Hinzufuegen.Click
-        sleep (1)
-        DateiListe.Select 1
-        Hinzufuegen.Click
-        sleep (1)
-        '/// +Click on <i>Add all</i> for rest of the graphics
-        '/// +<ul><li>apply-dialog -> cancel</li></ul>
-        '/// +click on <i>Add all</i> for rest of the graphics
-        printlog "     - 'add all' for the rest of the files"
-        DateiListe.Select 1
-        HinzufuegenAlle.Click
-        printlog "     - apply-dialog -> cancel"
-        Kontext "ApplyGallery"
-            for j=1 to 100
-                if ApplyGallery.Exists then
-                    try
-                        ApplyGallery.Cancel
-                    catch
-                    endcatch
-                else
-                    if j>5 then j=101
-                        sleep (1)
-                    end if
-                next j
-        Kontext "TabDateien"
-        if DateiListe.GetItemCount > 1 then
-            printlog "     - 'add all' for the rest of the files"
-            DateiListe.Select 1
-            HinzufuegenAlle.Click
-            sleep (2)
-            Kontext "ApplyGallery"
-                for j=1 to 100
-                    If ApplyGallery.Exists then
-                        sleep (1)
-                    else
-                        j=101
-                    end if
-                next j
-        end if
-        Kontext "TabDateien"
-            printlog "  - click 'OK' for the tabpages"
-            TabDateien.OK
-            '/// +Check if the new entry is inserted and select it
-            printlog "  - check if the new entrie is inserted and select it"
-        Kontext "Gallery"
-            if Gallerys.GetItemCount <> ( iMenuEntries + 1 ) then
-                warnlog "No new theme was created => the test ends here"
-                ToolsGallery
-                call hCloseDocument
-            else
-                gMouseClick 50,50            '/// make mouseclick to set focus ///'
-                Kontext "Gallery"
-                Gallerys.Select "TT-theme"
-                Gallerys.MouseMove ( 10, 10 )
-                sleep (1)
-                Gallerys.OpenContextMenu
-                '/// +Update the entry (1. entry in context menu ) => cancel it
-                printlog "  - update the entry => cancel the update"
-                sleep (3)
-                hMenuSelectNr (1)
-                sleep (1)
-                Kontext "AktualisierenGallery"
-                    if AktualisierenGallery.Exists <> TRUE then
-                        AktualisierenGallery.Cancel
-                    end if
-                    do
-                        sleep 1
-                    loop while AktualisierenGallery.Exists
-                    Kontext "Gallery"
-                        Gallerys.Select "TT-theme"
-                        Gallerys.OpenContextMenu
-                        '/// +Update it (1. entry in context menu )
-                        printlog "  - update"
-                        sleep (3)
-                        hMenuSelectNr (1)
-                        for j=1 to 100
-                            Kontext "AktualisierenGallery"
-                            if AktualisierenGallery.Exists <> TRUE then
-                                j=101
-                            else
-                                sleep (1)
-                            end if
-                        next j
-                    '/// +Rename it (3. entry in context menu)
-                    printlog "  - rename ( 3. entry in context-menu )"
-                    Kontext "Gallery"
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (3)
-                        Kontext "GalleryNewTitle"
-                            Title.SetText "New TT-theme"
-                            GalleryNewTitle.OK
-                    Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        '///+Add new files in properties (4. entry in context menu)
-                        printlog "  - add new graphics in properties ( 4. entry in context-menu )"
-                    Kontext "Gallery"
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (4)
-                        Kontext
-                        Active.SetPage TabDateien
-                        Kontext "TabDateien"
-                            Suche.Click
-                            Kontext "OeffnenDlg"
-                                Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
-                                Auswaehlen.Click
-                                sleep (10)
-                        Kontext "TabDateien"
-                            DateiListe.Select 1
-                            Hinzufuegen.Click
-                            TabDateien.OK
-                            '/// +Delete the entry (2. entry in context menu)
-                            printlog "  - delete the entry ( 2. entry in context-menu )"
-                            printlog "     - messagebox -> no"
-                    Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        sleep (3)
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (2)
-                        Kontext "Active"
-                            sleep (1)
-                            Active.No
-                            printlog "     - messagebox -> yes"
-                    Kontext "Gallery"
-                        sleep (1)
-                        Gallerys.Select "New TT-theme"
-                        sleep (1)
-                        Gallerys.OpenContextMenu
-                        sleep (3)
-                        hMenuSelectNr (2)
-                        Kontext "Active"
-                            Active.Yes
-                    try
-                        Kontext "Gallery"
-                        Gallerys.Select "New TT-theme"
-                        warnlog "The entry isn't deleted!"
-                    catch
-                    endcatch
-                end if
-            sleep 10
-        ToolsGallery
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_GalleryView_Preview
-    Dim jpeg_bkg as Integer
-    Dim iAnimation as Integer
-    Dim iSound as Integer
-    Dim i as Integer
-    Dim iPreview as Integer
-    Dim iTitle as Integer
-    if NOT gOOO then
-        select case iSprache
-        case 01     :   jpeg_bkg =  3    : iAnimation =  1   :   iSound = 28
-        case 07     :   jpeg_bkg = 29   : iAnimation =  1   :   iSound =  6
-        case 31     :   jpeg_bkg =  3    : iAnimation =  3   :   iSound = 11
-        case 33     :   jpeg_bkg = 13   : iAnimation =  1   :   iSound = 29
-        case 34     :   jpeg_bkg = 11   : iAnimation =  1   :   iSound = 28
-        case 36     :   jpeg_bkg = 12   : iAnimation =  1   :   iSound = 10
-        case 39     :   jpeg_bkg = 10   : iAnimation =  1   :   iSound = 27
-        case 46     :   jpeg_bkg =  2    : iAnimation =  1   :   iSound = 17
-        case 48     :   jpeg_bkg =  2    : iAnimation =  1   :   iSound = 17
-        case 49     :   jpeg_bkg = 12   : iAnimation =  1   :   iSound = 16
-        case 55     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 28
-        case 81     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 10  'FHA TODO: Find out the right numbers for Asian languages.
-        case 82     :   jpeg_bkg =  1    : iAnimation = 17  :   iSound = 12
-        case 86     :   jpeg_bkg =  1    : iAnimation =  9   :   iSound = 13
-        case 88     :   jpeg_bkg =  1    : iAnimation =  7   :   iSound = 20
-        case else :   jpeg_bkg = 10   : iAnimation =  1    :   iSound = 17
-                  warnlog "Please insert the entrienumbers for 'Backgrounds', 'Sounds' and one with normal files ( Animations )"
-        end select
-    else  ' Testing OOO
-        select case iSprache
-            case 01     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
-            case 07     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
-            case 31     :   jpeg_bkg =  3   :   iAnimation =  1     :   iSound =  1
-            case 33     :   jpeg_bkg =  3   :   iAnimation =  1     :   iSound =  2
-            case 34     :   jpeg_bkg =  1   :   iAnimation =  1     :   iSound =  2
-            case 36     :   jpeg_bkg =  2   :   iAnimation =  1     :   iSound =  2
-            case 39     :   jpeg_bkg =  2   :   iAnimation =  1     :   iSound =  2
-            case 46     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
-            case 48     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
-            case 49     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
-            case 55     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2
-            case 81     :   jpeg_bkg =  2   :   iAnimation =  5     :   iSound =  2  'FHA TODO: Find out the right numbers for Asian languages.
-            case 82     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
-            case 86     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  3
-            case 88     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
-            case else  :  jpeg_bkg =  1    :   iAnimation =  5     :   iSound =  2
-                warnlog "Please insert the entrienumbers for 'Backgrounds', 'Sounds' and one with normal files ( Animations )"
-        end select
-    end if
-    '/// Open a new Writer document
-    '/// Tools / Gallery
-    printlog "open a writer and the gallery"
-    gApplication = "WRITER"
-    call hNewDocument
-    Kontext
-    call hOpenGallery
-    '/// Check the view for Background-pictures (JPEGs), for standard graphic files (Animation) and for <i>Sound</i> objects
-    for i=1 to 3
-        if i=1 then
-            Gallerys.Select jpeg_bkg
-            printlog "selected gallery-theme : Backgrounds (Jpeg-files)"
-        end if
-        if i=2 then
-            Gallerys.Select iAnimation
-            printlog "selected gallery-theme : Animation"
-        end if
-        if i=3 then
-            Gallerys.Select iSound
-            printlog "selected gallery-theme : Sound"
-        end if
-        if gNetzInst = FALSE then
-            iPreview = 2 : iTitle = 3
-        else
-            iPreview = 2 : iTitle = 0
-        end if
-        '/// Test the list-view
-        '/// +Click on List-View-Button in toolbar
-        printlog "- list-view"
-        printlog "  - open the list-view"
-        ListView.Click
-        sleep (1)
-        printlog "  - Press Home + Enter to focus and enter Preview-mode."
-        '/// +Double-click on an object (preview has to be visible)
-        View.TypeKeys "<HOME>"
-        View.TypeKeys "<RETURN>"
-        sleep (2)
-        '/// +Back to normal view with Enter
-        View.TypeKeys "<RETURN>"
-        sleep (2)
-        '/// +Preview out of context menu on/off
-        printlog "  - preview out of context menu on/off"
-        View.TypeKeys "<HOME>"
-        Sleep (2)
-        View.OpenContextMenu true
-        sleep (3)
-        hMenuSelectNr ( iPreview )
-        sleep (3)
-        kontext "Gallery"
-            Sleep (2)
-            View.OpenContextMenu true
-            sleep (2)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// +Title (FAT installation only)
-            if gNetzInst = FALSE then
-                printlog "  - title"
-                Kontext "Gallery"
-                    sleep (2)
-                    View.OpenContextMenu true
-                    sleep (3)
-                    hMenuSelectNr ( iTitle )
-                    Kontext "GalleryNewTitle"
-                        sleep (1)
-                        GalleryNewTitle.Cancel
-                        sleep (1)
-                    Kontext "Gallery"
-            end if
-            View.OpenContextMenu true
-            sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// Should now be in Preview-mode. Check if we are. ///'
-            View.OpenContextMenu true
-            sleep (3)
-            printlog MenuIsItemChecked (MenuGetItemID(iPreview+1))
-            if MenuIsItemChecked (MenuGetItemID(iPreview+1)) then
-                Printlog "   Entered Preview-mode correctly"
-                sleep (1)
-            else
-                Warnlog "   Didnt seem to enter preview-mode correctly."
-            end if
-            MenuSelect (0)
-            sleep (1)
-            '/// From here, try switching to icon-view ///'
-            '///+Click on Icon-View-Button in toolbar
-            printlog "- icon-view"
-            if IconView.isEnabled then
-                IconView.Click
-                qaErrorLog "The bug 64543 has been fixed! Please report to FHA."
-            end if
-            sleep (1)
-            View.TypeKeys "<HOME>"
-            printlog "  - Enter to get out of Preview-mode"
-            '/// +Press Return on an object (preview has to be visible)
-            View.TypeKeys "<RETURN>"
-            sleep (2)
-            '/// +Back to normal view with Return
-            View.TypeKeys "<RETURN>"
-            sleep (2)
-            '/// +Preview out of context menu on/off
-            printlog "  - preview out of context menu on/off"
-            View.TypeKeys "<HOME>"
-            sleep (3)
-            View.OpenContextMenu true
-            sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            View.OpenContextMenu true
-            sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// +Title (FAT installation only)
-            if gNetzInst = FALSE then
-                printlog "  - title"
-                try
-                    View.OpenContextMenu true
-                    sleep (3)
-                catch
-                    warnlog "Could not open Contextmenu for Title nr:" +iTitle
-                endcatch
-                hMenuSelectNr ( iTitle )
-                Kontext "GalleryNewTitle"
-                    GalleryNewTitle.Cancel
-                Kontext "Gallery"
-            end if
-        next i
-        sleep 1 ' else crash
-   ToolsGallery
-
-    '/// If the MediaPlayer exists - close it ///'
-    kontext "Mplayer"
-        if Mplayer.Exists then
-            if (gApplication = "IMPRESS") then
-                kontext "DocumentImpress"
-            else
-                kontext "DocumentDraw"
-            end if
-            ToolsMediaPlayer
-        else
-            if (gApplication = "IMPRESS") then
-                kontext "DocumentImpress"
-            else
-                kontext "DocumentDraw"
-            end if
-        end if
-
-    call hCloseDocument
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_GalleryView_Insert
-    Dim jpeg_bkg as Integer
-    Dim iAnimation as Integer
-    Dim i as Integer
-    Dim j as Integer
-    Dim k as Integer
-    '/// Test gallery-view -> insert gallery-object with context-menu (3D-Object (<i>internal object</i>), Animation (<i>as file</i>))
-    if NOT gOOO then
-        select case iSprache
-            case 01     :   jpeg_bkg = 3     :   iAnimation =  1
-            case 07     :   jpeg_bkg = 29   :   iAnimation =  1
-            case 31     :   jpeg_bkg = 3     :   iAnimation =  3
-            case 33     :   jpeg_bkg = 13   :   iAnimation =  1
-            case 34     :   jpeg_bkg = 7     :   iAnimation =  1
-            case 36     :   jpeg_bkg = 12   :   iAnimation =  1
-            case 39     :   jpeg_bkg = 10   :   iAnimation =  1
-            case 46     :   jpeg_bkg = 1     :   iAnimation =  2
-            case 48     :   jpeg_bkg = 3     :   iAnimation =  1
-            case 49     :   jpeg_bkg = 1     :   iAnimation =  2
-            case 55     :   jpeg_bkg = 8     :   iAnimation =  1
-            case 81     :   jpeg_bkg = 1     :   iAnimation =  3
-            case 82     :   jpeg_bkg = 1     :   iAnimation = 17
-            case 86     :   jpeg_bkg = 17   :   iAnimation = 15 
-            case 88     :   jpeg_bkg = 17   :   iAnimation = 15
-            case else  :  jpeg_bkg = 1     :   iAnimation =  2
-                                warnlog "Please insert the entrienumbers for 'Backgrounds' and one with normal files ( Animations )"
-        end select
-    else  ' Testing OOO
-        select case iSprache
-            case 01   : jpeg_bkg =  3 : iAnimation =  1
-            case 07   : jpeg_bkg =  5 : iAnimation =  1
-            case 31   : jpeg_bkg =  3 : iAnimation =  3
-            case 33   : jpeg_bkg =  5 : iAnimation =  1
-            case 34   : jpeg_bkg =  6 : iAnimation =  1
-            case 36   : jpeg_bkg =  5 : iAnimation =  1
-            case 39   : jpeg_bkg =  5 : iAnimation =  1
-            case 46   : jpeg_bkg =  1 : iAnimation =  2
-            case 48   : jpeg_bkg =  3 : iAnimation =  1
-            case 49   : jpeg_bkg =  1 : iAnimation =  2
-            case 55   : jpeg_bkg =  6 : iAnimation =  1
-            case 81   : jpeg_bkg =  1 : iAnimation =  3
-            case 82   : jpeg_bkg =  1 : iAnimation =  1
-            case 86   : jpeg_bkg =  5 : iAnimation =  5 
-            case 88   : jpeg_bkg =  5 : iAnimation =  1
-            case else : jpeg_bkg =  1 : iAnimation =  2
-                                warnlog "Please insert the entrienumbers for 'Backgrounds' and one with normal files ( Animations )"
-        end select
-    end if
-    '/// Test following for all applications (Writer, Calc, Impress, Draw)
-    for i=1 to 4           ' each application
-        if i=1 then gApplication = "WRITER"
-        if i=2 then gApplication = "CALC"
-        if i=3 then gApplication = "IMPRESS"
-        if i=4 then gApplication = "DRAW"
-
-        '/// +Open a new document
-        '/// +Open the Gallery
-        printlog gApplication  'Chr(13)
-        call hNewDocument
-        call hOpenGallery
-        '/// +Select 3D-theme (these are internal objects and not realy files)
-        '/// +<ul><li>on context menu there are only 2 entries for insert (copy, link)
-        '/// +<li>insert the object per <i>copy</i></li>
-        '/// +<li>insert the object per <i>link</i></li></ul>
-        '/// +Select Animation theme (these are realy files)
-        '/// +<ul><li>On context menu there are only 2 entries for insert (copy, link ) for Calc, Draw Impress</li>
-        '/// +<li>On context menu there are only 3 entries for insert (copy, link, background / page, paragraph ) for Writer</li>
-        '/// +<li>insert the object per <i>copy</i></li>
-        '/// +<li>insert the object per <i>link</i></li>
-        '/// +<li>Only for the Writer:<ul>
-        '/// +<li>Insert the object per background / page</li>
-        '/// +<li>insert the object per background / paragraph</li></ul></li></ul>
-        '/// +Close the Gallery
-        '/// +Close the document
-        '/// Since the GraphicObjectbar could disturb our testing, we close it if it is open ///'
-        '      kontext "GraphicObjectbar"
-        '      if GraphicObjectbar.Exists then GraphicObjectbar.Close
-        for j=1 to 2        ' the two gallery-theme
-            if j=1 then
-                Gallerys.Select jpeg_bkg
-                printlog " selected gallery-theme : Backgrounds"
-            end if
-
-            if j=2 then
-                Gallerys.Select iAnimation
-                printlog " selected gallery-theme : Animation"
-            end if
-
-            if i=1 then       ' test for writer
-                for k=1 to 2
-                    if k=1 then
-                        ListView.Click
-                        printlog "  - insert on list view"
-                    else
-                        IconView.Click
-                        printlog "  - insert on icon view"
-                    end if
-
-                    sleep (2)
-                    View.Mousedown ( 5, 18 )
-                    View.Mouseup ( 5, 18 )
-                    View.typekeys "<DOWN>,<UP>"
-
-                    sleep (3)
-                    View.TypeKeys "<SHIFT F10>" ' OpenContextMenu
-                    sleep (3)
-                    hMenuSelectNr ( 1 )
-
-                    if j=1 then
-                        printlog "   - copy"
-                        sleep (1)
-                        hMenuSelectNr ( 1 )
-                        sleep (2)
-                    else
-                        printlog "   - copy"
-                        sleep (1)
-                        hMenuSelectNr ( 1 )
-                        sleep (3)
-
-                        printlog "   - link"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-                        sleep (1)
-                        hMenuSelectNr ( 1 )
-                        hMenuSelectNr ( 2 )
-                        sleep (3)
-
-                        printlog "   - background -> page"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-                        sleep (2)
-                        hMenuSelectNr ( 1 )
-                        hMenuSelectNr ( 3 )
-                        hMenuSelectNr ( 1 )
-                        sleep (3)
-
-                        printlog "   - background -> paragraph"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-                        sleep (2)
-                        hMenuSelectNr ( 1 )
-                        hMenuSelectNr ( 3 )
-                        hMenuSelectNr ( 2 )
-                        sleep (3)
-                    end if
-
-                    kontext "GraphicObjectbar"
-                    if GraphicObjectbar.Exists then
-                        if GraphicObjectbar.isDocked = False then
-                            GraphicObjectbar.Move 900,900
-                        end if
-                    end if
-                    kontext "Gallery"
-
-                next k
-            else              ' test for other applications ( calc, impress, draw )
-                kontext "GraphicObjectbar"
-                    if GraphicObjectbar.Exists then
-                        if GraphicObjectbar.isDocked = False then
-                            GraphicObjectbar.Move 900,900
-                        end if
-                    end if
-                kontext "Gallery"
-
-                kontext "Gluepointsobjectbar"
-                    if Gluepointsobjectbar.Exists then
-                        if Gluepointsobjectbar.isDocked = false then
-                            Gluepointsobjectbar.Move 900,900
-                        end if
-                    end if
-                kontext "Gallery"
-
-                kontext "Optionsbar"
-                    if Optionsbar.Exists then
-                        if Optionsbar.isDocked = false then
-                            Optionsbar.Move 900,900
-                        end if
-                    end if
-                kontext "Gallery"
-
-                    for k=1 to 2
-                        if k=1 then
-                            ListView.Click
-                            printlog "  - insert on list view"
-                        else
-                            IconView.Click
-                            printlog "  - insert on icon view"
-                        end if
-
-                    sleep (1)
-                    View.Mousedown ( 5, 18 )
-                    View.Mouseup ( 5, 18 )
-                    View.typekeys "<DOWN>,<UP>"
-
-                    sleep (1)
-                    View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-                    printlog "    - copy"
-                    sleep (3)
-                    hMenuSelectNr ( 1 )
-                    hMenuSelectNr ( 1 )
-                    sleep (3)
-
-                    if j=2 then
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
-                        printlog "    - link"
-                        sleep (3)
-                        hMenuSelectNr ( 1 )
-                        hMenuSelectNr ( 2 )
-                        sleep (2)
-                    end if
-
-                next k
-            end if
-        next j
-        ToolsGallery
-        WaitSlot (2000)
-        call hCloseDocument
-        WaitSlot (2000)
-    next i
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tGallery_GalleryView_Delete
-    Dim jpeg_bkg as Integer
-    Dim iAnimation as Integer
-    Dim iSound as Integer
-    Dim i as Integer
-    Dim j as Integer
-    Dim k as Integer
-
-    if gNetzInst = TRUE then
-        ' TODO: since we now only know net- installations, make it work!
-        printlog "No test for 'net' installations, because there are no rights to delete objects out of Gallery!"
-        'NOTE: Jump to NotForNetInst...
-        Goto NotForNetInst
-    end if
-
-    '/// Test gallery view -> delete objects with context-menu ( Backgrounds (<i>internal object</i>), Animation (<i>file</i>), Sound (<i>file</i>))
-    select case iSprache
-        case 01   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 28
-        case 07   : jpeg_bkg = 29  :   iAnimation = 1   :  iSound =  6
-        case 31   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 28
-        case 33   : jpeg_bkg = 13  :   iAnimation = 1   :  iSound = 29
-        case 34   : jpeg_bkg = 7    :   iAnimation = 1   :  iSound = 28
-        case 36   : jpeg_bkg = 12  :   iAnimation = 1   :  iSound = 10
-        case 39   : jpeg_bkg = 10  :   iAnimation = 1   :  iSound = 27
-        case 46   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 18
-        case 49   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 17
-        case 55   : jpeg_bkg = 8    :   iAnimation = 1   :  iSound = 30
-        case 81   : jpeg_bkg = 1    :   iAnimation = 3   :  iSound = 10
-        case 82   : jpeg_bkg = 1    :   iAnimation = 17 :  iSound = 12
-        case 86   : jpeg_bkg = 1    :   iAnimation = 9   :  iSound = 13
-        case 88   : jpeg_bkg = 1    :   iAnimation = 7   :  iSound = 20
-        case else : jpeg_bkg = 1   :  iAnimation = 2   :  iSound = 17
-                  warnlog "Please insert the entrienumbers for '3D-graphics', 'Sounds' and one with normal files ( Animations )"
-    end select
-
-    '/// Open a new writer-doc
-    '/// Tools / Gallery
-    gApplication = "WRITER"
-    call hNewDocument
-    call hOpenGallery
-    '/// Delete one object in list-view and icon-view for 3D, Animation and Sound
-    for i=1 to 3
-        Kontext "Gallery"
-            if i=1 then
-                Gallerys.Select jpeg_bkg
-                printlog " selected gallery-theme : Backgrounds"
-            end if
-
-            if i=2 then
-                Gallerys.Select iAnimation
-                printlog " selected gallery-theme : Animation"
-            end if
-
-            if i=3 then
-                Gallerys.Select iSound
-                printlog " selected gallery-theme : Sound"
-            end if
-
-            for j=1 to 2
-                Kontext "Gallery"
-                    if j=1 then
-                        IconView.Click
-                        printlog "   Icon view"
-                        sleep 1
-                    end if
-                    if j=2 then
-                        ListView.Click
-                        printlog "   List view"
-                    end if
-
-                    for k=1 to 2
-                        Kontext "Gallery"
-                            sleep (1)
-                            View.MouseMove ( 5, 15 )
-                            View.TypeKeys "<SHIFT F10>" 'OpenContextMenu true
-                            hMenuSelectNr ( 4 )
-                            kontext "Active"
-                                if k=1 then
-                                    Active.No
-                                    printlog "      delete one object => no"
-                                else
-                                    Active.Yes
-                                    printlog "      delete one object => yes"
-                                end if
-                    next k
-            next j
-    next i
-    ToolsGallery
-    call hCloseDocument
-    'NOTE: Jump End NotForNetInst
-    NotForNetInst:
-endcase
-
-'-------------------------------------------------------------------------
-testcase tGallery_Quick_check
-
-    '/// Short check, if at least 2 files exist in the gallery, and if they are > 0 in size ///'
-    '/// One in the gallery folder itself and the other one in a subfolder. ///'
-    dim sFile(1) as string
-    dim i as integer
-
-    sFile(0) = ConvertPath ( gOfficeBasisPath + "share/gallery/apples.gif" ) '
-    sFile(1) = ConvertPath ( gOfficeBasisPath + "share/gallery/bullets/coffee_1.gif" ) '
-    '/// Open a new document
-    call hNewDocument
-    for i = 0 to 1
-    '/// Click to deselect any selected objects ///'
-        gMouseclick 1, 50
-        if FileExists(sFile(i)) then
-            if (FileLen(sFile(i)) > 0 ) then
-                call hGrafikEinfuegen ( sFile(i) )
-            else
-                warnlog "File lenght is 0: '" + sFile(i) + "'"
-            end if
-        else
-            warnlog "File doesn't exist: '" + sFile(i) + "'"
-        end if
-    next i
-    '///close the document
-    call hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/required/includes/global/gallery2.inc b/testautomation/graphics/required/includes/global/gallery2.inc
deleted file mode 100644
index 97f28a99849a..000000000000
--- a/testautomation/graphics/required/includes/global/gallery2.inc
+++ /dev/null
@@ -1,291 +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 : Checking all gallery themes
-'*
-'*****************************************************************
-'*
-' #1 tLoad100GalleryGraphicFiles  'Inserting 100 gallery graphics and checking the sizes
-' #1 tCheckAllGalleryGraphicFiles 'Checking the size ( > 0 Byte ) of all gallery-files.
-' #1 tInsertGalleryObjects        'Inserting random objects via contextmenu-insert-copy.
-' #0 LoadGraphic
-' #0 CheckGraphic
-' #0 makeNumOutOfText
-' #1 tSettingsToCM 'Measurement unit for textdocuments to cm
-' #1 tResetSettings 'Resetting the measurement unit for textdocuments.
-'*
-'\******************************************************************************
-
-testcase tSettingsToCM
-
-    printlog " Setting the measurement unit for textdocuments to cm."
-    printlog " +Tools / options / text documents / general"
-    ExitRestartTheOffice
-    WaitSlot (10000)
-    Call hNewDocument
-    ToolsOptions
-    hToolsOptions ( "WRITER", "General" )
-    iSaveSetting = Masseinheit.GetSelIndex
-    Masseinheit.Select 2
-    Kontext "ExtrasOptionenDlg"
-        ExtrasOptionenDlg.OK
-    Call hCloseDocument
-    
-endcase
-'-------------------------------------------------------------------------
-testcase tLoad100GalleryGraphicFiles
-
-    '/// Inserting all gallery graphics in a Writer document and checking the sizes.
-    Dim lsFiles (3000) as String
-    Dim lsGraphics (3000) as String
-    Dim i as Integer
-    Dim y as Integer
-    Dim t as Integer
-    Dim iCount as Integer
-    Dim corLoad as Boolean
-    Dim x as boolean
-
-    '/// Geting all installed gallery objects out of the installation in a list.
-    if gNetzInst = TRUE then
-        GetAllFileList ( ConvertPath ( gOfficeBasisPath + "share\gallery\" ), "*.*", lsFiles () )
-    else
-        GetAllFileList ( ConvertPath ( gOfficePath + "share\gallery\" ), "*.*", lsFiles () )
-    end if
-    call GetOnlyGraphics ( lsFiles (), lsGraphics() )
-    iCount = ListCount ( lsGraphics() )
-    printlog "   We have " + iCount + " graphics in the gallery."
-    '/// + Open a new document
-    call hNewDocument
-
-    for i = 1 to 100
-        for y = 1 to 1
-            randomize
-            t = Int((iCount*Rnd))
-            if (t<1) then 'just so we get it between 1 and the amount of items.
-                y = y - 1
-            end if
-        next y
-
-        corLoad = FALSE
-        try
-            '/// <i>Loop begin</i>
-            '/// + Inserting all gallery files and checking the sizes
-            '/// +- Iinsert / graphic / from file
-            '/// +- Check the size in 'format / graphics' on the <i>Type</i> tabpage
-            '/// +-- The size should noz be smaler than 17*25cm / photos 21*25cm
-            '///    + Deleting the graphic with &lt;delete&gt; of the keyboard
-            '/// <i>Loop ends</i>
-            x = LoadGraphic ( lsGraphics(t), corLoad )
-            sleep(1)
-            printlog
-        catch
-            ExceptLog
-            if corLoad = FALSE then
-                warnlog "Problems with " + lsGraphics(t)
-                ResetApplication
-                call hNewDocument
-            end if
-        endcatch
-        if (not x) then
-            printlog "   Tested nr: " + t + " : " + lsGraphics(t)
-        end if
-    next i
-
-    '/// Close the gallery ///'
-    ToolsGallery
-    WaitSlot (2000)
-    '/// Close the document ///'
-    call hCloseDocument
-endcase 'tLoadAllGalleryGraphicFiles
-
-'-------------------------------------------------------------------------
-
-testcase tCheckAllGalleryGraphicFiles
-'/// Checking the filesize of all gallery graphics.
-    Dim lsFiles (3000) as String
-    Dim lsGraphics (3000) as String
-    Dim i as Integer
-    Dim y as Integer
-    Dim t as Integer
-    Dim iCount as Integer
-    Dim corLoad as Boolean
-    Dim x as boolean
-
-    '/// Geting all installed gallery objects out of the installation in a list.
-    if gNetzInst = TRUE then
-        GetAllFileList ( ConvertPath ( gOfficeBasisPath + "share\gallery\" ), "*.*", lsFiles () )
-    else
-        GetAllFileList ( ConvertPath ( gOfficePath + "share\gallery\" ), "*.*", lsFiles () )
-    end if
-    call GetOnlyGraphics ( lsFiles (), lsGraphics() )
-    iCount = ListCount ( lsGraphics() )
-    printlog "   We have " + iCount + " graphics in the gallery."
-    '/// Open a new document
-    call hNewDocument
-
-    for i=1 to iCount
-        corLoad = FALSE
-        try
-            '/// <i>Loop begin</i>
-            '///+ Inserting all gallery files and checking the sizes
-            '///+- Iinsert / graphic / from file
-            '///+- Check the size in 'format / graphics' on the <i>Type</i> tabpage
-            '///+-- The size should noz be smaler than 17*25cm / photos 21*25cm
-            '///+ Deleting the graphic with &lt;delete&gt; of the keyboard
-            '/// <i>Loop ends</i>
-            x = CheckGraphic ( lsGraphics(i), corLoad )
-        catch
-            ExceptLog
-            if corLoad = FALSE then
-                warnlog "Problems with " + lsGraphics(i)
-                ResetApplication
-                call hNewDocument
-            end if
-        endcatch
-        if (not x) then
-            printlog "   Tested nr: " + i + " : " + lsGraphics(i)
-        end if
-    next i
-    '/// Close the gallery ///'
-    ToolsGallery
-    WaitSlot (2000)
-    '/// Close the document ///'
-    call hCloseDocument
-endcase 'tLoadAllGalleryGraphicFiles
-
-'-------------------------------------------------------------------------
-
-testcase tInsertGalleryObjects
-    Dim lsFiles (3000) as String
-    Dim lsGraphics (3000) as String
-    Dim CountOfThemes
-    Dim HowManyItems as Integer
-    Dim WhichOne as Integer
-    Dim CountOfItems as Integer
-    Dim ct as Integer
-    Dim i as Integer
-    Dim d as Integer
-    Dim iCount as Integer
-    Dim corLoad, x as Boolean
-
-    '/// 1. Select theme ///'
-    call hNewDocument
-    call hOpenGallery
-    kontext "Gallery"
-        CountOfThemes = Gallerys.GetItemCount
-        for ct = 1 to CountOfThemes
-            Gallerys.Select ct
-            printlog "   Selected Gallery-Theme nr: " + ct + ": " + Gallerys.GetSelText
-            kontext "Gallery"
-                CountOfItems = View.GetItemCount()
-                '/// 2. Choose if we should test 3,4 or 5 objects. ///'
-                for d = 1 to 1
-                    randomize
-                    HowManyItems=Int((5*Rnd)+(3*Rnd))
-                    if CountOfItems = 0 then
-                        QaErrorLog "   There were no objects in the the gallery-theme on position: " + ct
-                    else
-                        if (HowManyItems<3) then 'just so we get it between 3 and 5.
-                            d = d - 1
-                        else
-                            printlog "   Will now select and copy " + HowManyItems + " items from this Theme."
-                        end if
-                        for i = 1 to HowManyItems
-                            '/// 3. Select the objects ///'
-                            for x = 1 to 1
-                                randomize
-                                WhichOne=Int(CountOfItems*RND) '(5*Rnd)+(CountOfItems*Rnd))
-                                if (WhichOne<1) then 'just so we get it between 1 and the amount of items.  '>(CountOfItems + 1)) OR (WhichOne<1) then '
-                                    x = x - 1
-                                end if
-                            next x
-                            printlog "   Will copy object nr: " + WhichOne
-                            View.Mousemove (1,1)
-                            View.TypeKeys "<HOME>"
-                            View.TypeKeys "<RIGHT>", (WhichOne)
-                            kontext "GraphicObjectBar"
-                                if GraphicObjectBar.Exists then
-                                    if GraphicObjectBar.IsDocked = False then GraphicObjectBar.Dock
-                                end if
-                            kontext "Gallery"
-                                sleep (1)
-                                View.TypeKeys("<shift f10>")
-                                sleep (1)
-                                try
-                                    dim number as integer
-                                    number = MenuGetItemCount
-                                    if (number > 2) AND (number < 10) then
-                                        '/// 4. Copy the selected item into our document. ///'
-                                        hMenuSelectNr (1) 'Insert
-                                        hMenuSelectNr (1) 'As Copy
-                                        sleep (1)
-                                    else
-                                        Warnlog "   The contextmenu came up, but the number of entries were strange."
-                                        printlog "   Number of entries:" + number
-                                        MenuSelect(0)
-                                    end if
-                                catch
-                                    warnlog "   A contextmenu didnt come up for the gallery-theme on position: " + ct
-                                    i = HowManyItems
-                                endcatch
-                            '/// 5. Repeat 3.-5. until 2. is fulfilled. ///'
-                        next i
-                    end if 'if the theme didnt have any objects, we landed here.
-        next d
-        '/// 6. Change Theme. ///'
-        '/// 7. Repeat 2. - 8. until all themes are done. ///'
-    next ct
-
-    Kontext "Gallery"
-        if Gallery.Exists(2) then
-            ToolsGallery
-            WaitSlot (2000)
-        end if
-        
-    '/// Remove the last copied object. ///'
-    hTypeKeys "<DELETE>"
-    call hCloseDocument
-    
-endcase 'tInsertGalleryObjects
-
-'-------------------------------------------------------------------------
-testcase tResetSettings
-
-    printlog "Resetting the measurement unit for textdocuments."
-    printlog "+Tools / options / text documents / general"
-    call hNewDocument
-    ToolsOptions
-    hToolsOptions ( "WRITER", "General" )
-    Masseinheit.Select iSaveSetting
-    Kontext "ExtrasOptionenDlg"
-        ExtrasOptionenDlg.OK
-    call hCloseDocument
-    
-endcase 'tResetSettings
-'-------------------------------------------------------------------------
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index b8b5a6330f17..744c24fb9a86 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -161,43 +161,27 @@ testcase tiViewSlideMaster
     else
         warnlog( "Dialog <AutopilotPraesentation1> did not open" )
     endif
-    Kontext "Seitenlayout"  ' aka: Modify Slide
-
-    if ( Seitenlayout.exists( 5 ) ) then
-        warnlog "Slidelayout has to vanish; moved to sidebar"
-        hCloseDialog( Seitenlayout, "ok" )
-    endif
-
     kontext "DocumentImpress"
-    printlog "View->Slide "
+    
+    printlog "View->Slide"
     hUseAsyncSlot( "ViewSlide" )
     
-    printlog "View->Master->Drawing "
+    printlog "View->Master->Drawing"
     hUseAsyncSlot( "ViewDrawing" )
 
-    printlog "View->Slide "
+    printlog "View->Slide"
     hUseAsyncSlot( "ViewSlide" )
 
-    printlog "View->Master->Title "
-    try
-        ViewTitle
-        Errorlog "View - Master - Title Slide Master should NOT be accessable"
-    catch
-        printlog "View - Master - Title Slide Master not accessable - good"
-    endcatch
-
-    printlog "View->Slide "
-    hUseAsyncSlot( "ViewSlide" )
-
-    printlog "View->Master->Handout "
+    printlog "View->Master->Handout"
     hUseAsyncSlot( "ViewHandout" )
 
-    printlog "View->Master->Notes "
+    printlog "View->Master->Notes"
     hUseAsyncSlot( "ViewNotes" )
     kontext "DocumentImpress"
 
-    printlog "View->Slide "
+    printlog "View->Slide"
     hUseAsyncSlot( "ViewSlide" )
+    sleep 1
 
     printlog "close application "
     Call  hCloseDocument
diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc
index 2c55bc4c2f13..38fe040eca56 100644
--- a/testautomation/graphics/required/includes/impress/im_004_.inc
+++ b/testautomation/graphics/required/includes/impress/im_004_.inc
@@ -41,25 +41,30 @@ end sub
 
 testcase tiInsertSlideExpandSummary
 
-    printlog "open application "
+    printlog "open application"
     Call hNewDocument
-    printlog "View->Master View->Outline View "
+    printlog "View->Master View->Outline View"
     ViewWorkspaceOutlineView
-    WaitSlot()
+    Sleep 1
     Kontext "DocumentImpressOutlineView"
-    printlog "Type 2 rows "
+    printlog "Type 2 rows"
     DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi"
-    sleep(1)
-    printlog "View->Master View->Drawing View "
+    printlog "View->Master View->Drawing View"
     ViewWorkspaceDrawingView
-    WaitSlot()
-    printlog "Insert->Summery Slide "
+    Sleep 1
+    printlog "Insert->Summery Slide"
     InsertSummerySlide
-    WaitSlot()
-    printlog "Insert->Expand Slide "
+    Sleep 1
+    printlog "Making sure we are on the 3rd slide.."
+    kontext "slides"
+    SlidesControl.TypeKeys "<PAGEDOWN>", 2
+    sleep 1
+    kontext "DocumentImpress"
+    printlog "Insert->Expand Slide"
     InsertExpandSlide
-    WaitSlot( 3000 )
-    printlog "close application "
+    Sleep 2
+    printlog "close application"
     Call  hCloseDocument
-endcase
+
+endcase 'tiInsertSlideExpandSummary
 
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 373643b2e2f0..0caad76e7ec5 100644
--- a/testautomation/math/optional/includes/m_105.inc
+++ b/testautomation/math/optional/includes/m_105.inc
@@ -302,8 +302,8 @@ testcase tToolsCatalog
     dim bChecked as boolean
     dim sFileName as string
     dim sAllSymbols as string
-    dim lAllSymbols(100) as string
-    dim lAllSymbolsSort(100) as string
+    dim lAllSymbols(200) as string
+    dim lAllSymbolsSort(200) as string
     dim iTimeOut as integer
     dim sFilterName as string
     dim sFilter as string
@@ -335,8 +335,8 @@ testcase tToolsCatalog
             '/// There are 2 Symbol sets: 1. 'Greek' with 54 entries and 2. 'Special' with 12 entries ///'
             '///+ These symbol set names are availble in 2 listboxes 1. 'Old Symbol Set' and 2. 'Symbol Set' ///'
             iSymbolSets = OldSymbolSet.GetItemCount
-            if (iSymbolSets <> 2) then
-                WarnLog "- OldSymbolSet: '" + iSymbolSets + "' is not 2; expected is 2. ('Special' and 'Greek')"
+            if (iSymbolSets <> 3) then
+                WarnLog "- OldSymbolSet: '" + iSymbolSets + "' is not 3; expected is 3. ('Special' and 'Greek' and 'iGreek')"
                 for i = 1 to iSymbolSets
                     qaErrorLog "- " + i + ": '" + OldSymbolSet.GetItemText(i) + "'"
                 next i
@@ -452,8 +452,8 @@ testcase tToolsCatalog
             next j
         next i
 
-    if (listCount(lAllSymbols()) <> 66) then
-        warnlog "There have to be 66 Symbols, but there are: " + listCount(lAllSymbols())
+    if (listCount(lAllSymbols()) <> 106) then
+        warnlog "There have to be 106 Symbols, but there are: " + listCount(lAllSymbols())
     endif
     ' TODO: check sAllSymbols for not allowed characters!
     listCopy(lAllSymbols(),lAllSymbolsSort())
@@ -509,8 +509,8 @@ testcase tToolsCatalogNew
                 Kontext "EditSymbols"
                 if EditSymbols.exists then
                     iStartingSymbolSetCount = SymbolSet.getItemCount
-                    if iStartingSymbolSetCount <> 2 then
-                        qaErrorLog "There are already other symbolsets, instead of 2: " + iStartingSymbolSetCount
+                    if iStartingSymbolSetCount <> 3 then
+                        qaErrorLog "There are already other symbolsets, instead of 3: " + iStartingSymbolSetCount
                         for i = 1 to iStartingSymbolSetCount
                             printlog "("+i+"/"+iStartingSymbolSetCount+"): '" + SymbolSet.getItemText (i) + "'"
                         next i
@@ -673,8 +673,8 @@ testcase tToolsCatalogNew
         endif
             Kontext "SymboleMath"
             j = symbolset.getItemCount
-            if j <> 2 then
-                warnlog "There is a number != 2 of symbollists listed"
+            if j <> 3 then
+                warnlog "There is a number != 3 of symbollists listed"
             else
                 printlog "Everything is cleaned up."
             endif
diff --git a/testautomation/xml/optional/c_datapilot_pagefields.bas b/testautomation/xml/optional/c_datapilot_pagefields.bas
index 80c41c98b1db..5552322607f6 100755
--- a/testautomation/xml/optional/c_datapilot_pagefields.bas
+++ b/testautomation/xml/optional/c_datapilot_pagefields.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
 '*
 '* short description  :  Lookup for correct attributes of datapilot pagefields
 '*
diff --git a/testautomation/xml/optional/c_xml_print_scale.bas b/testautomation/xml/optional/c_xml_print_scale.bas
index 97a5eaab3e66..479ad76d255e 100755
--- a/testautomation/xml/optional/c_xml_print_scale.bas
+++ b/testautomation/xml/optional/c_xml_print_scale.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
 '*
 '* short description  :  Lookup for correct attributes for calc print scaling
 '*
diff --git a/testautomation/xml/optional/c_xml_scenario.bas b/testautomation/xml/optional/c_xml_scenario.bas
index 982e965ed483..c22ed31fb1db 100755
--- a/testautomation/xml/optional/c_xml_scenario.bas
+++ b/testautomation/xml/optional/c_xml_scenario.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
 '*
 '* short description  :  Lookup for correct attributes of calc scenarios
 '*
diff --git a/testautomation/xml/optional/calc_xml_7_export.bas b/testautomation/xml/optional/calc_xml_7_export.bas
index 2c85dd62a3d3..37cc950ec735 100755
--- a/testautomation/xml/optional/calc_xml_7_export.bas
+++ b/testautomation/xml/optional/calc_xml_7_export.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Export test for the Calc XML 6.0/7/OOo 1.x format
 '*
diff --git a/testautomation/xml/optional/ch_xml_japanese_candlestick.bas b/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
index 23cfea116bce..e9d824afe889 100755
--- a/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
+++ b/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
 '*
 '* short description  :  Detailed test of the chart types
 '*
diff --git a/testautomation/xml/optional/includes/c_xml_print_scale.inc b/testautomation/xml/optional/includes/c_xml_print_scale.inc
index b9e924a31f79..48201f17feb4 100644
--- a/testautomation/xml/optional/includes/c_xml_print_scale.inc
+++ b/testautomation/xml/optional/includes/c_xml_print_scale.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Check content.xml and styles.xml for correct print scaling settings
 '*
diff --git a/testautomation/xml/optional/includes/c_xml_scenario.inc b/testautomation/xml/optional/includes/c_xml_scenario.inc
index f98b8db41df9..ddaf8fbcd18c 100644
--- a/testautomation/xml/optional/includes/c_xml_scenario.inc
+++ b/testautomation/xml/optional/includes/c_xml_scenario.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : Check content.xml for correct scenario attributes
 '*
diff --git a/testautomation/xml/optional/includes/sxc7_01.inc b/testautomation/xml/optional/includes/sxc7_01.inc
index d32b7b357a5d..0dace41f0ca4 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_01.inc
+++ b/testautomation/xml/optional/includes/sxc7_01.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : XML Calc Include File
 '*
diff --git a/testautomation/xml/optional/includes/sxc7_02.inc b/testautomation/xml/optional/includes/sxc7_02.inc
index 304a15b2ab60..8696cb359954 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_02.inc
+++ b/testautomation/xml/optional/includes/sxc7_02.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : XML Calc Include File
 '*
diff --git a/testautomation/xml/optional/includes/sxc7_03.inc b/testautomation/xml/optional/includes/sxc7_03.inc
index e6c4d9945bd8..5c8661303cb3 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_03.inc
+++ b/testautomation/xml/optional/includes/sxc7_03.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
 '*
 '* short description : XML Calc Include File
 '*
diff --git a/testgraphical/prj/build.lst b/testgraphical/prj/build.lst
index 45fb77fd81ec..75878a6d9dd8 100755
--- a/testgraphical/prj/build.lst
+++ b/testgraphical/prj/build.lst
@@ -1,7 +1,7 @@
-gfxcmp    testgraphical     :       instsetoo_native NULL
+gfxcmp    testgraphical     :       instsetoo_native qadevOOo NULL
 gfxcmp    testgraphical                             usr1     -  all    gfxcmp_mkout NULL
 #gfxcmp    testgraphical\prechecks                   nmake    -  all    gfxcmp_pre NULL
 gfxcmp    testgraphical\ui\java\ConvwatchGUIProject nmake    -  all    gfxcmp_java_ui NULL
 gfxcmp    testgraphical\ui\java                     nmake    -  all    gfxcmp_java gfxcmp_java_ui NULL
 # gfxcmp    testgraphical\source                    nmake    -  all    gfxcmp_src gfxcmp_java NULL
-gfxcmp    testgraphical\qa\graphical                nmake    -  all    gfxcmp_qa gfxcmp_java NULL
+#i112751 gfxcmp    testgraphical\qa\graphical                nmake    -  all    gfxcmp_qa gfxcmp_java NULL