Removed unused qadevOOo BASIC test code

2224 files changed, 0 insertions, 108847 deletions

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 43a47408ab0b..4f59a0fae570 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Jar_add_jars,OOoRunner,\
 
 $(eval $(call gb_Jar_set_packageroot,OOoRunner,\
 	base \
-	basicrunner \
 	complex \
 	complexlib \
 	convwatch \
@@ -65,23 +64,11 @@ $(eval $(call gb_Jar_set_packageroot,OOoRunner,\
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
-    qadevOOo/runner/base/basic_fat \
     qadevOOo/runner/base/java_cmp \
     qadevOOo/runner/base/java_complex \
     qadevOOo/runner/base/java_fat \
     qadevOOo/runner/base/java_fat_service \
     qadevOOo/runner/base/TestBase \
-    qadevOOo/runner/basicrunner/BasicException \
-    qadevOOo/runner/basicrunner/BasicHandler \
-    qadevOOo/runner/basicrunner/BasicHandlerProvider \
-    qadevOOo/runner/basicrunner/basichelper/AttributeList \
-    qadevOOo/runner/basicrunner/basichelper/Connector \
-    qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor \
-    qadevOOo/runner/basicrunner/basichelper/DocumentHandler \
-    qadevOOo/runner/basicrunner/basichelper/Filter \
-    qadevOOo/runner/basicrunner/basichelper/ThreadRunner \
-    qadevOOo/runner/basicrunner/BasicIfcTest \
-    qadevOOo/runner/basicrunner/BasicTestCase \
     qadevOOo/runner/complexlib/Assurance \
     qadevOOo/runner/complexlib/ComplexTestCase \
     qadevOOo/runner/complexlib/MethodThread \
diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk
index 7a51d06d12e7..63d11598fa32 100644
--- a/qadevOOo/Jar_OOoRunnerLight.mk
+++ b/qadevOOo/Jar_OOoRunnerLight.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Jar_add_jars,OOoRunnerLight,\
 
 $(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\
 	base \
-	basicrunner \
 	complexlib \
 	convwatch \
 	graphical \
@@ -62,23 +61,11 @@ $(eval $(call gb_Jar_set_packageroot,OOoRunnerLight,\
 ))
 
 $(eval $(call gb_Jar_add_sourcefiles,OOoRunnerLight,\
-    qadevOOo/runner/base/basic_fat \
     qadevOOo/runner/base/java_cmp \
     qadevOOo/runner/base/java_complex \
     qadevOOo/runner/base/java_fat \
     qadevOOo/runner/base/java_fat_service \
     qadevOOo/runner/base/TestBase \
-    qadevOOo/runner/basicrunner/BasicException \
-    qadevOOo/runner/basicrunner/BasicHandler \
-    qadevOOo/runner/basicrunner/BasicHandlerProvider \
-    qadevOOo/runner/basicrunner/basichelper/AttributeList \
-    qadevOOo/runner/basicrunner/basichelper/Connector \
-    qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor \
-    qadevOOo/runner/basicrunner/basichelper/DocumentHandler \
-    qadevOOo/runner/basicrunner/basichelper/Filter \
-    qadevOOo/runner/basicrunner/basichelper/ThreadRunner \
-    qadevOOo/runner/basicrunner/BasicIfcTest \
-    qadevOOo/runner/basicrunner/BasicTestCase \
     qadevOOo/runner/complexlib/Assurance \
     qadevOOo/runner/complexlib/ComplexTestCase \
     qadevOOo/runner/complexlib/MethodThread \
diff --git a/qadevOOo/runner/base/basic_fat.java b/qadevOOo/runner/base/basic_fat.java
deleted file mode 100644
index 74a6708cf801..000000000000
--- a/qadevOOo/runner/base/basic_fat.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*************************************************************************
- *
- * 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 base;
-
-
-import basicrunner.BasicIfcTest;
-import basicrunner.BasicTestCase;
-
-import com.sun.star.lang.XMultiServiceFactory;
-
-import helper.APIDescGetter;
-import helper.AppProvider;
-import helper.OfficeProvider;
-import helper.OfficeWatcher;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.PrintWriter;
-
-import java.util.Vector;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import share.DescEntry;
-import share.DescGetter;
-import share.LogWriter;
-
-import stats.OutProducerFactory;
-import stats.Summarizer;
-
-import util.DynamicClassLoader;
-
-/**
- * The testbase for executing basic tests.
- *  @see lib.TestBase
- */
-public class basic_fat implements TestBase
-{
-
-    public static boolean debug = false;
-
-    /**
-     *  Execute a test.
-     *  @param param The test parameters.
-     * @return True, if the test was executed.
-     */
-    public boolean executeTest(TestParameters param)
-    {
-        DescGetter dg = new APIDescGetter();
-        String job = (String) param.get("TestJob");
-        OfficeProvider office = null;
-        debug = param.getBool("DebugIsActive");
-
-
-        //get Job-Descriptions
-        System.out.print("Getting Descriptions for Job: " + job + " from ");
-
-        DescEntry[] entries = dg.getDescriptionFor(job,
-                (String) param.get(
-                "DescriptionPath"),
-                debug);
-
-        if (entries == null)
-        {
-            System.out.println("Couldn't get Description for Job");
-
-            return false;
-        }
-
-        String ExclusionFile = (String) param.get("ExclusionList");
-        Vector exclusions = null;
-
-        if (ExclusionFile != null)
-        {
-            exclusions = getExclusionList(ExclusionFile, debug);
-        }
-
-        String conStr = (String) param.get("ConnectionString");
-        System.out.println("");
-        System.out.print("> Connecting the Office ");
-        System.out.println("With " + conStr);
-
-        for (int l = 0; l < entries.length; l++)
-        {
-            if (entries[l].hasErrorMsg)
-            {
-                System.out.println(entries[l].ErrorMsg);
-
-                continue;
-            }
-
-            office = new OfficeProvider();
-
-            XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager(
-                    param);
-
-            if (msf == null)
-            {
-                return false;
-            }
-
-            param.put("ServiceFactory", msf);
-
-            DescEntry entry = entries[l];
-
-            //get some helper classes
-            Summarizer sumIt = new Summarizer();
-            DynamicClassLoader dcl = new DynamicClassLoader();
-
-            TestCase tCase = null;
-
-            tCase = (TestCase) new BasicTestCase(entry);
-
-            if (tCase == null)
-            {
-                sumIt.summarizeDown(entry, entry.ErrorMsg);
-
-                LogWriter sumObj = OutProducerFactory.createOutProducer(param);
-                sumObj.initialize(entry, true);
-                sumObj.summary(entry);
-
-                continue;
-            }
-
-            System.out.println("Creating: " + tCase.getObjectName());
-
-            LogWriter log = (LogWriter) dcl.getInstance(
-                    (String) param.get("LogWriter"));
-            log.initialize(entry, true);
-            entry.UserDefinedParams = param;
-            tCase.setLogWriter((PrintWriter) log);
-
-            try
-            {
-                tCase.initializeTestCase(param);
-            }
-            catch (RuntimeException e)
-            {
-                helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                        "AppProvider");
-
-                if (ph != null)
-                {
-                    OfficeWatcher ow = (OfficeWatcher) param.get("Watcher");
-
-                    if ((ow != null) && ow.isAlive())
-                    {
-                        ow.finish = true;
-                    }
-
-                    ph.kill();
-                    shortWait(5000);
-                }
-
-                continue;
-            }
-
-            TestEnvironment tEnv = tCase.getTestEnvironment(param);
-
-            if (tEnv == null)
-            {
-                sumIt.summarizeDown(entry, "Unable to create testcase");
-
-                LogWriter sumObj = OutProducerFactory.createOutProducer(param);
-                sumObj.initialize(entry, true);
-                sumObj.summary(entry);
-
-                helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                        "AppProvider");
-
-                if (ph != null)
-                {
-                    OfficeWatcher ow = (OfficeWatcher) param.get("Watcher");
-
-                    if ((ow != null) && ow.isAlive())
-                    {
-                        ow.finish = true;
-                    }
-
-                    ph.kill();
-                    shortWait(5000);
-                }
-
-                continue;
-            }
-
-            System.out.println("created " + tCase.getObjectName());
-
-            for (int j = 0; j < entry.SubEntryCount; j++)
-            {
-                if (!entry.SubEntries[j].isToTest)
-                {
-                    Summarizer.summarizeDown(entry.SubEntries[j],
-                            "not part of the job");
-
-                    continue;
-                }
-
-                if ((exclusions != null) &&
-                        (exclusions.contains(entry.SubEntries[j].longName)))
-                {
-                    Summarizer.summarizeDown(entry.SubEntries[j],
-                            "known issue");
-
-                    continue;
-                }
-
-                System.out.println("running: " +
-                        entry.SubEntries[j].entryName);
-
-                LogWriter ifclog = (LogWriter) dcl.getInstance(
-                        (String) param.get("LogWriter"));
-                ifclog.initialize(entry.SubEntries[j], true);
-                entry.SubEntries[j].UserDefinedParams = param;
-                entry.SubEntries[j].Logger = ifclog;
-
-                if ((tEnv == null) || tEnv.isDisposed())
-                {
-                    helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                            "AppProvider");
-
-                    if (ph != null)
-                    {
-                        office.closeExistingOffice(param, true);
-                        shortWait(5000);
-                    }
-
-                    tEnv = getEnv(entry, param);
-                }
-
-                BasicIfcTest ifc = null;
-                lib.TestResult res = null;
-                ifc = new BasicIfcTest(entry.SubEntries[j].longName);
-                res = ifc.run(entry.SubEntries[j], tEnv, param);
-
-                sumIt.summarizeUp(entry.SubEntries[j]);
-
-                LogWriter sumIfc = OutProducerFactory.createOutProducer(param);
-
-                sumIfc.initialize(entry.SubEntries[j], true);
-                sumIfc.summary(entry.SubEntries[j]);
-            }
-
-            try
-            {
-                tCase.cleanupTestCase(param);
-            }
-            catch (Exception e)
-            {
-                log.println("TestCase already gone");
-
-                helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                        "AppProvider");
-
-                if (ph != null)
-                {
-                    office.closeExistingOffice(param, true);
-                    shortWait(5000);
-                }
-            }
-
-            sumIt.summarizeUp(entry);
-
-            LogWriter sumObj = OutProducerFactory.createOutProducer(param);
-            sumObj.initialize(entry, true);
-            sumObj.summary(entry);
-        }
-
-        if (entries.length > 1)
-        {
-            System.out.println();
-
-            int counter = 0;
-            System.out.println(
-                    "Failures that appeared during scenario execution:");
-
-            for (int i = 0; i < entries.length; i++)
-            {
-                if (!entries[i].State.endsWith("OK"))
-                {
-                    System.out.println("\t " + entries[i].longName);
-                    counter++;
-                }
-            }
-
-            System.out.println(counter + " of " + entries.length +
-                    " tests failed");
-        }
-
-        helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                "AppProvider");
-
-        if (ph != null)
-        {
-            office.closeExistingOffice(param, true);
-        }
-
-        return true;
-    }
-
-    protected TestEnvironment getEnv(DescEntry entry, TestParameters param)
-    {
-        DynamicClassLoader dcl = new DynamicClassLoader();
-        String officeProviderName = (String) param.get("OfficeProvider");
-        AppProvider office = (AppProvider) dcl.getInstance(officeProviderName);
-
-        if (office == null)
-        {
-            System.out.println("ERROR: Wrong parameter 'OfficeProvider', " +
-                    " it cannot be instantiated.");
-            System.exit(-1);
-        }
-
-        XMultiServiceFactory msf = (XMultiServiceFactory) office.getManager(
-                param);
-
-        if (msf == null)
-        {
-            return null;
-        }
-
-        param.put("ServiceFactory", msf);
-
-        TestCase tCase = (TestCase) new BasicTestCase(entry);
-
-        System.out.println("Creating: " + tCase.getObjectName());
-
-        LogWriter log = (LogWriter) dcl.getInstance(
-                (String) param.get("LogWriter"));
-        log.initialize(entry, true);
-        entry.UserDefinedParams = param;
-        tCase.setLogWriter((PrintWriter) log);
-
-        TestEnvironment tEnv = null;
-
-        try
-        {
-            tCase.initializeTestCase(param);
-            tEnv = tCase.getTestEnvironment(param);
-        }
-        catch (java.lang.RuntimeException e)
-        {
-            System.out.println(e.getMessage());
-
-            helper.ProcessHandler ph = (helper.ProcessHandler) param.get(
-                    "AppProvider");
-
-            if (ph != null)
-            {
-                office.closeExistingOffice(param, true);
-                shortWait(5000);
-            }
-
-            entry.ErrorMsg = e.getMessage();
-            entry.hasErrorMsg = true;
-        }
-
-        return tEnv;
-    }
-
-    protected void shortWait(int millis)
-    {
-        try
-        {
-            Thread.sleep(millis);
-        }
-        catch (java.lang.InterruptedException ie)
-        {
-        }
-    }
-
-    protected Vector getExclusionList(String url, boolean debug)
-    {
-        Vector entryList = new Vector();
-        String line = "#";
-        BufferedReader exclusion = null;
-
-        try
-        {
-            exclusion = new BufferedReader(new FileReader(url));
-        }
-        catch (java.io.FileNotFoundException fnfe)
-        {
-            if (debug)
-            {
-                System.out.println("Couldn't find file " + url);
-            }
-
-            return entryList;
-        }
-
-        while (line != null)
-        {
-            try
-            {
-                if (!line.startsWith("#"))
-                {
-                    entryList.add(line);
-                }
-
-                line = exclusion.readLine();
-            }
-            catch (java.io.IOException ioe)
-            {
-                if (debug)
-                {
-                    System.out.println(
-                            "Exception while reading exclusion list");
-                }
-
-                return entryList;
-            }
-        }
-
-        try
-        {
-            exclusion.close();
-        }
-        catch (java.io.IOException ioe)
-        {
-            if (debug)
-            {
-                System.out.println("Couldn't close file " + url);
-            }
-
-            return entryList;
-        }
-
-        return entryList;
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/BasicException.java b/qadevOOo/runner/basicrunner/BasicException.java
deleted file mode 100644
index 419e26461916..000000000000
--- a/qadevOOo/runner/basicrunner/BasicException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner;
-
-/** An exception while executing a Basic test.
- */
-public class BasicException extends Throwable {
-    /** Detailed information about the exception.
-     */
-  public String info;
-
-  /** Constructor with detailed information.
-   * @param info Information about the exception.
-   */
-  public BasicException(String info) {
-      this.info = info;
-  }
-}
\ No newline at end of file
diff --git a/qadevOOo/runner/basicrunner/BasicHandler.java b/qadevOOo/runner/basicrunner/BasicHandler.java
deleted file mode 100644
index a0f5f5e405fc..000000000000
--- a/qadevOOo/runner/basicrunner/BasicHandler.java
+++ /dev/null
@@ -1,612 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner;
-
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.connection.ConnectionSetupException;
-import com.sun.star.container.ContainerEvent;
-import com.sun.star.container.XContainer;
-import com.sun.star.container.XContainerListener;
-import com.sun.star.container.XNameContainer;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XDesktop;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XChangesBatch;
-import java.util.Hashtable;
-import lib.TestParameters;
-
-import share.LogWriter;
-
-
-/**
- * This class is a java-part of BASIC-java interaction "driver"
- * It is used to call Star-Basic's function from java using
- * basic's part of "driver" where listeners are implemented.
- * The instance of the BasicHandler should be added to the MSF that will be
- * used for loading BASIC's part of "driver".<br>
- * After opening basic's document it creates an instance of the
- * HandlerContainer using BasicHandler. HandlerContainer is a UNO
- * XContainer and XNameContainer.
- * Only one instance of BasicHandler can be used at the moment.
- * @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.lang.XSingleServiceFactory
- */
-public class BasicHandler implements XServiceInfo, XSingleServiceFactory {
-    /**
-     * serviceName is the name of service that can be created in BASIC.
-     */
-    static final String serviceName =
-                            "com.sun.star.jsuite.basicrunner.BasicHandler";
-
-    /**
-     * <code>container</code> is a SHARED variable (between BASIC and Java).
-     * It is used for interacting.
-     */
-    static private HandlerContainer container = null;
-
-    /**
-     * Contains a writer to log an information about the interface testing, to
-     * allows for tests to access it.
-     */
-    static private LogWriter log;
-
-    /**
-     * <code>oHandlerDoc</code> is a referrence to BASIC's document.
-     */
-    static private XComponent oHandlerDoc = null;
-
-    /**
-     * <code>xMSF</code> is a MultiServiceFactory currently used by
-     * BasicHandler.
-     */
-    static private XMultiServiceFactory xMSF = null;
-
-    /**
-     * Interface being tested now.
-     */
-    static private BasicIfcTest TestedInterface = null;
-
-    /**
-     * Ab enhanced scheme of timeouts can be used with BASIC tests.
-     * A small timeout can be used zo wait for changes in the test status.
-     * <code>respFlag</code> is set to <code>true</code> when a BASIC test
-     * writes any log information.
-     */
-    static private boolean respFlag = false;
-
-    /**
-     * <code>iBasicTimeout</code> is the amount of milliseconds that
-     * the BasicHandler will wait for a response from tests
-     * (finish to execute a method or add log information)
-     * before it decides that SOffice is dead.
-     */
-    static private int iBasicTimeout = 10000;
-
-
-
-    /**
-     * Creates an instance of a HandlerContainer. This instance is used from
-     * BASIC.
-     * @param tParam The test parameters.
-     */
-    public BasicHandler(TestParameters tParam) {
-        if (tParam.get("soapi.test.basic.debugFile") != null) {
-            iBasicTimeout = 0; // Debug mode.
-        }
-        container = new HandlerContainer(this);
-    }
-
-    /**
-     * Set the tested interface and a log writer.
-     * @param ifc The test of an interface
-     * @param log A log writer.
-     */
-    public void setTestedInterface(BasicIfcTest ifc, LogWriter log) {
-        this.log = log;
-        TestedInterface = ifc;
-    }
-
-    /**
-     * Is called when BASIC signals that it has performed the test of a method.
-     * @param methodName The name of the method.
-     * @bResult The result of the test.
-     */
-    synchronized void methodTested(String methodName, boolean bResult) {
-        respFlag = true;
-        TestedInterface.methodTested(methodName, bResult);
-        notify() ;
-    }
-
-    /**
-     * Is called when BASIC sends a signal to write some log information.
-     * @param info The string to write.
-     */
-    synchronized public void Log(String info) {
-        respFlag = true;
-        log.println(info);
-        notify() ;
-    }
-
-    /**
-     * Is called by BasicIfcTest to find out if this BasicHandler uses the
-     * correct MultiServiceFactory.
-     * @param xMSF The MultiServiceFactory
-     * @see com.sun.star.lang.XMultiServiceFactory
-     * @return True, if xMSF is equal to the MultiServiceFactory of this class.
-     */
-    public boolean isUptodate(XMultiServiceFactory xMSF) {
-        return xMSF.equals(this.xMSF);
-    }
-
-
-    /**
-     * Establishes a connection between BASIC and Java.
-     * If required, hte BASIC part of the "driver" is loaded.
-     * @param sBasicBridgeURL The URL of the basic bridge document
-     *                                           (BasicBridge.sxw)
-     * @param tParam The test parameters.
-     * @param xMSF The MultiServiceFactory
-     * @param log The log writer.
-     * @see com.sun.star.lang.XMultiServiceFactory
-     * @throws ConnectionSetupException Exception is thrown, if no connection could be made.
-     */
-    public synchronized void Connect(String sBasicBridgeURL,
-                            TestParameters tParam, XMultiServiceFactory xMSF,
-                            LogWriter log) throws ConnectionSetupException {
-        this.log = log;
-        try {
-            this.xMSF = xMSF;
-            Object oInterface = xMSF.createInstance(
-                                                "com.sun.star.frame.Desktop");
-            XDesktop oDesktop = (XDesktop) UnoRuntime.queryInterface(
-                                                XDesktop.class, oInterface);
-            XComponentLoader oCLoader = (XComponentLoader)
-                                        UnoRuntime.queryInterface(
-                                        XComponentLoader.class, oDesktop);
-
-            // load BasicBridge with MarcoEceutionMode = Always-no warn
-            //PropertyValue[] DocArgs = null;
-            PropertyValue[] DocArgs = new PropertyValue[1];
-            PropertyValue DocArg = new PropertyValue();
-            DocArg.Name = "MacroExecutionMode";
-            DocArg.Value = new Short(
-                    com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN);
-            DocArgs[0] = DocArg;
-
-            // configure Office to allow to execute macos
-            PropertyValue [] ProvArgs = new PropertyValue [1];
-            PropertyValue Arg = new PropertyValue();
-            Arg.Name = "nodepath";
-            Arg.Value = "/org.openoffice.Office.Common/Security";
-            ProvArgs[0] = Arg;
-
-            Object oProvider = xMSF.createInstance(
-                        "com.sun.star.configuration.ConfigurationProvider");
-
-            XMultiServiceFactory oProviderMSF = (XMultiServiceFactory)
-                                    UnoRuntime.queryInterface(
-                                    XMultiServiceFactory.class, oProvider);
-
-            Object oSecure = oProviderMSF.createInstanceWithArguments(
-                        "com.sun.star.configuration.ConfigurationUpdateAccess",
-                        ProvArgs);
-
-            XPropertySet oSecureProps = (XPropertySet)
-                        UnoRuntime.queryInterface(XPropertySet.class, oSecure);
-
-            Object oScripting = oSecureProps.getPropertyValue("Scripting");
-            XPropertySet oScriptingSettings = (XPropertySet)
-                    UnoRuntime.queryInterface(XPropertySet.class, oScripting);
-
-            oScriptingSettings.setPropertyValue("Warning", Boolean.FALSE);
-            oScriptingSettings.setPropertyValue("OfficeBasic", new Integer(2));
-
-            XChangesBatch oSecureChange = (XChangesBatch)
-                    UnoRuntime.queryInterface(XChangesBatch.class, oSecure);
-            oSecureChange.commitChanges();
-
-            // As we want to have some information about a debugFile
-            // BEFORE connection is established
-            // we pass the information about it in frame name.
-            String sFrameName = (String)tParam.get(
-                                                "soapi.test.basic.debugFile");
-            if (sFrameName == null) sFrameName = "BasicRunner";
-
-            oHandlerDoc = oCLoader.loadComponentFromURL(sBasicBridgeURL,
-                                                    sFrameName, 40, DocArgs);
-
-            do {
-                respFlag = false ;
-                wait(10000); // waiting for basic response for 10 seconds.
-            } while (respFlag && !container.hasByName("BASIC_Done")) ;
-
-            if (!container.hasByName("BASIC_Done")) {
-                throw new ConnectionSetupException("Connection timed out.");
-            }
-        } catch (Exception e) {
-            System.out.println("Exception: " + e.toString());
-            throw new ConnectionSetupException();
-        }
-
-        log.println("Java-BASIC connection established!");
-    }
-
-    /**
-     * Overloads perform(Strin fName, Object params) for convenience.
-     * @return A proprty value as result.
-     *
-    public synchronized PropertyValue perform(String fName)
-                                                        throws BasicException {
-        return perform(fName, "");
-    }
-*/
-    /**
-     * Perform a test of a method.
-     * @param fName The name of the method to test.
-     * @param params The test parameters.
-     * @return A proprty value as result of the test.
-     * @throws BasicException The method could not be executed.
-     */
-    public synchronized PropertyValue perform(String fName, Object params)
-                                                        throws BasicException {
-        try {
-            container.callBasicFunction(fName, params);
-
-            do {
-                respFlag = false;
-                // waiting for basic response for iBasicTimeout milliseconds.
-                wait(iBasicTimeout);
-            } while(respFlag && !container.hasByName("BASIC_Done"));
-
-        } catch (InterruptedException e) {
-            System.out.println("The operation " + fName + " was interrupted.");
-        } catch (com.sun.star.lang.DisposedException de) {
-            System.out.println("## Office is disposed");
-        }
-
-        if (!container.hasByName("BASIC_Done")) {
-            System.out.println("Operation timed out.");
-                throw new BasicException(
-                            "Operation timed out.");
-        }
-
-        Object res = container.getByName("BASIC_Done") ;
-        container.removeByName("BASIC_Done");
-
-        if (!(res instanceof PropertyValue)) {
-            if (res == null) {
-                System.out.println(
-                            "BasicBridge returns null");
-                throw new BasicException(
-                            "BasicBridge returns null");
-            } else {
-                System.out.println(
-                            "BasicBridge returns wrong type: " + res.getClass());
-                throw new BasicException(
-                            "BasicBridge returns wrong type: " + res.getClass());
-            }
-        }
-
-        PropertyValue result = (PropertyValue) res ;
-
-        if ((result.Value instanceof String) && (((String)result.Value)).startsWith("Exception")) {
-            throw new BasicException((String)result.Value);
-        }
-
-        return result;
-    }
-
-    /**
-     * Returns true, if name is a supported service of this class.
-     * @param name The service name.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return serviceName.equals(name);
-    }
-
-    /**
-     * Return all supported service names.
-     * @return All supported services.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {serviceName};
-    }
-
-    /**
-     * Get the implementation name.
-     * @return Implementation name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-
-    /**
-     * Create an instance of HandlerContainer.
-     * Arguments are not supported here, so they will be ignored.
-     * @param args The arguments.
-     * @return The instance.
-     */
-    public Object createInstanceWithArguments(Object[] args) {
-        return container;
-    }
-
-    /**
-     * Create an instance of HandlerContainer.
-     * @return The instance.
-     */
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    /**
-     * Dispose the BASIC document.
-     */
-    public synchronized void dispose() {
-        try {
-            if (oHandlerDoc != null) {
-                //oHandlerDoc.dispose();
-                util.DesktopTools.closeDoc(oHandlerDoc);
-                wait(1000);
-            }
-        } catch (Exception e) {
-            System.out.println("Exception: " + e.toString());
-        }
-    }
-}
-
-
-/**
- * This class handles the communication between Java and BASIC.
- * @see com.sun.star.container.XContainer
- * @see com.sun.star.container.XNameContainer
- * @see com.sun.star.lang.XTypeProvider
- */
-class HandlerContainer implements XContainer, XNameContainer, XTypeProvider{
-
-    /** Container for parameters.
-     **/
-    Hashtable container = new Hashtable(20);
-    /**
-     * An array of listeners for container events.
-     * @see com.sun.star.container.XContainerListener
-     */
-    static XContainerListener[] listener = null;
-
-    /** The BasicHandler belonging to this handler. **/
-    BasicHandler parent = null;
-
-    /**
-     * Constructor with the parent BasicHandler.
-     * @param par The BasicHandler.
-     */
-    public HandlerContainer(BasicHandler par) {
-        parent = par;
-    }
-
-    /**
-     * Call a BASIC function, meaning a test method.
-     * @param fName The method name.
-     * @param args Arguments for the method.
-     */
-    public void callBasicFunction(String fName, Object args) {
-        // BASIC's listener should be called ONLY in this case.
-        if (container.containsKey(fName)) {
-            container.remove(fName);
-        }
-        container.put(fName, args);
-        if (listener != null) {
-            ContainerEvent event = new ContainerEvent();
-            event.Element = fName;
-            for (int i=0; i<listener.length; i++){
-                if (listener[i] != null) {
-                    listener[i].elementInserted(event);
-                }
-            }
-        }
-    }
-
-    /**
-     * Insert an object into the container.
-     * @param name The key for the object.
-     * @param object The object to insert.
-     * @throws IllegalArgumentException Throws this exception when trying to insert null.
-     */
-    public void insertByName(String name, Object object) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.container.ElementExistException, com.sun.star.lang.WrappedTargetException {
-
-        // BASIC and Java can insert into the container.
-        if (container.containsKey(name)) {
-            container.remove(name);
-        }
-        container.put(name, object);
-
-        PropertyValue result = null ;
-
-        if (object instanceof PropertyValue) {
-            result = (PropertyValue)object;
-            if (name.equals("BASIC_Done")) {
-                synchronized (parent) {
-                    parent.notify();
-                }
-            } else if (name.equals("BASIC_MethodTested")) {
-                parent.methodTested(result.Name,
-                                ((Boolean)result.Value).booleanValue());
-            }
-        } else if (name.equals("BASIC_Log")) {
-            parent.Log(object.toString());
-        }
-    }
-
-    /**
-     * Remove the object with this name from the container.
-     * @param name The key.
-     */
-    public void removeByName(String name) {
-        container.remove(name) ;
-    }
-
-    /**
-     * Unsupported method.
-     * @param name The name of the key.
-     * @param value The value.
-     * @throws WrappedTargetException Throws this exception when called falsely.
-     */
-    public void replaceByName(String name, Object value)
-                                          throws WrappedTargetException {
-        throw new WrappedTargetException("Unsupported");
-    }
-
-    /**
-     * Has a value for this key.
-     * @param name The name of a key.
-     * @return True, if name exists as key in the container.
-     */
-    public boolean hasByName(String name) {
-        return container.containsKey(name);
-    }
-
-    /**
-     * Get an object by its key.
-     * @param name The name of the key.
-     * @return The object of this key.
-     */
-    public Object getByName(String name) {
-        return container.get(name);
-    }
-
-    /**
-     * Get all key names.
-     * @return All names of keys.
-     */
-    public String[] getElementNames() {
-        String[] res = new String[container.size()];
-        return (String[])container.keySet().toArray(res);
-    }
-
-    /**
-     * Is the xcontainer empty?
-     * @return True, if the container has elements.
-     */
-    public boolean hasElements() {
-        return !container.isEmpty();
-    }
-
-    /**
-     * Get the type of this class.
-     * @return The type of this class.
-     */
-    public Type getElementType() {
-        try {
-            return new Type(String.class);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * Get the implementation id of this class.
-     * @return A unique id for this class
-     * @see com.sun.star.lang.XTypeProvider
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Get all types of this class.
-     * @return All implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i) {
-            types[i] = new Type(interfaces[i]);
-        }
-        return types;
-    }
-
-    /**
-     * Add a listener
-     * @param xListener The listener.
-     */
-    public void addContainerListener(XContainerListener xListener){
-        int length = 0;
-        if (listener != null)
-            length = listener.length;
-
-        XContainerListener[] mListener =
-                        new XContainerListener[length+1];
-        for (int i=0; i<length-1; i++) {
-            mListener[i] = listener[i];
-            // listener already added
-            if (((Object)xListener).equals(listener[i]))
-                return;
-        }
-        mListener[length] = xListener;
-        listener = mListener;
-    }
-
-    /**
-     * Remove a listener
-     * @param xListener The listener.
-     */
-    public void removeContainerListener(XContainerListener xListener){
-        if (listener != null && listener.length != 0) {
-            int length = listener.length;
-            XContainerListener[] mListener =
-                                    new XContainerListener[length-1];
-            boolean found = false;
-            int j=0;
-            for (int i=0; i<length-1; i++) {
-                if (!((Object)xListener).equals(listener[j])) {
-                    mListener[i] = listener[j];
-                }
-                else {
-                    j++;
-                    found = true;
-                }
-                j++;
-            }
-            if (!found) {
-                if (((Object)xListener).equals(listener[length-1]))
-                    listener = mListener;
-            }
-            else
-                listener = mListener;
-
-        }
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java b/qadevOOo/runner/basicrunner/BasicHandlerProvider.java
deleted file mode 100644
index 9a6479d50f1d..000000000000
--- a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.container.XSet;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.container.ElementExistException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.connection.ConnectionSetupException;
-import lib.TestParameters;
-import share.LogWriter;
-import basicrunner.basichelper.Connector;
-import basicrunner.basichelper.DocumentHandler;
-import basicrunner.basichelper.ThreadRunner;
-import basicrunner.basichelper.AttributeList;
-import basicrunner.basichelper.Filter;
-import basicrunner.basichelper.DispatchProviderInterceptor;
-
-/**
- * This class provides a BasicHandler. All classes for the communication with
- * and handling of  the BASIC tests are instantiated and inserted int the
- * MultiServiceFactory of StarOffice.
- */
-public class BasicHandlerProvider {
-
-    /** The BassicHandler **/
-    static BasicHandler oHandler = null;
-    /** The Connector **/
-    static Connector oConnector = null;
-    /** The DocumentHandler **/
-    static DocumentHandler oDocumentHandler = null;
-    /** The Thread Runner **/
-    static ThreadRunner oThreadRunner = null;
-    /** The AttributeList **/
-    static AttributeList oAttributeList = null;
-    /** The Filter **/
-    static Filter oFilter = null;
-    /** The DispatchProviderInterceptor **/
-    static DispatchProviderInterceptor oCeptor = null ;
-    /** The MultiServiceFactory from StarOffice **/
-    static XMultiServiceFactory MSF = null;
-    /** IS this a new connection or an existing one? **/
-    static boolean bIsNewConnection = true;
-
-    /**
-     * Get a BasicHandler
-     * @param tParam Test parameters.
-     * @param log A log writer
-     * @return An instance of BasicHandler
-     */
-    static public BasicHandler getHandler(TestParameters tParam, LogWriter log) {
-
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
-
-        if (!xMSF.equals(MSF)) {
-            MSF = xMSF;
-            oHandler = new BasicHandler(tParam);
-            oConnector = new Connector();
-            oFilter = new Filter();
-            oDocumentHandler = new DocumentHandler();
-        oThreadRunner = new ThreadRunner(xMSF);
-            oCeptor = new DispatchProviderInterceptor() ;
-            oAttributeList = new AttributeList();
-            XSet xMSFSet = (XSet)UnoRuntime.queryInterface(XSet.class, xMSF);
-
-            try {
-                xMSFSet.insert(oHandler);
-                xMSFSet.insert(oConnector);
-                xMSFSet.insert(oFilter);
-                xMSFSet.insert(oDocumentHandler);
-        xMSFSet.insert(oThreadRunner);
-                xMSFSet.insert(oCeptor);
-                xMSFSet.insert(oAttributeList);
-            } catch (ElementExistException e) {
-                System.out.println(e.toString());
-            } catch (IllegalArgumentException e) {
-                System.out.println(e.toString());
-            }
-
-            try {
-                oHandler.Connect(util.utils.getFullURL((String)tParam.get("BASICBRIDGE")),
-                                                               tParam, xMSF, log);
-            } catch (ConnectionSetupException e) {
-                System.out.println("Can't connect to BASIC !");
-            }
-
-            bIsNewConnection = true;
-        } else {
-            bIsNewConnection = false;
-        }
-
-        return oHandler;
-    }
-
-    /**
-     * Is this a new connection?
-     * @return True, if the connection did not exist before.
-     */
-    static public boolean isNewConnection() {
-        return bIsNewConnection;
-    }
-
-    /**
-     * Dispose the BasicHandler
-     */
-    static public void disposeHandler() {
-
-        try {
-            if (oHandler != null) {
-                oHandler.dispose();
-            }
-            if (MSF != null) {
-                XSet xMSFSet = (XSet)UnoRuntime.queryInterface(XSet.class, MSF);
-                xMSFSet.remove(oHandler);
-                xMSFSet.remove(oFilter);
-                xMSFSet.remove(oConnector);
-                xMSFSet.remove(oDocumentHandler);
-        xMSFSet.remove(oThreadRunner);
-                xMSFSet.remove(oAttributeList);
-            }
-        } catch (Exception e){
-            System.out.println(e.toString());
-        }
-
-        MSF = null;
-        oHandler = null;
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/BasicIfcTest.java b/qadevOOo/runner/basicrunner/BasicIfcTest.java
deleted file mode 100644
index 8c75f8ff94f0..000000000000
--- a/qadevOOo/runner/basicrunner/BasicIfcTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner;
-
-import lib.TestResult;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import share.DescEntry;
-import share.LogWriter;
-
-import com.sun.star.lang.XMultiServiceFactory;
-
-import com.sun.star.beans.PropertyValue;
-
-
-/**
- * The BASIC interface test
- */
-public class BasicIfcTest {
-    /** The BasicHandler **/
-    static BasicHandler oBasicHandler = null;
-    /** The result orf the test **/
-    protected TestResult tRes;
-    /** the name of the test **/
-    protected String testName;
-
-    /** Constructor with test name.
-     * @param name The name of the test.
-     */
-    public BasicIfcTest(String name) {
-        testName = name;
-    }
-
-    /**
-     * Let the test run.
-     * @param xTestedEntry Informaton about the interface to test.
-     * @param tEnv The environment of the test.
-     * @param tParam The test parameters.
-     * @return A result of the test.
-     */
-    public TestResult run(DescEntry xTestedEntry, TestEnvironment tEnv,
-            TestParameters tParam) {
-
-        String sResult = "";
-
-        this.tRes = new TestResult();
-        LogWriter log = xTestedEntry.Logger;
-
-        // Get Handler, that was created during object creation.
-        try {
-            oBasicHandler = (BasicHandler)tEnv.getObjRelation("BasicHandler");
-        } catch (java.lang.NullPointerException e) {
-            log.println("No Component created");
-            return null;
-        }
-
-        if (!oBasicHandler.isUptodate((XMultiServiceFactory)tParam.getMSF())) {
-            // If Handler uses old MSF (in case of Office's GPF) then don't test
-            // interface.
-            return null;
-        }
-
-        boolean objectWasCreated = ((Boolean)tEnv.getObjRelation("objectCreated")).booleanValue();
-
-        if (objectWasCreated) {
-            oBasicHandler.setTestedInterface(this, log);
-
-            DescEntry methods[] = xTestedEntry.SubEntries;
-
-            String  names[] = new String[methods.length + 1];
-            boolean isOpt[] = new boolean[methods.length + 1];
-            String other[] = new String[1];
-
-            String aName = xTestedEntry.longName;
-            aName = aName.substring(aName.indexOf("::")+2);
-            int oldIndex = 0;
-            int index = aName.indexOf("::");
-            names[0] = "";
-            while(index!=-1) {
-                names[0] += aName.substring(oldIndex,index) + ".";
-                oldIndex=index+2;
-                index=aName.indexOf("::", oldIndex);
-            }
-            names[0] += aName.substring(oldIndex);
-            isOpt[0] = xTestedEntry.isOptional;
-
-            for (int i = 1; i < names.length; i++) {
-                names[i] = methods[i - 1].entryName;
-                isOpt[i] = methods[i - 1].isOptional;
-            }
-
-            // for reasons of compatibility with JSuite we change the first
-            // character of EntryType to upper case.
-            String eType = xTestedEntry.EntryType;
-            other[0] = eType.toUpperCase().charAt(0)+eType.substring(1);
-
-            Object params[] = {names, isOpt, other};
-
-            try {
-                PropertyValue Res = oBasicHandler.perform("testInterface", params);
-                sResult = (String)Res.Value;
-            } catch (BasicException e) {
-                log.println(e.info);
-                sResult = "SKIPPED.FAILED";
-            }
-        } else { // if object was not created...
-            sResult = "SKIPPED.FAILED";
-        }
-
-        // now tRes has all substates: collect them
-        DescEntry[] subs = xTestedEntry.SubEntries;
-        for (int i = 0; i < subs.length ; i++) {
-            if (sResult.equals("SKIPPED.FAILED"))
-                subs[i].State = "SKIPPED.FAILED";
-            else if (sResult.equals("SKIPPED.OK"))
-                subs[i].State = "SKIPPED.OK";
-            else
-                if (tRes.getStatusFor(subs[i].entryName) == null) {
-                    subs[i].State = "SKIPPED.FAILED";
-                } else {
-                    subs[i].State = tRes.getStatusFor(
-                                                subs[i].entryName).toString();
-                }
-        }
-
-        xTestedEntry.State = sResult;
-        return null;
-    }
-
-    /**
-     * Set the result of the method that is tested.
-     * @param methodName The name of the method.
-     * @param bResult The result of the test.
-     */
-    public void methodTested(String methodName, boolean bResult) {
-        tRes.tested(methodName, bResult);
-    }
-
-    /**
-     * @return The name of the interface or the service tested.
-     */
-    String getTestedClassName() {
-        return testName;
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/BasicTestCase.java b/qadevOOo/runner/basicrunner/BasicTestCase.java
deleted file mode 100644
index 1356badc12d7..000000000000
--- a/qadevOOo/runner/basicrunner/BasicTestCase.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner;
-
-import lib.TestCase;
-import lib.TestParameters;
-import lib.TestEnvironment;
-import share.DescEntry;
-import share.LogWriter;
-
-import com.sun.star.uno.XInterface;
-
-import java.io.PrintWriter;
-
-import com.sun.star.beans.PropertyValue;
-
-
-/**
- * The basic test case.
- */
-public class BasicTestCase extends TestCase {
-
-    /**
-     * Specifies the PrintWriter to log information.
-     */
-    public PrintWriter oLog;
-
-    /** The name of the test object **/
-    protected String objName;
-    /** The implementation name of the test object **/
-    protected String implName;
-    /** A BasicHandler **/
-    static BasicHandler oBasicHandler = null;
-
-    /**
-     * Constructor with the entry which is to test.
-     * @param entry The description entry.
-     */
-    public BasicTestCase(DescEntry entry) {
-        this.objName = entry.entryName;
-        this.implName = entry.longName;
-    }
-
-
-    /**
-     * Initialize the test case.
-     * The BasicHandler is talken from the test parameters and several
-     * parameters are initialized.
-     * @param tParam The test parameters.
-     * @param pLog A log writer.
-     */
-    protected void initialize(TestParameters tParam, PrintWriter pLog) {
-        // Create Handler ONLY here. If SOffice crashes,
-        // no new Handler will be created until new object's initialization.
-        this.oLog = pLog;
-        LogWriter log = (LogWriter)pLog;
-        oBasicHandler = BasicHandlerProvider.getHandler(tParam, log);
-        try {
-            oBasicHandler.perform("setValue",
-                        "cBASPath = \"" + tParam.get("BASICRESPTH") + "/\"");
-            oBasicHandler.perform("setValue",
-                        "cTestDocsDir = \"" + tParam.get("DOCPTH") + "/\"");
-            oBasicHandler.perform("setValue",
-                        "CNCSTR = \"" + tParam.get("CNCSTR") + "\"");
-            if (tParam.get("soapi.test.hidewindows") != null) {
-              oBasicHandler.perform("setValue",
-                        "soapi_test_hidewindows = true");
-            } else {
-              oBasicHandler.perform("setValue",
-                        "soapi_test_hidewindows = false");
-            }
-            //this parameters are used by testcases of db-driver components
-            oBasicHandler.perform("setValue", "dbaseUrl = \"sdbc:dbase:" +
-                tParam.get("dbase.url") + "\"");
-            oBasicHandler.perform("setValue", "flatUrl = \"sdbc:flat:" +
-                tParam.get("flat.url") + "\"");
-            oBasicHandler.perform("setValue", "calcUrl = \"sdbc:calc:" +
-                tParam.get("calc.url") + "\"");
-            oBasicHandler.perform("setValue", "odbcUrl = \"sdbc:odbc:" +
-                tParam.get("odbc.url") + "\"");
-            oBasicHandler.perform("setValue", "jdbcUrl = \"jdbc:" +
-                tParam.get("jdbc.url") + "\"");
-            oBasicHandler.perform("setValue", "jdbcUser = \"" +
-                tParam.get("jdbc.user") + "\"");
-            oBasicHandler.perform("setValue", "jdbcPassword = \"" +
-                tParam.get("jdbc.password") + "\"");
-            oBasicHandler.perform("setValue", "adabasUrl = \"sdbc:adabas:" +
-                tParam.get("adabas.url") + "\"");
-            oBasicHandler.perform("setValue", "adabasUser = \"" +
-                tParam.get("adabas.user") + "\"");
-            oBasicHandler.perform("setValue", "adabasPassword = \"" +
-                tParam.get("adabas.password") + "\"");
-            oBasicHandler.perform("setValue", "adoUrl = \"sdbc:ado:" +
-                tParam.get("ado.url") + "\"");
-            oBasicHandler.perform("setValue", "mozabUrl = \"sdbc:address:" +
-                tParam.get("mozab.url") + "\"");
-        } catch (BasicException e) {
-            log.println(e.info);
-            throw new RuntimeException(e.info);
-        }
-    }
-
-    /**
-     * Create the environment for the test. This is done by BASIC.
-     * @param tParam The test parameters.
-     * @param log A log writer.
-     * @return The test environment
-     */
-    protected TestEnvironment createTestEnvironment(TestParameters tParam,
-                                                          PrintWriter log) {
-
-        PropertyValue Res;
-        boolean bObjectWasCreated = false;
-
-        try {
-            oBasicHandler.perform("setValue",
-                        "cObjectImplementationName = \"" + implName + "\"");
-            Res = oBasicHandler.perform("createObject", objName);
-            bObjectWasCreated = ((Boolean)Res.Value).booleanValue();
-
-            if (!bObjectWasCreated) {
-                log.println("Couldn't create object");
-                throw new RuntimeException("Couldn't create object");
-            }
-
-        } catch (BasicException e) {
-            log.println(e.info);
-            bObjectWasCreated = false;
-            throw new RuntimeException(e.info);
-        }
-
-        TestEnvironment tEnv = new TestEnvironment(new XInterface(){});
-        tEnv.addObjRelation("objectCreated", new Boolean(bObjectWasCreated));
-        tEnv.addObjRelation("BasicHandler", oBasicHandler);
-        return tEnv;
-    }
-
-    /**
-     * BASIC is told to dispose the test object.
-     * @param tParam The test parameters.
-     */
-
-    public void cleanupTestCase(TestParameters tParam) {
-        PropertyValue Res;
-        oLog.println("Cleaning up testcase");
-        try {
-            Res = oBasicHandler.perform("disposeObject", objName);
-        } catch (BasicException e) {
-            oLog.println(e.info);
-            throw new RuntimeException(e.info);
-        }
-    }
-
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java b/qadevOOo/runner/basicrunner/basichelper/AttributeList.java
deleted file mode 100644
index cdcba0f6f956..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.uno.Type;
-import com.sun.star.lang.XTypeProvider;
-import util.XMLTools;
-
-/**
-* The class provides an implementation of the service
-* <code>com.sun.star.xml.sax.XAttributeList</code>.
-* @see com.sun.star.xml.sax.XAttributeList
-* @see com.sun.star.lang.XServiceInfo
-* @see com.sun.star.lang.XSingleServiceFactory
-*/
-public class AttributeList implements XServiceInfo, XSingleServiceFactory {
-    /** The service name of this class  **/
-    static final String __serviceName = "basichelper.AttributeList";
-
-    /**
-     * Returns True, of the service is supported.
-     * @param name The service name.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    /**
-     * Get all supported services.
-     * @return The supported services.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    /**
-     * Ask for the implementation name.
-     * @return The implementation name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-
-    /**
-     * Create an instance of the actual implementation of the AttributeList.
-     * Arguments are not supported, so they will bge ignored.
-     * @param args The arguments.
-     * @return A new instance of this class.
-     */
-    public Object createInstanceWithArguments(Object[] args) {
-        return new AttributeListImpl();
-    }
-
-    /**
-     * Create an instance of this class.
-     * @return A new instance of this class.
-     */
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-}
-
-/**
- * The actual implementation of the service
- * <code>com.sun.star.xml.sax.XAttributeList</code>.
- * Extends the class util.XMLTools.AttributeList.
- * @see util.XMLTools.AttributeList
- * @see com.sun.star.xml.sax.XAttributeList
- * @see com.sun.star.lang.XTypeProvider
- * @see com.sun.star.lang.XInitialization
- */
-class AttributeListImpl extends XMLTools.AttributeList
-                            implements XTypeProvider, XInitialization {
-
-                                /**
-                                 * Initialize this class.
-                                 * @param p0 An array of XML attributes that are added to the list.
-                                 * @throws Exception Initialize failed.
-                                 */
-    public void initialize(Object[] p0) throws com.sun.star.uno.Exception {
-        for(int i = 0; i + 2 < p0.length; i += 3) {
-            add((String)p0[i], (String)p0[i + 1], (String)p0[i + 2]);
-        }
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return All UNO types of this class.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Class superInterfaces[] = getClass().getSuperclass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length + superInterfaces.length];
-        int i = 0;
-        for(; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-        for(; i < interfaces.length + superInterfaces.length; ++ i)
-            types[i] = new Type(superInterfaces[i - interfaces.length]);
-        return types;
-    }
-
-    /**
-     * Get a unique id for this class
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/Connector.java b/qadevOOo/runner/basicrunner/basichelper/Connector.java
deleted file mode 100644
index cc219ac9f416..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/Connector.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.connection.XConnector;
-import com.sun.star.connection.XConnection;
-import com.sun.star.connection.ConnectionSetupException;
-import com.sun.star.connection.NoConnectException;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.lang.XSingleServiceFactory;
-
-/**
- * This is a special service that is used in testing Acceptor
- * component in BASIC. This componennt creates a separate thread
- * that tries to connect to BASIC's acceptor. After successfull
- * connection it writes a connectionString to XConnection.
- */
- public class Connector implements XServiceInfo, XSingleServiceFactory {
-    /** The service name of this class **/
-    static final String __serviceName = "basichelper.Connector";
-    /** The Connector implementation **/
-    static ConnectorImpl oConnector = null;
-
-   /** Create a connector.
-    */
-   public Connector() {
-        oConnector = new ConnectorImpl();
-    }
-
-    /**
-     * Returns an instance of the connector.
-     * Arguments are not supported here and will be ignored.
-     * @param args The arguments.
-     * @return The connector.
-     */
-    public Object createInstanceWithArguments(Object[] args) {
-        return oConnector;
-    }
-
-    /**
-     * Returns an instance of the connector.
-     * @return The connector.
-     */
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    /**
-     * Get a unique id for this implementation.
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-
-    /** Is this servioce supported?
-     * @param name The service name.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    /**
-     * Get all supported service names.
-     * @return All supported servcices.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    /**
-     * Get the implementation name of this class.
-     * @return The implementation name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-}
-
-/**
- * The actual implementation of the connector
- * @see com.sun.star.lang.XInitialization
- * @see com.sun.star.lang.XTypeProvider
- * @see com.sun.star.container.XNameAccess
- */
-class ConnectorImpl implements XInitialization, XTypeProvider, XNameAccess {
-    static String aState;
-    static Integer iTimeout;
-
-    /**
-     * Construct a new connector.
-     */
-    public ConnectorImpl() {
-        aState = "just created";
-        iTimeout = new Integer(3000);
-    }
-
-    /**
-     * Method initialize() creates a new thread that will try to connect to
-     * Acceptor for a few seconds. One should pass as parameters an array,
-     * where element 0 is an instance of Connector and element 1 is a
-     * connection string (the same as in Acceptor)
-     * @param parm1 An instance of XConnector.
-     * @see com.sun.star.connection.XConnector
-     * @throws Exception Is thrown, when initialize fails.
-     */
-    public void initialize(Object[] parm1) throws com.sun.star.uno.Exception {
-        aState = "just initialized";
-        XConnector cntr = (XConnector)UnoRuntime.queryInterface(
-                                                XConnector.class, parm1[0]);
-        ConnThread aThread = new ConnThread(cntr, (String)parm1[1]);
-        aThread.start();
-    }
-
-    /**
-     * Get the element names
-     * @return All element names.
-     */
-    public String[] getElementNames() {
-        return new String[]{"State", "Timeout"};
-    }
-
-    /**
-     * Does this element exist?
-     * @param name The element name.
-     * @return True, if the name exists.
-     */
-    public boolean hasByName(String name) {
-        return (name.equals("State") || name.equals("Timeout"));
-    }
-
-    /**
-     * Get an element by its name.
-     * @param name The name of the element.
-     * @return The value of the element.
-     * @throws NoSuchElementException The element does not exist.
-     */
-    public Object getByName(String name) throws NoSuchElementException{
-        if (name.equals("State"))
-            return aState;
-        else if (name.equals("Timeout"))
-            return iTimeout;
-        else
-            throw new NoSuchElementException();
-    }
-
-    /**
-     * Are there elements
-     * @return Always true.
-     */
-    public boolean hasElements() {
-        return true;
-    }
-
-    /**
-     * Get element type.
-     * @return null.
-     */
-    public Type getElementType() {
-        return null;
-    }
-
-    /**
-     * Get a unique id for this implementation.
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-}
-
-/**
- * A connector thread
- */
-class ConnThread extends Thread {
-    String connStr;
-    XConnector oConnector;
-
-    /**Construct the thread.
-     * @param oCntr A connector.
-     * @param cStr The conection string.
-     */
-    public ConnThread(XConnector oCntr, String cStr){
-        connStr = cStr;
-        oConnector = oCntr;
-    }
-
-    /**
-     * Run the thread.
-     */
-    public void run(){
-        try {
-            Thread.sleep(ConnectorImpl.iTimeout.intValue());
-            ConnectorImpl.aState = "before connection";
-            XConnection oConnection = oConnector.connect(connStr);
-            if (oConnection != null) {
-                ConnectorImpl.aState = "connected";
-                oConnection.write(connStr.getBytes());
-                oConnection.write(new byte[]{0});
-            } else
-                ConnectorImpl.aState = "XConnection is null";
-        } catch (ConnectionSetupException e) {
-            ConnectorImpl.aState = "ConnectionSetupException";
-            throw new RuntimeException(e.toString());
-        } catch (NoConnectException e) {
-            ConnectorImpl.aState = "NoConnectException";
-            throw new RuntimeException(e.toString());
-        } catch (Exception e) {
-            ConnectorImpl.aState = "error";
-            throw new RuntimeException("Can't sleep exception");
-        }
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java b/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java
deleted file mode 100644
index f50a7d2eb470..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.frame.XDispatchProviderInterceptor;
-import com.sun.star.frame.XDispatchProvider;
-import com.sun.star.frame.XDispatch;
-import com.sun.star.frame.DispatchDescriptor;
-import com.sun.star.util.URL;
-
-/**
- * This implementation provides an implementation of an interceptor.
- * @see com.sun.star.lang.XSingleServiceFactory
- * @see com.sun.star.lang.XServiceInfo
- */
-public class DispatchProviderInterceptor implements XServiceInfo,
-                                                    XSingleServiceFactory {
-    /** The service name **/
-    static final String __serviceName =
-                            "basichelper.DispatchProviderInterceptor";
-
-    /** Create an instance of the interceptor
-     * Arguments are not supported here, so they will be ignored.
-     * @param args The arguments.
-     * @return A new instance of the interceptor.
-     **/
-    public Object createInstanceWithArguments(Object[] args) {
-        return new InterceptorImpl();
-    }
-
-    /** Create an instance of the interceptor
-     * @return A new instance of the interceptor.
-     **/
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    /** Get the unique id for this implementation
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /** Get all implemented types.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-
-    /**
-     * Is this service supported?
-     * @param name The name of a service.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    /**
-     * Get all supported service names.
-     * @return All service names.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    /**
-     * Get the implementation name of this class.
-     * @return The name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-}
-
-/**
- * The actual implementation of the interceptor.
- * @see com.sun.star.lang.XTypeProvider
- * @see com.sun.star.frame.XDispatchProviderInterceptor
- * @see com.sun.star.frame.XDispatchProvider
- */
-class InterceptorImpl implements XDispatchProvider,
-                                XDispatchProviderInterceptor, XTypeProvider {
-
-    /** A master dispatch provider **/
-    public XDispatchProvider master = null;
-    /** A slave dispatch provider **/
-    public XDispatchProvider slave = null;
-
-    /** Get the slave dispatch provider
-     * @return The slave.
-     */
-    public XDispatchProvider getSlaveDispatchProvider() {
-        return slave;
-    }
-    /** Get the master dispatch provider
-     * @return The master.
-     */
-    public XDispatchProvider getMasterDispatchProvider() {
-        return master;
-    }
-
-    /** Set the slave dispatch provider
-     * @param prov The new slave.
-     */
-    public void setSlaveDispatchProvider(XDispatchProvider prov) {
-        slave = prov ;
-    }
-
-    /** Set the master dispatch provider
-     * @param prov The new master.
-     */
-    public void setMasterDispatchProvider(XDispatchProvider prov) {
-        master = prov ;
-    }
-
-    /** Searches for an <type>XDispatch</type> for the specified URL within
-     * the specified target frame.
-     * @param url The URL.
-     * @param frame The target frame
-     * @param flags Optional search flags.
-     * @return The dispatch object which provides the queried functionality
-     *         or null if no dispatch object is available.
-     * @see com.sun.star.frame.XDispatch
-     */
-    public XDispatch queryDispatch(URL url, String frame, int flags) {
-        return master.queryDispatch(url, frame, flags) ;
-    }
-
-    /**
-     * Query for an array of <type>XDispatch</type>.
-     * @param desc A list of dipatch requests.
-     * @return A list of dispatch objects.
-     */
-    public XDispatch[] queryDispatches(DispatchDescriptor[] desc) {
-        return master.queryDispatches(desc) ;
-    }
-
-    /** Get the unique id for this implementation
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /** Get all implemented types.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java b/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java
deleted file mode 100644
index 62909f16dd4f..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.xml.sax.XDocumentHandler;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.NoSuchElementException;
-import java.util.Vector;
-import util.XMLTools.Tag;
-import util.XMLTools;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-
-/**
- * This class provides a handler of the BASIC test document.
- * @see com.sun.star.lang.XSingleServiceFactory
- * @see com.sun.star.lang.XServiceInfo
- */
-public class DocumentHandler implements XServiceInfo, XSingleServiceFactory {
-    /** The service name of this class **/
-    static final String __serviceName = "basichelper.DocumentHandler";
-    /** The actual handler of the document **/
-    static DocumentHandlerImpl oDocumentHandler = null;
-    /** A string writer **/
-    private StringWriter writer;
-    /** The log writer (just a wrapper around <code>writer</code>) **/
-    private PrintWriter log;
-
-    /**
-     * Create an instance of the document handler.
-     * @param args A boolean value as <codde>args[0]</code> determines,
-     *             if checked XML data is printed to the log.
-     *             Default is false.
-     * @return The document handler
-     */
-    public Object createInstanceWithArguments(Object[] args) {
-        boolean printXML = false;
-        if (args != null && args.length!=0 && args[0] instanceof Boolean)
-            printXML = ((Boolean)args[0]).booleanValue();
-        writer = new StringWriter();
-        log = new PrintWriter(writer);
-        oDocumentHandler = new DocumentHandlerImpl(log, printXML, writer);
-        return oDocumentHandler;
-    }
-
-    /**
-     * Create an instance of the document handler.
-     * @return The document handler
-     */
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    /** Get the unique id for this implementation
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /** Get all implemented types.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-        return types;
-    }
-
-    /** Is this servioce supported?
-     * @param name The service name.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    /**
-     * Get all supported service names.
-     * @return All supported servcices.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    /**
-     * Get the implementation name of this class.
-     * @return The implementation name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-}
-
-/**
- * The actual implementation of the document handler
- * @see util.XMLTools.XMLChecker
- * @see com.sun.star.lang.XInitialization
- * @see com.sun.star.xml.sax.XDocumentHandler
- * @see com.sun.star.container.XNameAccess
- * @see com.sun.star.lang.XTypeProvider
- */
-class DocumentHandlerImpl extends XMLTools.XMLChecker
-                        implements XInitialization, XDocumentHandler,
-                                                XNameAccess, XTypeProvider {
-    /** A string writer **/
-    private StringWriter writer;
-
-    /**
-     * Constructor
-     * @param log_ A log writer.
-     * @param printXML Should XML data be printed to the log?
-     * @param logWriter A wrapper around <code>log_</code> for convenience.
-     */
-    public DocumentHandlerImpl(PrintWriter log_,
-                                    boolean printXML, StringWriter logWriter) {
-        super(log_, printXML);
-        writer = logWriter;
-    }
-
-    /**
-     * Initialize this class with rules.
-     * @param parm1 An array of filter rules:
-     *              <code>processAction()</code> is called for every rule.
-     * @throws com.sun.star.uno.Exception for an incorrect rule.
-     */
-    public void initialize(Object[] parm1) throws com.sun.star.uno.Exception {
-        if (!(parm1[0] instanceof Object[])) return;
-        for (int i=0; i<parm1.length; i++) {
-            processActionForXMLChecker((Object[])parm1[i]);
-        }
-    }
-
-    /**
-    * Method processes all filters received from basic tests.
-    * Called by initialize().
-    * @param filterRule An array building one filter rule.
-    * @throws com.sun.star.uno.Exception for an incorrect rule.
-    */
-    private void processActionForXMLChecker(Object[] filterRule)
-                                        throws com.sun.star.uno.Exception {
-        int arrLen = filterRule.length;
-        String oTagName;
-        Object[] oTags;
-        Object[] oTag;
-        int tagsNum = arrLen-1;
-        Vector allTags = new Vector();
-        String CDATA = "";
-        String action = "";
-
-        // First element of rule is RuleName and should be String
-        if (!(filterRule[0] instanceof String)) {
-            throw new com.sun.star.uno.Exception("Error: incorrect filter rule "+
-            "received from basic test! Rule name must be a String.");
-        } else {
-            action = (String) filterRule[0];
-        }
-
-        // Searching for character data and defining amount of tags received.
-        for (int j=1; j<arrLen; j++) {
-            if ( (filterRule[j] instanceof String) && (j != 1) ) {
-                CDATA = (String) filterRule[j];
-                tagsNum--;
-            }
-        }
-
-        // Adding received tags to internal array.
-        oTags = new Object[tagsNum];
-        for (int j=1; j<=tagsNum; j++) {
-            if (filterRule[j] instanceof Object[]) {
-                oTags[j-1] = (Object[]) filterRule[j];
-            }
-        }
-
-        // Process all received tags for a given filter rule
-        for (int i=0; i<oTags.length; i++) {
-            if (oTags[i] instanceof Object[]) {
-                oTag = (Object[]) oTags[i];
-                oTagName = (String) oTag[0];
-            } else if (oTags[i] instanceof Object) {
-                oTag = new Object[1];
-                oTag[0] = (Object) oTags[i];
-                oTagName = (String) oTag[0];
-            } else {
-                throw new com.sun.star.uno.Exception("Error: invalid tag "+
-                                    "received from basic test! Check tag "
-                                    +i+" in rule '"+action+"'.");
-            }
-
-            // Action for constructor Tag(TagName, attrName, attrValue)
-            if (oTag.length == 3) {
-                if ((oTag[1] instanceof String)&&(oTag[2] instanceof String)) {
-                    allTags.add(new Tag(oTagName,
-                                    (String) oTag[1], (String) oTag[2]));
-                } else {
-                    throw new com.sun.star.uno.Exception("Error: invalid tag '"+
-                                    oTagName+"' received from basic test!");
-                }
-
-            // Action for constructors:
-            // Tag(TagName, String[][] attrValues )
-            // Tag(TagName, String[] attrNames)
-            // Tag(TagName, String attrName)
-            //
-            } else if (oTag.length == 2) {
-                if (oTag[1] instanceof String[][]) {
-                    allTags.add(new Tag(oTagName, (String[][]) oTag[1]));
-                } else if (oTag[1] instanceof String[]) {
-                    allTags.add(new Tag(oTagName, (String[]) oTag[1]));
-                } else if (oTag[1] instanceof String) {
-                    allTags.add(new Tag(oTagName, (String) oTag[1]));
-                } else {
-                    throw new com.sun.star.uno.Exception("Error: invalid tag '"+
-                    oTagName+"' received from basic test!");
-                }
-
-            // Action for constructor Tag(TagName)
-            } else if (oTag.length == 1) {
-                if (oTag[0] instanceof String) {
-                    allTags.add(new Tag(oTagName));
-                } else {
-                    throw new com.sun.star.uno.Exception("Error: invalid tag '"+
-                    oTagName+"' received from basic test!");
-                }
-            } else {
-                throw new com.sun.star.uno.Exception("Error: invalid tag '"+
-                oTagName+"' received from basic test!");
-            }
-        }
-
-        // Adding tags to XMLChecker
-        if ( action.equals((String)"TagExists") ) {
-            for (int i=0; i<allTags.size(); i++) {
-                addTag((Tag)allTags.get(i));
-            }
-        } else if (action.equals((String)"TagEnclosed")) {
-            addTagEnclosed((Tag) allTags.get(0), (Tag) allTags.get(1));
-        } else if (action.equals((String)"CharsEnclosed")) {
-            addCharactersEnclosed(CDATA, (Tag) allTags.get(0));
-        } else {
-            throw new com.sun.star.uno.Exception("Error: incorrect rule name '"+
-            action+"' received from basic test!");
-        }
-    }
-
-    /**
-     * Get the names of the elements.
-     * @return element names.
-     */
-    public String[] getElementNames() {
-        return new String[]{"XMLCode", "XMLIsCorrect"};
-    }
-
-    /**
-     * Is this an element?
-     * @param name Element name.
-     * @return true, if <code>name>/code> is the name of an element.
-     */
-    public boolean hasByName(String name) {
-        return (name.equals("XMLCode") || name.equals("XMLIsCorrect"));
-    }
-
-    /**
-     * Get an element by its name.
-     * @param name The element name.
-     * @return The element with the specified <code>name</code>.
-     * @throws NoSuchElementException Is thrown, if name does not exist.
-     */
-    public Object getByName(String name) throws NoSuchElementException{
-        if (name.equals("XMLIsCorrect"))
-            return new Boolean(this.check());
-        else if (name.equals("XMLCode")) {
-            return writer.getBuffer().toString();
-        } else
-            throw new NoSuchElementException();
-    }
-
-    /**
-     * Are there any elements?
-     * @return Always true.
-     */
-    public boolean hasElements() {
-        return true;
-    }
-
-    /**
-     * Get the element type.
-     * @return The type.
-     */
-    public Type getElementType() {
-        return new Type(Object.class);
-    }
-
-    /**
-     * Get a unique id for this implementation.
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-        return types;
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/runner/basicrunner/basichelper/Filter.java
deleted file mode 100644
index d9616d30e5b2..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/Filter.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.document.XFilter;
-import com.sun.star.beans.PropertyValue;
-
-
-/**
- * Provides an implementation of XFilter.
- * @see com.sun.star.document.XFilter
- * @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.lang.XSingleServiceFactory
- */
-public class Filter implements XServiceInfo, XSingleServiceFactory {
-    /** The service name of this class **/
-    static final String __serviceName = "basichelper.Filter";
-    /** The actual filter **/
-    static FilterImpl oFilter = null;
-
-    /**
-     * Construct a new filter
-     */
-    public Filter() {
-        oFilter = new FilterImpl();
-    }
-
-    /**
-     * Returns an instance of the filter.
-     * Arguments are not supported here and will be ignored.
-     * @param args The arguments.
-     * @return The filter.
-     */
-    public Object createInstanceWithArguments(Object[] args) {
-        return oFilter;
-    }
-
-    /**
-     * Returns an instance of the filter.
-     * @return The filter.
-     */
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    /**
-     * Get a unique id for this implementation.
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-
-    /** Is this servioce supported?
-     * @param name The service name.
-     * @return True, if the service is supported.
-     */
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    /**
-     * Get all supported service names.
-     * @return All supported servcices.
-     */
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    /**
-     * Get the implementation name of this class.
-     * @return The implementation name.
-     */
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-}
-
-/**
- * The actual filter implementation
- * @see com.sun.star.lang.XInitialization;
- * @see com.sun.star.lang.XTypeProvider;
- * @see com.sun.star.container.XNameAccess;
- */
-class FilterImpl implements XInitialization, XTypeProvider, XNameAccess {
-    /** A state **/
-    static String aState;
-    /** A result **/
-    static boolean bResult;
-
-    /**
-     * Constructs a new filter.
-     */
-    public FilterImpl() {
-        aState = "just created";
-        bResult = false;
-    }
-
-    /**
-     * Get the element names
-     * @return All element names.
-     */
-    public String[] getElementNames() {
-        return new String[]{"State", "Result"};
-    }
-
-    /**
-     * Does this element exist?
-     * @param name The element name.
-     * @return True, if the name exists.
-     */
-    public boolean hasByName(String name) {
-        return (name.equals("State") || name.equals("Result"));
-    }
-
-    /**
-     * Get an element by its name.
-     * @param name The name of the element.
-     * @return The value of the element.
-     * @throws NoSuchElementException The element does not exist.
-     */
-    public Object getByName(String name) throws NoSuchElementException{
-        if (name.equals("State"))
-            return aState;
-        else if (name.equals("Result"))
-            return new Boolean(bResult);
-        else
-            throw new NoSuchElementException();
-    }
-
-    /**
-     * Are there elements
-     * @return Always true.
-     */
-    public boolean hasElements() {
-        return true;
-    }
-
-    /**
-     * Get element type.
-     * @return null.
-     */
-    public Type getElementType() {
-        return null;
-    }
-
-    /**
-     * Get a unique id for this implementation.
-     * @return The id.
-     */
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    /**
-     * Return all implemented types of this class.
-     * @return The implemented UNO types.
-     */
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-
-        return types;
-    }
-
-
-    /**
-     * Method initialize() creates a new thread that will try to start
-     * filtering
-     * @param parm1 An instance of XFilter
-     * @see com.sun.star.document.XFilter
-     * @throws Exception Is thrown, when initialize fails.
-     */
-    public void initialize(Object[] parm1) throws com.sun.star.uno.Exception {
-        XFilter oFilter = (XFilter)UnoRuntime.queryInterface(
-                                        XFilter.class, parm1[0]);
-//?        PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]);
-        PropertyValue[] FilterDesc = (PropertyValue[])UnoRuntime.queryInterface(PropertyValue[].class, parm1[1]);
-        aState = "just initialized";
-        FilterThread aThread = new FilterThread(oFilter, FilterDesc);
-        aThread.start();
-    }
-}
-
-/**
- * A thread for filtering.
- */
-class FilterThread extends Thread {
-    /** The filter that is used **/
-    XFilter oFilter = null;
-    /** Filter descriptions **/
-    PropertyValue[] FilterDesc = null;
-
-    /**
-     * Construct the thread.
-     * @param oObj The filter.
-     * @param Desc The descriptions.
-     */
-    public FilterThread(XFilter oObj, PropertyValue[] Desc){
-      oFilter = oObj;
-      FilterDesc = Desc;
-    }
-
-    /**
-     * Let the thread run
-     */
-    public void run(){
-        boolean bOK;
-        try {
-            FilterImpl.aState = "before filtering";
-            bOK = oFilter.filter(FilterDesc);
-            FilterImpl.aState = "filtering finished";
-            FilterImpl.bResult = bOK;
-        } catch (Exception e) {
-            ConnectorImpl.aState = "error";
-            throw new RuntimeException("Can't filtering exception"
-                                                            + e.toString());
-        }
-    }
-}
diff --git a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java b/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java
deleted file mode 100644
index ec8957e01a6f..000000000000
--- a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*************************************************************************
- *
- * 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 basicrunner.basichelper;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.frame.XDispatch;
-import com.sun.star.frame.XDispatchProvider;
-import com.sun.star.frame.XModel;
-import com.sun.star.util.XURLTransformer;
-import com.sun.star.frame.XController;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.URL;
-import com.sun.star.lang.XMultiServiceFactory;
-import util.utils;
-import com.sun.star.lang.XComponent;
-import lib.StatusException;
-import lib.Status;
-import util.SOfficeFactory;
-import com.sun.star.ui.dialogs.XExecutableDialog;
-
-
-public class ThreadRunner implements XServiceInfo, XSingleServiceFactory {
-    static final String __serviceName = "basichelper.ThreadRunner";
-    static ThreadRunnerImpl oThreadRunner = null;
-
-    public ThreadRunner(XMultiServiceFactory xMSF) {
-    oThreadRunner = new ThreadRunnerImpl(xMSF);
-    }
-
-    public Object createInstanceWithArguments(Object[] args) {
-    return oThreadRunner;
-    }
-
-    public Object createInstance() {
-        return createInstanceWithArguments(null);
-    }
-
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-        return types;
-    }
-
-    public boolean supportsService(String name) {
-        return __serviceName.equals(name);
-    }
-
-    public String[] getSupportedServiceNames() {
-        return new String[] {__serviceName};
-    }
-
-    public String getImplementationName() {
-        return getClass().getName();
-    }
-}
-
-
-class ThreadRunnerImpl implements XInitialization, XTypeProvider {
-    Object oDoc = null;
-    String actionType = null;
-    String actionParm = null;
-    XMultiServiceFactory oMSF = null;
-
-    public ThreadRunnerImpl(XMultiServiceFactory MSF) {
-    oMSF = MSF;
-    }
-
-    public void initialize(Object[] params) throws com.sun.star.uno.Exception {
-    boolean parmsOK = false;
-
-        if (!(params[0] instanceof String)) {
-            throw new StatusException(Status.failed(
-                "Wrong first parameter for ThreadRunner, allowed values:" +
-                "'OpenToolkitDialog', 'OpenDialogFromFile', 'ExecuteDialog'"));
-        }
-
-        actionType = (String) params[0];
-
-        if (actionType.equals("OpenToolkitDialog")) {
-            if (params.length != 3 || !(params[2] instanceof Object) ||
-                !(params[1] instanceof String) ) {
-                throw new StatusException(Status.failed("Expected the " +
-                    "following type of parameters for 'OpenToolkitDialog': " +
-                    "String, Object"));
-            }
-            actionParm = (String)params[1];
-            oDoc = (Object)params[2];
-            ToolkitDialogThread aThread =
-                new ToolkitDialogThread(oMSF, oDoc, actionParm);
-            aThread.start();
-        } else if (actionType.equals("OpenDialogFromFile")) {
-            if (params.length != 2 || !(params[1] instanceof String) ) {
-                throw new StatusException(Status.failed("Expected the " +
-                    "following type of parameters for 'OpenDialogFromFile': " +
-                    "String"));
-            }
-            actionParm = (String)params[1];
-            DialogFromFileThread bThread =
-                new DialogFromFileThread(oMSF, actionParm);
-            bThread.start();
-        } else if ( actionType.equals("ExecuteDialog")) {
-            if (params.length != 2 || !(params[1] instanceof String)) {
-                throw new StatusException(Status.failed("Expected the " +
-                    "following type of parameters for 'ExecuteDialog': " +
-                    "String"));
-            }
-            ExecuteDialogThread cThread =
-                new ExecuteDialogThread(oMSF, (String)params[1]);
-            cThread.start();
-        } else {
-            System.out.println("Error! ThreadRunnerImpl.initialize(): " +
-            "Incorrect parameters!");
-        }
-    }
-
-    public byte[] getImplementationId() {
-        return toString().getBytes();
-    }
-
-    public Type[] getTypes() {
-        Class interfaces[] = getClass().getInterfaces();
-        Type types[] = new Type[interfaces.length];
-        for(int i = 0; i < interfaces.length; ++ i)
-            types[i] = new Type(interfaces[i]);
-        return types;
-    }
-}
-
-
-class ToolkitDialogThread extends Thread {
-    Object oDoc = null;
-    String url = null;
-    XMultiServiceFactory msf = null;
-
-    public ToolkitDialogThread(XMultiServiceFactory xMSF, Object doc, String sUrl) {
-    oDoc = doc;
-    url = sUrl;
-    msf = xMSF;
-    }
-
-    public void run() {
-    XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, oDoc);
-    XController xController = aModel.getCurrentController();
-    try {
-        XDispatchProvider xDispProv = (XDispatchProvider)
-        UnoRuntime.queryInterface( XDispatchProvider.class, xController );
-        XURLTransformer xParser = (com.sun.star.util.XURLTransformer)
-        UnoRuntime.queryInterface(XURLTransformer.class,
-                      msf.createInstance("com.sun.star.util.URLTransformer"));
-        URL[] aParseURL = new URL[1];
-        aParseURL[0] = new URL();
-        aParseURL[0].Complete = url;
-        xParser.parseStrict(aParseURL);
-        URL aURL = aParseURL[0];
-        XDispatch xDispatcher = xDispProv.queryDispatch( aURL,"",0);
-        if( xDispatcher != null )
-        xDispatcher.dispatch( aURL, null );
-    } catch (com.sun.star.uno.Exception e) {
-        System.out.println("Couldn't open dialog!!!");
-        throw new StatusException( "Couldn't open dialog!!!", e );
-    }
-    }
-}
-
-
-class DialogFromFileThread extends Thread {
-    String url = null;
-    SOfficeFactory SOF = null;
-    XMultiServiceFactory myMSF = null;
-
-    public DialogFromFileThread(XMultiServiceFactory xMSF, String sUrl) {
-    url = sUrl;
-    SOF = SOfficeFactory.getFactory(xMSF);
-        myMSF = xMSF;
-    }
-
-    public void run() {
-    try {
-            PropertyValue[] args = new PropertyValue[1];
-            args[0] = new PropertyValue();
-            args[0].Name = "InteractionHandler";
-            args[0].Value = myMSF.createInstance(
-                "com.sun.star.comp.uui.UUIInteractionHandler");
-
-        String testUrl= utils.getFullTestURL(url);
-        System.out.println("loading "+testUrl);
-        XComponent xDoc = SOF.loadDocument(testUrl, args);
-    } catch (com.sun.star.uno.Exception e) {
-        System.out.println("Couldn't create document!!!");
-        throw new StatusException( "Couldn't create document!!!", e );
-    }
-    }
-
-}
-
-class ExecuteDialogThread extends Thread {
-    XMultiServiceFactory xMSF = null;
-    String serviceName = null;
-
-    public ExecuteDialogThread(XMultiServiceFactory xMSF, String serviceName) {
-        this.xMSF = xMSF;
-        this.serviceName = serviceName;
-    }
-
-    public void run() {
-        Object dlg = null;
-        try {
-            dlg = xMSF.createInstance(serviceName);
-        } catch(com.sun.star.uno.Exception e) {
-            throw new StatusException(Status.failed("Couldn't create service"));
-        }
-        XExecutableDialog execDlg = (XExecutableDialog)UnoRuntime.queryInterface
-            (XExecutableDialog.class, dlg);
-        execDlg.execute();
-    }
-}
-
-
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessible/accessibility_XAccessible.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessible/accessibility_XAccessible.xba
deleted file mode 100644
index 73b58c04b061..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessible/accessibility_XAccessible.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessible" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessible
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ac As Variant
-
-    Test.StartMethod("getAccessibleContext()")
-    bOK = true
-    ac = oObj.getAccessibleContext()
-    bOK = bOK AND NOT isNull(ac)
-    Test.MethodTested("getAccessibleContext()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessible/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessible/script.xlb
deleted file mode 100644
index acd98036701d..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessible/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessible" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessible"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/accessibility_XAccessibleAction.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/accessibility_XAccessibleAction.xba
deleted file mode 100644
index c45d4d3e7cbd..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/accessibility_XAccessibleAction.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleAction" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleAction
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getAccessibleActionCount()")
-    Dim count As Long
-    bOK = true
-    count = oObj.getAccessibleActionCount()
-    bOK = bOK AND (count &gt; 0)
-    Test.MethodTested("getAccessibleActionCount()",bOK)
-
-    Test.StartMethod("getAccessibleActionDescription()")
-    Dim i As Long
-    Dim desc As String
-    bOK = true
-    i = 0
-    while ( i &lt; count)
-        desc = oObj.getAccessibleActionDescription(i)
-        Out.Log("Found action "+i+": "+desc)
-        bOK = bOK AND NOT isNull(desc)
-        i = i + 1
-    wend
-    Test.MethodTested("getAccessibleActionDescription()",bOK)
-
-    Test.StartMethod("getAccessibleActionKeyBinding()")
-    Dim key As Variant
-    bOK = true
-    i = 0
-    while ( i &lt; count)
-        key = oObj.getAccessibleActionKeyBinding(i)
-        if not isNull(key) then
-            out.Log("Found key in " + i)
-        end if
-        i = i + 1
-    wend
-    Test.MethodTested("getAccessibleActionKeyBinding()",bOK)
-
-    Test.StartMethod("doAccessibleAction()")
-    bOK = true
-    bOK = bOK AND oObj.doAccessibleAction(0)
-    Test.MethodTested("doAccessibleAction()",bOK)
-
-    'This delay is REQUIRED here to avoid soffice blocking
-    wait(1000)
-    ReCreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/script.xlb
deleted file mode 100644
index 87edd989cbaa..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleAction/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleAction" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleAction"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/accessibility_XAccessibleComponent.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/accessibility_XAccessibleComponent.xba
deleted file mode 100644
index 2c85baced3be..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/accessibility_XAccessibleComponent.xba
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleComponent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getBounds()")
-    Dim bounds As new com.sun.star.awt.Rectangle
-    Dim X1,Y1 As Integer
-    bOK = true
-    bounds = oObj.getBounds()
-    X1 = bounds.X+bounds.Width
-    Y1 = bounds.Y+bounds.Height
-    Out.Log("Object's bounding box: ("+bounds.X+","+bounds.Y+","+X1+","+Y1+").")
-    bOK = bOK AND (NOT isNull(bounds)) AND (bounds.X &gt;= 0) AND (bounds.Y &gt;= 0) _
-    AND (bounds.Width &gt; 0) AND (bounds.Height &gt; 0)
-    Test.MethodTested("getBounds()",bOK)
-    
-    Test.StartMethod("contains()")
-    Dim point1 As new com.sun.star.awt.Point
-    Dim point2 As new com.sun.star.awt.Point
-    bOK = true
-    point1.X = bounds.Width + 1
-    point1.Y = bounds.Height + 1
-    point2.X = 0
-    point2.Y = 0
-    bOK = bOK AND (NOT oObj.contains(point1)) AND oObj.contains(point2)
-    Test.MethodTested("contains()",bOK)
-
-    Test.StartMethod("getAccessibleAt()")
-    Dim accAt As Object, oChild As Object
-    Dim i As Integer, childCount As Long, mCount As Integer
-    Dim chBounds As new com.sun.star.awt.Rectangle
-    Dim locRes As Boolean
-	Dim ComponentFound As Boolean
-	Dim visibleFound as Boolean
-	Dim XAccessibleSelection as Boolean
-	
-    bOK = true
-    childCount = oObj.getAccessibleChildCount()
-    if (childCount = 0) then
-        Out.Log("There are no children supported by XAccessibleComponent...")
-    else
-        Out.Log("There are "+childCount+" children supported by XAccessibleComponent.")
-        if (childCount &gt; 50) then
-            mCount = 50
-            Out.Log("Checking only first 50 children...")
-        else
-            mCount = childCount
-        End If
-		ComponentFound = false
-		visibleFound = false
-		XAccessibleSelection = hasUNOInterfaces(oObj, "drafts.com.sun.star.accessibility.XAccessibleSelection")
-        for i = 0 to (mCount - 1)
-            oChild = oObj.getAccessibleChild(i)
-            if NOT hasUNOInterfaces(oChild,"drafts.com.sun.star.accessibility.XAccessibleContext") then
-                oChild = oChild.getAccessibleContext()
-            End If
-            if hasUNOInterfaces(oChild,"drafts.com.sun.star.accessibility.XAccessibleComponent") then
-				ComponentFound = TRUE
-				if XAccessibleSelection then 
-					if oObj.isAccessibleChildSelected(i) then
-						visibleFound = TRUE
-					End If
-				End If
-				oChild = oChild.getAccessibleContext()
-				chBounds = oChild.getBounds()
-				point1.X = chBounds.X
-				point1.Y = chBounds.Y
-				accAt = oObj.getAccessibleAt(point1)
-				locRes = utils.at_equals(accAt,oChild)
-				Out.log("	getAccessibleAt() with   valid points with child " + i + ": " + locRes) 
-				bOK = bOK AND locRes        
-				point2.X = chBounds.X - 1
-				point2.Y = chBounds.Y - 1
-				accAt = oObj.getAccessibleAt(point2)
-				locRes = NOT utils.at_equals(accAt,oChild)
-				Out.log("	getAccessibleAt() with invalid points with child " + i + ": " + locRes) 
-				bOK = bOK AND locRes
-            End If
-        next i
-		if not ComponentFound then
-			Out.Log("Could not find any children which supports XAccessibleComponent!")
-			bOK = TRUE
-		end if
-		if not visibleFound then
-			Out.Log("Could not find any children which is visible!")
-			bOK = TRUE
-		end if
-    End If
-    Test.MethodTested("getAccessibleAt()",bOK)
-
-    Test.StartMethod("getLocation()")
-    bOK = true
-    point1 = oObj.getLocation()
-    bOK = bOK AND (point1.X = bounds.X) AND (point1.Y = bounds.Y)
-    Test.MethodTested("getLocation()",bOK)
-
-    Test.StartMethod("getLocationOnScreen()")
-    Dim accParent As Object
-    bOK = true
-    accParent = getParentComponent()
-    point1 = oObj.getLocationOnScreen()
-    if NOT isNull(accParent) then
-        point2 = accParent.getLocationOnScreen()
-        bOK = bOK AND (point2.X + bounds.X = point1.X)
-        bOK = bOK AND (point2.Y + bounds.Y = point1.Y)
-    else
-        Out.Log("Component's parent is null.")
-    End If
-    Test.MethodTested("getLocationOnScreen()",bOK)
-
-    Test.StartMethod("getSize()")
-    Dim oSize As new com.sun.star.awt.Size
-    bOK = true
-    oSize = oObj.getSize()
-    bOK = bOK AND (oSize.Width = bounds.Width) AND (oSize.Height = bounds.Height)
-    Test.MethodTested("getSize()",bOK)
-
-    Test.StartMethod("grabFocus()")
-    bOK = true
-    oObj.grabFocus()
-    Test.MethodTested("grabFocus()",bOK)
-
-    Test.StartMethod("getForeground()")
-    Dim fColor As Long
-    bOK = true
-    fColor = oObj.getForeground()
-    Out.Log("Foreground color is: "+fColor)
-    Test.MethodTested("getForeground()",bOK)
-
-    Test.StartMethod("getBackground()")
-    Dim bColor As Long
-    bOK = true
-    bColor = oObj.getBackground()
-    Out.Log("Background color is: "+bColor)
-    Test.MethodTested("getBackground()",bOK)
-
-	
-	
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-
-Function getAccessibleChildren() As Variant
-    Dim accCount As Integer, i As Integer, j As Integer
-    Dim accChContext As Object, accCh As Object
-    Dim resArray(50) As Variant
-    Dim emptyArray() As Variant
-    j = 0
-    i = 0
-    if NOT hasUNOInterfaces(oObj,"drafts.com.sun.star.accessibility.XAccessible") then 
-        Out.Log("An object does not support XAccessible interface!")
-        Exit Function
-    End If
-    accCount = oObj.getAccessibleChildCount()
-    if (accCount &gt; 50) then accCount = 50
-    while (i &lt; accCount)
-        accCh = oObj.getAccessibleChild(i)
-        accChContext = accCh.getAccessibleContext()
-        if hasUNOInterfaces(accChContext,"drafts.com.sun.star.accessibility.XAccessibleComponent") then
-            resArray(j) = accChContext
-            j = j + 1
-        End If
-        i = i + 1
-    wend
-    if (accCount &lt;&gt; 0) then
-        Dim returnArray(j - 1) As Variant
-        For i = 0 to (j - 1)
-            returnArray(i) = resArray(i)
-        next i
-        getAccessibleChildren() = returnArray()
-    else
-        getAccessibleChildren() = emptyArray()
-    End If
-End Function
-
-Function getParentComponent() As Object
-    Dim accParent As Object
-    Dim accParContext As Object
-    if NOT hasUNOInterfaces(oObj,"drafts.com.sun.star.accessibility.XAccessible") then
-        Out.Log("An object does not support XAccessible interface!")
-        Exit Function
-    End If
-    accParent = oObj.getAccessibleParent()
-    if isNull(accParent) then 
-        Out.Log("The component has no accessible parent!")
-        Exit Function
-    End If
-    accParContext = accParent.getAccessibleContext()
-    if NOT hasUNOInterfaces(accParContext,"drafts.com.sun.star.accessibility.XAccessibleComponent") then
-        Out.Log("Accessible parent doesn't support XAccessibleComponent!")
-        Exit Function
-    else
-        getParentComponent() = accParContext
-    End If
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/script.xlb
deleted file mode 100644
index a1c29c03c632..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/accessibility_XAccessibleContext.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/accessibility_XAccessibleContext.xba
deleted file mode 100644
index 22e672bda823..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/accessibility_XAccessibleContext.xba
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleContext" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleContext
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim childCount As Long, i As Integer
-    Dim oParent As Object
-
-    Test.StartMethod("getAccessibleChildCount()")
-    bOK = true
-    childCount = oObj.getAccessibleChildCount()    
-    bOK = bOK AND (childCount &gt; -1)
-    Test.MethodTested("getAccessibleChildCount()",bOK)
-
-
-    Test.StartMethod("getAccessibleChild()")
-    Dim childContext As Object
-    Dim mCount As Integer
-    bOK = true
-    i = 0
-    if (childCount &gt; 50) then 
-        mCount = 50
-    else 
-        mCount = childCount
-    End If
-    while (i &lt; mCount)
-        childContext = oObj.getAccessibleChild(i).getAccessibleContext()
-        Out.Log("  Child " + i + ": " + childContext.getAccessibleDescription())
-        bOK = bOK AND utils.at_equals(childContext.getAccessibleParent(), oObj)
-        i = i + 1
-    wend
-    Test.MethodTested("getAccessibleChild()",bOK)
-
-
-    Test.StartMethod("getAccessibleParent()")
-    bOK = true
-    oParent = oObj.getAccessibleParent()
-    bOK = bOK AND NOT isNull(oParent)
-    Test.MethodTested("getAccessibleParent()",bOK)
-
-
-    Test.StartMethod("getAccessibleIndexInParent()")
-    Dim idx As Integer
-    Dim parentAC As Object
-    bOK = true
-    idx = oObj.getAccessibleIndexInParent()
-    parentAC = oParent.getAccessibleContext()
-    bOK = bOK AND utils.at_equals(parentAC.getAccessibleChild(idx), oObj)
-    Test.MethodTested("getAccessibleIndexInParent()",bOK)
-
-
-    Test.StartMethod("getAccessibleRole()")
-    Dim role As Integer
-    bOK = true
-    role = oObj.getAccessibleRole()
-    Out.Log("The role is " + role)
-    bOK = bOK AND (role &gt; -1)
-    Test.MethodTested("getAccessibleRole()",bOK)
-
-
-    Test.StartMethod("getAccessibleDescription()")
-    Dim descr As String
-    bOK = true
-    descr = oObj.getAccessibleDescription()
-    Out.Log("The description is " + descr)
-    bOK = bOK AND NOT isNull(descr)
-    Test.MethodTested("getAccessibleDescription()",bOK)
-
-
-    Test.StartMethod("getAccessibleName()")
-    Dim oName As String
-    bOK = true
-    oName = oObj.getAccessibleName()
-    Out.Log("The name is " + oName)
-    bOK = bOK AND NOT isNull(oName)
-    Test.MethodTested("getAccessibleName()",bOK)
-
-
-    Test.StartMethod("getAccessibleRelationSet()")
-    Dim oSet As Variant
-    bOK = true
-    oSet = oObj.getAccessibleRelationSet()
-	' Relationset could be null
-	if not isNull(oSet) then
-		oSet.getRelationCount()
-	end if
-    Test.MethodTested("getAccessibleRelationSet()",bOK)
-
-
-    Test.StartMethod("getAccessibleStateSet()")
-    bOK = true
-    oSet = oObj.getAccessibleStateSet()
-    bOK = bOK AND NOT isNull(oSet)
-    if NOT bOK then Out.Log("This object does not support states")
-    Test.MethodTested("getAccessibleStateSet()",bOK)
-
-
-    Test.StartMethod("getLocale()")
-    Dim oLoc As Variant
-    bOK = true
-    oLoc = oObj.getLocale()
-    Out.Log("The locale is "+oLoc.Language+", "+oLoc.Country)
-    bOK = bOK AND NOT isNull(oLoc) AND (len(oLoc.Language) &gt; 0) AND (len(oLoc.Country) &gt; 0)
-    Test.MethodTested("getLocale()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/script.xlb
deleted file mode 100644
index 5e4280103263..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleContext/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleContext" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleContext"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/accessibility_XAccessibleEditableText.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/accessibility_XAccessibleEditableText.xba
deleted file mode 100644
index df3cfba9d9e0..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/accessibility_XAccessibleEditableText.xba
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleEditableText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'	global hasChangeableAttrs as boolean
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleEditableText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean, locRes As Boolean
-    Dim oldText As String, curText As String
-    Dim length As Integer, initialText As String
-
-    oldText = oObj.getText()
-    initialText = oldText
-    length = oObj.getCharacterCount()
-    Out.Log("Text: "+oldText)
-    Out.Log("Length: "+length)
-
-
-    Test.StartMethod("cutText()")
-    bOK = true
-    locRes = oObj.cutText(0,length)
-    curText = oObj.getText()
-    bOK = bOK AND (len(curText) = 0) AND locRes
-    Test.MethodTested("cutText()",bOK)
-
-
-    Test.StartMethod("pasteText()")
-    bOK = true
-    locRes = oObj.pasteText(0)
-    curText = oObj.getText()
-    bOK = bOK AND (len(curText) = length) AND locRes
-    Test.MethodTested("pasteText()",bOK)
-
-
-    Test.StartMethod("insertText()")
-    Dim insString As String
-    bOK = true
-    insString = "Inserted String"
-    locRes = oObj.insertText(insString,length)
-    curText = oObj.getText()
-    bOK = bOK AND (curText = oldText + insString) AND locRes
-    Test.MethodTested("insertText()",bOK)
-
-
-    Test.StartMethod("deleteText()")
-    bOK = true
-    locRes = oObj.deleteText(len(curText) - len(insString),len(curText))
-    curText = oObj.getText()
-    bOK = bOK AND (curText = oldText) AND locRes
-    Test.MethodTested("deleteText()",bOK)
-
-
-    Test.StartMethod("replaceText()")
-    Dim replacement As String
-    Dim endIndex As Integer
-    bOK = true
-    oObj.setText(oldText+"(part of string to replace)")
-    endIndex = len(oObj.getText)
-    replacement = "Replacement string"
-    locRes = oObj.replaceText(len(oldText),endIndex,replacement)
-    curText = oObj.getText()
-    bOK = bOK AND (curText = oldText + replacement) AND locRes
-    Test.MethodTested("replaceText()",bOK)
-
-
-    Test.StartMethod("setAttributes()")
-    if hasChangeableAttrs then
-        Dim attrs As Variant, newAttrs As Variant
-        Dim i As Integer
-        bOK = true
-        length = oObj.getCharacterCount()
-        attrs = oObj.getCharacterAttributes(0)
-        for i=0 to ubound(attrs())
-            if attrs(i).Name = "CharBackColor" then attrs(i).Value = RGB(120,205,40)
-            if attrs(i).Name = "CharHeight" then attrs(i).Value = 30
-            if attrs(i).Name = "CharColor" then attrs(i).Value = RGB(255,255,255)
-        next i
-        locRes = oObj.setAttributes(0,length,attrs)
-        bOK = bOK AND locRes
-        newAttrs = oObj.getCharacterAttributes(0)
-        bOK = bOK AND PropertyTester.equals(attrs,newAttrs)
-    else
-        Out.Log("Object has no changeable attributes.")
-        bOK = true 
-    End If
-    Test.MethodTested("setAttributes()",bOK)
-
-
-    Test.StartMethod("setText()")
-    Dim newText As String
-    bOK = true
-    oldText = oObj.getText()
-    newText = "New string"
-    locRes = oObj.setText(newText)
-    curText = oObj.getText()
-    bOK = bOK AND (curText = newText) AND locRes
-    if locRes then
-        Out.Log("Test 1 passed OK.")
-    else
-        Out.Log("Test 1 failed.")
-    End If
-    newText = ""
-    locRes = oObj.setText(newText)
-    curText = oObj.getText()
-    bOK = bOK AND (newText = curText) AND locRes
-    if locRes then
-        Out.Log("Test 2 passed OK.")
-    else
-        Out.Log("Test 2 failed.")
-    End If
-    locRes = oObj.setText(oldText)
-    curText = oObj.getText()
-    bOK = bOK AND (curText = oldText) AND locRes
-    if locRes then
-        Out.Log("Test 3 passed OK.")
-    else
-        Out.Log("Test 3 failed.")
-    End If
-    Test.MethodTested("setText()",bOK)
-
-    out.dbg("Setting initial text: " + initialText )
-    oObj.setText(initialText)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/script.xlb
deleted file mode 100644
index d2109838e813..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEditableText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleEditableText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleEditableText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/accessibility_XAccessibleEventBroadcaster.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/accessibility_XAccessibleEventBroadcaster.xba
deleted file mode 100644
index e8dd62a677cb..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/accessibility_XAccessibleEventBroadcaster.xba
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleEventBroadcaster" script:language="StarBasic">
-&apos;*************************************************************************
-&apos;*
-' 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.
-'
-&apos;*************************************************************************
-&apos;*************************************************************************
-
-
-
-&apos; Be sure that all variables are dimensioned:
-option explicit
-
-&apos;*************************************************************************
-&apos; This Interface/Service test depends on the following GLOBAL variables,
-&apos; which must be specified in the object creation:
-
-&apos; fireEvent() precedure 
-&apos; located in component test
-
-&apos;*************************************************************************
-
-
-
-
-
-Dim oListener1 As Object
-Dim oListener2 As Object
-Dim bL1called As Boolean
-Dim bL2called As Boolean
-
-
-Sub RunTest()
-
-&apos;*************************************************************************
-&apos; INTERFACE: 
-&apos; com.sun.star.accessibility.XAccessibleEventBroadcaster
-&apos;*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim isTransient As Boolean
-    Dim stateSet As Variant
-    bOK = true
-
-    &apos;out.log(&quot;Creating Listeners...&quot;)
-    oListener1 = createUNOListener(&quot;EL1_&quot;,&quot;com.sun.star.accessibility.XAccessibleEventListener&quot;)
-    oListener2 = createUNOListener(&quot;EL2_&quot;,&quot;com.sun.star.accessibility.XAccessibleEventListener&quot;)
-    bOK = bOK AND NOT isNULL(oListener1) AND NOT isNULL(oListener2)
-    if NOT bOK then out.log( &quot;ERROR: Cannot create listeners...&quot;)
-
-    if NOT hasUNOInterfaces(oObj,&quot;com.sun.star.accessibility.XAccessibleContext&quot;) then
-        &apos;out.log(&quot;Object does not implement XAccessibleContext.&quot;)
-        isTransient = false
-    else
-        stateSet = oObj.getAccessibleStateSet()
-        isTransient = stateSet.contains(27)
-    End If
-
-    Test.StartMethod(&quot;addEventListener()&quot;)
-    bOK = true
-    bL1called = false
-    bL2called = false
-    &apos;out.log(&quot;Adding two listeners...&quot;)
-    oObj.com_sun_star_accessibility_XAccessibleEventBroadcaster_addEventListener(oListener1)
-    oObj.com_sun_star_accessibility_XAccessibleEventBroadcaster_addEventListener(oListener2)
-    &apos;out.log(&quot;fire event&quot;)
-    fireEvent()
-    wait(500)
-    out.log(&quot;Listener1 called: &quot;+bL1called)
-    out.log(&quot;Listener2 called: &quot;+bL2called)
-    if NOT isTransient then
-        bOK = bOK AND bL1called AND bL2called
-    else
-        &apos;out.log(&quot;Object is transient, listeners aren&apos;t expected to call.&quot;)
-        bOK = true
-    End If
-    Test.MethodTested(&quot;addEventListener()&quot;,bOK)
-
-
-    Test.StartMethod(&quot;removeEventListener()&quot;)
-    bOK = true
-    bL1called = false
-    bL2called = false
-    &apos;out.log(&quot;Removing one listener...&quot;)
-    oObj.com_sun_star_accessibility_XAccessibleEventBroadcaster_removeEventListener(oListener1)
-    &apos;out.log(&quot;fire event&quot;)
-    fireEvent()
-    wait(500)
-    out.log(&quot;Listener1 called: &quot;+bL1called)
-    out.log(&quot;Listener2 called: &quot;+bL2called)
-    if NOT isTransient then
-        bOK = bOK AND NOT bL1called AND bL2called
-    else
-        &apos;out.log(&quot;Object is transient, listeners aren&apos;t expected to call.&quot;)
-        bOK = true
-    End If
-    Test.MethodTested(&quot;removeEventListener()&quot;,bOK)
-
-    &apos; Removing the second listener...
-    oObj.com_sun_star_accessibility_XAccessibleEventBroadcaster_removeEventListener(oListener2)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub EL1_notifyEvent(ev As Variant)
-    &apos;out.log(&quot;CallBack for Listener1 notifyEvent was called.&quot;)
-    bL1called = true
-End Sub 
-
-Sub EL1_disposing()
-End Sub
-
-Sub EL2_notifyEvent(ev As Variant)
-    &apos;out.log(&quot;CallBack for Listener2 notifyEvent was called.&quot;)
-    bL2called = true
-End Sub
-
-Sub EL2_disposing()
-End Sub
-
-</script:module>
\ No newline at end of file
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/script.xlb
deleted file mode 100644
index 9a06ecd1c438..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleEventBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleEventBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleEventBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/accessibility_XAccessibleExtendedComponent.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/accessibility_XAccessibleExtendedComponent.xba
deleted file mode 100644
index 202adf953a6a..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/accessibility_XAccessibleExtendedComponent.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleExtendedComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleExtendedComponent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getFont()")
-    Dim font As Variant
-    Dim fDescr As new com.sun.star.awt.FontDescriptor
-    bOK = true
-    font = oObj.getFont()
-    if NOT isNull(font) then
-        fDescr = font.getFontDescriptor()
-        Out.Log("Font: "+fDescr.Name)
-    else
-        Out.Log("Font: null")
-    End If
-    Test.MethodTested("getFont()",bOK)
-
-    Test.StartMethod("getTitledBorderText()")
-    Dim tbText As String
-    bOK = true
-    tbText = oObj.getTitledBorderText()
-    Out.Log("TitledBorderText: "+tbText)
-    bOK = bOK AND NOT isNull(tbText)
-    Test.MethodTested("getTitledBorderText()",bOK)
-
-    Test.StartMethod("getToolTipText()")
-    Dim ttText As String
-    bOK = true
-    ttText = oObj.getToolTipText()
-    Out.Log("TitledBorderText: "+ttText)
-    bOK = bOK AND NOT isNull(ttText)
-    Test.MethodTested("getToolTipText()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/script.xlb
deleted file mode 100644
index de17e5c2c8c1..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleExtendedComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleExtendedComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleExtendedComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/accessibility_XAccessibleImage.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/accessibility_XAccessibleImage.xba
deleted file mode 100644
index 5278d8faaca7..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/accessibility_XAccessibleImage.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleImage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleImage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getAccessibleImageDescription()")
-    Dim descr As String
-    bOK = true
-    descr = oObj.getAccessibleImageDescription()
-    Out.Log("AccessibleImageDescription: "+descr)
-    bOK = bOK AND NOT isNull(descr)
-    Test.MethodTested("getAccessibleImageDescription()",bOK)
-
-    Test.StartMethod("getAccessibleImageHeight()")
-    Dim height As Long
-    bOK = true
-    height = oObj.getAccessibleImageHeight()
-    Out.Log("AccessibleImageHeight: "+height)
-    Test.MethodTested("getAccessibleImageHeight()",bOK)
-
-    Test.StartMethod("getAccessibleImageWidth()")
-    Dim width As Long
-    bOK = true
-    width = oObj.getAccessibleImageWidth()
-    Out.Log("AccessibleImageWidth: "+width)
-    Test.MethodTested("getAccessibleImageWidth()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/script.xlb
deleted file mode 100644
index 71df8d188c26..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleImage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleImage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleImage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/accessibility_XAccessibleSelection.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/accessibility_XAccessibleSelection.xba
deleted file mode 100644
index 584749823d72..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/accessibility_XAccessibleSelection.xba
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleSelection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'	Global multiSelection As Boolean
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleSelection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean, locRes As Boolean
-    Dim chCount As Long, selCount As Long
-    Dim i As Long, mCount As Integer
-
-    if multiSelection then
-        Out.Log("Object allows multiple selection!")
-    else
-        Out.Log("Object does not allow multiple selection!")
-    End If
-
-    chCount = oObj.getAccessibleChildCount()
-    selCount = oObj.getSelectedAccessibleChildCount()
-    Out.Log("Object has "+chCount+" child(ren), "+selCount+" of them selected.")
-    If (chCount &gt; 50) then
-        mCount = 50
-        Out.Log("Object has too many children. Testing only first 50.")
-    else
-        mCount = chCount
-    End If
-
-    clearSelection()
-
-    Test.StartMethod("selectAccessibleChild()")
-    bOK = true
-    if (mCount &gt; 0) then
-        i = mCount - 1
-        while (oObj.isAccessibleChildSelected(i) OR itemDisabled(oObj.getAccessibleChild(i))) AND (i &gt; 0)
-            i = i - 1
-        wend
-        if (i &gt;= 0) then 
-            Out.Log("Selecting child #"+i+"...")
-            oObj.selectAccessibleChild(i)
-            wait(500)
-            locRes = oObj.isAccessibleChildSelected(i)
-            Out.Log("Child #"+i+" selected: "+locRes)
-            bOK = bOK AND locRes
-        End If
-    End If
-    clearSelection()
-    Test.MethodTested("selectAccessibleChild()",bOK)
-
-    Test.StartMethod("isAccessibleChildSelected()")
-    bOK = true
-    if (mCount &gt; 0) then
-        i = mCount - 1
-        while (oObj.isAccessibleChildSelected(i) OR itemDisabled(oObj.getAccessibleChild(i))) AND (i &gt; 0)
-            i = i - 1
-        wend
-        if (i &gt;= 0) then 
-            Out.Log("Selecting child #"+i+"...")
-            oObj.selectAccessibleChild(i)
-            wait(500)
-            locRes = oObj.isAccessibleChildSelected(i)
-            Out.Log("Child #"+i+" selected: "+locRes)
-            bOK = bOK AND locRes
-        End If
-    End If
-    clearSelection()
-    Test.MethodTested("isAccessibleChildSelected()",bOK)
-
-    Test.StartMethod("clearAccessibleSelection()")
-    bOK = true
-    if (mCount &gt; 0) AND (multiSelection) then
-        oObj.selectAccessibleChild(chCount - 1)
-        wait(500)
-        oObj.clearAccessibleSelection()
-        wait(500)
-        bOK = bOK AND NOT oObj.isAccessibleChildSelected(mCount - 1)
-    else
-        Out.Log("Cannot clear all selection for this object!")
-    End If
-    Test.MethodTested("clearAccessibleSelection()",bOK)
-
-' ### The following property was not found in correspond IDL file! ###
-    Test.StartMethod("selectAllAccessibleChildren()")
-    bOK = true
-    i = 0
-    if ((mCount &gt; 0) AND multiSelection) then
-' ### The following property was not found in correspond IDL file! ###
-        oObj.selectAllAccessibleChildren()
-        wait(500)
-        while (i &lt; mCount)
-            bOK = bOK AND oObj.isAccessibleChildSelected(i)
-            i = i + 1
-        wend
-    else
-        Out.Log("Cannot select all children for this object!")
-    End If
-    clearSelection()
-    Test.MethodTested("selectAllAccessibleChildren()",bOK)
-
-    Test.StartMethod("getSelectedAccessibleChildCount()")
-    bOK = true
-    Out.Log("Selecting all...")
-    oObj.selectAllAccessibleChildren()
-    wait(500)
-    selCount = oObj.getSelectedAccessibleChildCount()
-    Out.Log("Selected "+selCount+" child(ren).")
-    If (multiSelection) then
-        bOK = bOK AND (selCount = chCount)
-    else
-        bOK = bOK AND (selCount = 1) 
-    End If
-    clearSelection()
-    selCount = oObj.getSelectedAccessibleChildCount()
-    if (multiSelection) then
-        bOK = bOK AND (selCount = 0)
-    else
-        bOK = bOK AND (selCount = 1)
-    End If
-    Test.MethodTested("getSelectedAccessibleChildCount()",bOK)
-
-    Test.StartMethod("getSelectedAccessibleChild()")
-    Dim selAccChild As Object, accChild As Object
-    bOK = true
-    if (mCount &gt; 0) then
-        i = mCount - 1
-        while (oObj.isAccessibleChildSelected(i) OR itemDisabled(oObj.getAccessibleChild(i))) AND (i &gt; 0)
-            i = i - 1
-        wend
-        if (i &gt;= 0) then
-            Out.Log("Selecting child #"+i+"...")
-            oObj.selectAccessibleChild(i)
-            wait(500)
-            Out.Log("Child #"+i+" selected: "+oObj.isAccessibleChildSelected(i))
-            Out.Log("Now "+oObj.getSelectedAccessibleChildCount()+" child(ren) selected.")
-            selCount = oObj.getSelectedAccessibleChildCount()
-            if (selCount &gt; 0) then
-                selAccChild = oObj.getSelectedAccessibleChild(selCount-1)
-                accChild = oObj.getAccessibleChild(i)
-                bOK = bOK AND utils.at_equals(accChild,selAccChild)                
-            else
-                Out.Log("There are no selected children. Test fails.")
-                bOK = false
-            End If           
-        End If
-    End If
-    Test.MethodTested("getSelectedAccessibleChild()",bOK)
-
-    Test.StartMethod("deselectAccessibleChild()")
-    Dim newSelCount As Long
-	Dim isSelected as Boolean
-    bOK = true
-	oObj.selectAllAccessibleChildren()
-	wait(500)
-    selCount = oObj.getSelectedAccessibleChildCount()
-    Out.Log("There was "+selCount+" selected child(ren)")
-    Out.Log("Deselecting child...")
-	for i = 0 to mCount - 1
-		if oObj.isAccessibleChildSelected(i) then
-			isSelected = true
-		end if
-        oObj.deselectAccessibleChild(i)
-        wait(500)
-        newSelCount = oObj.getSelectedAccessibleChildCount()
-		Out.Log("selCount = " + selCount + " newSelCount = " + newSelCount) 
-        if (multiSelection) then
-			if isSelected then
-				Out.Log("isSelected")
-	            bOK = bOK AND (selCount - 1 = newSelCount)
-			else
-	            bOK = bOK AND (selCount = newSelCount)
-			end if
-        else
-			Out.Log("is not multi")
-            bOK = bOK AND (newSelCount &lt;= 1)
-        End If
-		selCount = newSelCount
-	next
-    Test.MethodTested("deselectAccessibleChild()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub clearSelection()
-    if NOT multiSelection then Exit Sub
-    Dim selCount As Long
-    selCount = oObj.getSelectedAccessibleChildCount()
-    if (selCount = 0) then Exit Sub
-    oObj.clearAccessibleSelection()
-    wait(500)
-    selCount = oObj.getSelectedAccessibleChildCount()
-    if selCount = 0 then
-        Out.Log("Deselect all: success")
-    else
-        Out.Log("Deselect all: error!. "+selCount+" child(ren) remains selected.")
-    End If
-End Sub
-
-Function itemDisabled(oChild As Object) As Boolean
-    if NOT hasUNOInterfaces(oChild,"com.sun.star.accessibility.XAccessibleContext") then
-        oChild = oChild.getAccessibleContext()
-    End If
-    itemDisabled = NOT oChild.getAccessibleStateSet().contains(21)
-End Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/script.xlb
deleted file mode 100644
index 6f5d862cdcd3..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleSelection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleSelection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleSelection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/accessibility_XAccessibleTable.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/accessibility_XAccessibleTable.xba
deleted file mode 100644
index 5b02f88e703d..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/accessibility_XAccessibleTable.xba
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim implSel As Boolean
-
-    implSel = hasUNOInterfaces(oObj,"drafts.com.sun.star.accessibility.XAccessibleSelection")
-    if (NOT implSel) then
-        Out.Log("!!! The component doesn't implement the interface XAccessibleSelection.")
-        Out.Log("!!! This interface is required for more detailed tests.")
-    End If
-
-    Test.StartMethod("getAccessibleRowCount()")
-    Dim rowCount As Long
-    bOK = true
-    rowCount = oObj.getAccessibleRowCount()
-    Out.Log("Accessible row count: "+rowCount)
-    Test.MethodTested("getAccessibleRowCount()",bOK)
-
-    Test.StartMethod("getAccessibleColumnCount()")
-    Dim colCount As Long
-    bOK = true
-    colCount = oObj.getAccessibleColumnCount()
-    Out.Log("Accessible column count: "+colCount)
-    Test.MethodTested("getAccessibleColumnCount()",bOK)
-
-    Test.StartMethod("getAccessibleRowDescription()")
-    Dim rowDescr As String
-    bOK = true
-    if (rowCount &gt; 0) then
-        rowDescr = oObj.getAccessibleRowDescription(rowCount - 1)
-        Out.Log("Row "+(rowCount-1)+" description: "+rowDescr)
-        bOK = bOK AND NOT isNull(rowDescr)
-    else
-        Out.Log("!!! RowCount is 0. Could not test this method.")
-    End If
-    Test.MethodTested("getAccessibleRowDescription()",bOK)
-
-    Test.StartMethod("getAccessibleColumnDescription()")
-    Dim colDescr As String
-    bOK = true
-    if (colCount &gt; 0) then
-        colDescr = oObj.getAccessibleRowDescription(colCount - 1)
-        Out.Log("Column "+(colCount-1)+" description: "+colDescr)
-        bOK = bOK AND NOT isNull(colDescr)
-    else
-        Out.Log("!!! ColumnCount is 0. Could not test this method.")
-    End If
-    Test.MethodTested("getAccessibleColumnDescription()",bOK)
-
-    Test.StartMethod("getAccessibleRowExtentAt()")
-    Dim ext As Long
-    bOK = true
-    ext = oObj.getAccessibleRowExtentAt(rowCount - 1, colCount - 1)
-    Out.Log(ext)
-    bOK = bOK AND (ext &gt;= 1)
-    Test.MethodTested("getAccessibleRowExtentAt()",bOK)
-
-    Test.StartMethod("getAccessibleColumnExtentAt()")
-    bOK = true
-    ext = oObj.getAccessibleColumnExtentAt(rowCount - 1, colCount - 1)
-    Out.Log(ext)
-    bOK = bOK AND (ext &gt;= 1)
-    Test.MethodTested("getAccessibleColumnExtentAt()",bOK)
-
-    Test.StartMethod("getAccessibleRowHeaders()")
-    Dim rowHeaders As Object
-    bOK = true
-    rowHeaders = oObj.getAccessibleRowHeaders()
-    bOK = bOK AND NOT isNull(rowHeaders)
-    Test.MethodTested("getAccessibleRowHeaders()",bOK)
-
-    Test.StartMethod("getAccessibleColumnHeaders()")
-    Dim colHeaders As Object
-    bOK = true
-    colHeaders = oObj.getAccessibleColumnHeaders()
-    bOK = bOK AND NOT isNull(colHeaders)
-    Test.MethodTested("getAccessibleColumnHeaders()",bOK)
-
-    Test.StartMethod("getSelectedAccessibleRows()")
-    Dim selRows As Variant
-    Dim elCount As Long, i As Integer
-    Dim locRes As Boolean
-    bOK = true
-    if implSel then
-        oObj.selectAllAccessible()
-    End If
-    selRows = oObj.getSelectedAccessibleRows()
-    elCount = ubound(selRows) - 1
-    Out.Log("Returned sequence has "+elCount+" elements")
-    if implSel then
-        bOK = bOK AND (elCount = rowCount)
-    else
-        bOK = bOK AND (elCount = 0)
-    End If
-    if (elCount &gt; 0) then
-        Out.Log("Checking that returned sequence is in ascending order")
-    End If
-    i = 1
-    while (i &lt; elCount)
-        locRes = (selRows(i) &gt;= selRows(i-1))
-        bOK = bOK AND locRes
-        if NOT locRes then
-            Out.Log("Element "+i+" : Returned sequence is not in accending order.")
-            break
-        End If
-    wend
-    Test.MethodTested("getSelectedAccessibleRows()",bOK)
-
-    Test.StartMethod("getSelectedAccessibleColumns()")
-    Dim selCols As Variant
-    bOK = true
-    selCols = oObj.getSelectedAccessibleRows()
-    elCount = ubound(selCols) - 1
-    Out.Log("Returned sequence has "+elCount+" elements")
-    if implSel then
-        bOK = bOK AND (elCount = colCount)
-    else
-        bOK = bOK AND (elCount = 0)
-    End If
-    if (elCount &gt; 0) then
-        Out.Log("Checking that returned sequence is in ascending order")
-    End If
-    i = 1
-    while (i &lt; elCount)
-        locRes = (selCols(i) &gt;= selCols(i-1))
-        bOK = bOK AND locRes
-        if NOT locRes then
-            Out.Log("Element "+i+" : Returned sequence is not in accending order.")
-            break
-        End If
-    wend
-    Test.MethodTested("getSelectedAccessibleColumns()",bOK)
-
-    Test.StartMethod("isAccessibleRowSelected()")
-    Dim mCount As Integer
-    bOK = true
-    locRes = true
-    if (rowCount &gt; 299) then
-        mCount = 299
-    else
-        mCount = rowCount - 1
-    End If
-    for i=0 to mCount
-        locRes = oObj.isAccessibleRowSelected(i)
-        if implSel then
-            bOK = bOK AND locRes
-        else
-            bOK = bOK AND NOT locRes
-        End If
-    next i
-    Out.Log("Checked "+i+" of "+rowCount+" rows.")
-    Test.MethodTested("isAccessibleRowSelected()",bOK)
-
-    Test.StartMethod("isAccessibleColumnSelected()")
-    bOK = true
-    locRes = true
-    if (colCount &gt; 299) then
-        mCount = 299
-    else
-        mCount = colCount - 1
-    End If
-    for i=0 to mCount
-        locRes = oObj.isAccessibleColumnSelected(i)
-        if implSel then
-            bOK = bOK AND locRes
-        else
-            bOK = bOK AND NOT locRes
-        End If
-    next i
-    Out.Log("Checked "+i+" of "+colCount+" columns.")
-    Test.MethodTested("isAccessibleColumnSelected()",bOK)
-
-    Test.StartMethod("getAccessibleCellAt()")
-    Dim xAccCell As Object
-    bOK = true
-    xAccCell = oObj.getAccessibleCellAt(rowCount - 1, colCount - 1)
-    bOK = bOK AND NOT isNull(xAccCell)
-    Test.MethodTested("getAccessibleCellAt()",bOK)
-
-    Test.StartMethod("getAccessibleCaption()")
-    Dim caption As Object
-    bOK = true
-    caption = oObj.getAccessibleCaption()
-    Test.MethodTested("getAccessibleCaption()",bOK)
-
-    Test.StartMethod("getAccessibleSummary()")
-    Dim summary As Object
-    bOK = true
-    summary = oObj.getAccessibleSummary()
-    Test.MethodTested("getAccessibleSummary()",bOK)
-
-    Test.StartMethod("isAccessibleSelected()")
-    bOK = true
-    locRes = oObj.isAccessibleSelected(rowCount - 1, colCount - 1)
-    if implSel then
-        bOK = bOK AND locRes
-    else
-        bOK = bOK AND NOT locRes
-    End If
-    Test.MethodTested("isAccessibleSelected()",bOK)
-
-    Test.StartMethod("getAccessibleIndex()")
-    Dim ind As Long, expIndex As Long
-    bOK = true
-    ind = oObj.getAccessibleIndex(rowCount - 1, colCount - 1)
-    Out.Log("AccessibleIndex is: "+ind)
-    if NOT isNull(xAccCell) then
-        expIndex = xAccCell.getAccessibleContext().getAccessibleIndexInParent()
-        Out.Log("Expected index is: "+expIndex)
-        bOK = bOK AND (ind = expIndex)
-    End If
-    Test.MethodTested("getAccessibleIndex()",bOK)
-
-    Test.StartMethod("getAccessibleRow()")
-    Dim rowIndex As Long
-    Dim chCount As Long
-    bOK = true
-    if hasUNOInterfaces(oObj,"drafts.com.sun.star.accessibility.XAccessibleContext") then
-        chCount = oObj.getAccessibleChildCount()
-        rowIndex = oObj.getAccessibleRow(chCount - 1)
-        bOK = bOK AND (rowIndex &gt;= 0) AND (rowIndex &lt;= rowCount)
-    End If
-    rowIndex = oObj.getAccessibleRow(0)
-    bOK = bOK AND (rowIndex &gt;= 0) AND (rowIndex &lt;= rowCount)
-    Test.MethodTested("getAccessibleRow()",bOK)
-
-    Test.StartMethod("getAccessibleColumn()")
-    Dim colIndex As Long
-    bOK = true
-    if hasUNOInterfaces(oObj,"drafts.com.sun.star.accessibility.XAccessibleContext") then
-        chCount = oObj.getAccessibleChildCount()
-        colIndex = oObj.getAccessibleColumn(chCount - 1)
-        bOK = bOK AND (colIndex &gt;= 0) AND (colIndex &lt;= colCount)
-    End If
-    colIndex = oObj.getAccessibleColumn(0)
-    bOK = bOK AND (colIndex &gt;= 0) AND (colIndex &lt;= colCount)
-    Test.MethodTested("getAccessibleColumn()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/script.xlb
deleted file mode 100644
index 4620dadd95c2..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/accessibility_XAccessibleText.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/accessibility_XAccessibleText.xba
deleted file mode 100644
index 1ec8ddc02c6b..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/accessibility_XAccessibleText.xba
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'   Global accText as String
-'   Global readOnly as Boolean
-
-'*************************************************************************
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim chCount As Integer
-    Dim accTextSegment as new com.sun.star.accessibility.TextSegment
-
-    Test.StartMethod("getCharacterCount()")
-    bOK = true
-    chCount = oObj.getCharacterCount()
-    Out.Log("Character count: "+chCount)
-    bOK = bOK AND (len(accText) = chCount)
-    Test.MethodTested("getCharacterCount()",bOK)
-
-    Test.StartMethod("getCaretPosition()")
-    Test.StartMethod("setCaretPosition()")
-    bOK = true
-    Dim carPos As Integer
-    oObj.setCaretPosition(chCount - 1)
-    carPos = oObj.getCaretPosition()
-    if not readOnly then
-        Out.Log("getCaretPosition: " + carPos)
-        bOK = bOK AND (carPos = chCount - 1)
-    else
-        Out.Log("Object is read only and Caret position couldn't be set")
-    end if
-    Test.MethodTested("getCaretPosition()",bOK)
-    Test.MethodTested("setCaretPosition()",bOK)
-
-    Test.StartMethod("getCharacter()")
-    Dim i As Integer
-    bOK = true
-    for i = 0 to chCount-1
-        bOK = bOK AND (chr(oObj.getCharacter(i)) = _
-                                                utils.getCharacter(i+1,accText))
-    next i
-    Test.MethodTested("getCharacter()",bOK)
-
-    Test.StartMethod("getCharacterAttributes()")
-    Dim attrs() As Variant
-    Dim ReqAttrs(0) as String
-    bOK = true
-    attrs = oObj.getCharacterAttributes(chCount - 1, ReqAttrs())
-    bOK = bOK AND NOT isNull(attrs)
-    Out.Log("Properties ubound: "+ubound(attrs))
-    Test.MethodTested("getCharacterAttributes()",bOK)
-
-    Test.StartMethod("getCharacterBounds()")
-    Dim chBounds As new com.sun.star.awt.Rectangle
-    bOK = true
-    chBounds = oObj.getCharacterBounds(chCount - 1)
-    Out.Log("Character boundbox: "+chBounds.X+", "+chBounds.Y+", "+ _
-    chBounds.Width+", "+chBounds.Height)
-    bOK = bOK AND NOT isNull(chBounds)
-    Test.MethodTested("getCharacterBounds()",bOK)
-
-    Test.StartMethod("getIndexAtPoint()")
-    Dim index As Integer
-    Dim point As new com.sun.star.awt.Point
-    bOK = true
-    point.X = chBounds.X + 1
-    point.Y = chBounds.Y + 1
-    index = oObj.getIndexAtPoint(point)
-    bOK = bOK AND (index = chCount -1)
-    Test.MethodTested("getIndexAtPoint()",bOK)
-
-    Test.StartMethod("getSelectedText()")
-    bOK = true
-    oObj.setSelection(0, chCount)
-    if not readOnly then
-        bOK = bOK AND (accText = oObj.getSelectedText())
-    else
-        Out.Log("Object is unselectable")
-    end if
-    Test.MethodTested("getSelectedText()",bOK)
-
-    Test.StartMethod("getSelectionStart()")
-    bOK = true
-    oObj.setSelection(chCount-1,chCount)
-    if not readOnly then
-        bOK = bOK AND (oObj.getSelectionStart() = chCount -1)
-    else
-        Out.Log("Object is unselectable")
-    end if
-    Test.MethodTested("getSelectionStart()",bOK)
-
-    Test.StartMethod("getSelectionEnd()")
-    bOK = true
-    oObj.setSelection(0,chCount - 1)
-    if not readOnly then
-        bOK = bOK AND (oObj.getSelectionEnd() = chCount - 1)
-    else
-        Out.Log("Object is unselectable")
-    end if
-    Test.MethodTested("getSelectionEnd()",bOK)
-
-    Test.StartMethod("setSelection()")
-    bOK = true
-    if not readOnly then
-        bOK = bOK AND oObj.setSelection(0,chCount)
-    else
-        Out.Log("Object is unselectable")
-    end if
-    Test.MethodTested("setSelection()",bOK)
-
-    Test.StartMethod("getText()")
-    bOK = true
-    bOK = bOK AND (accText = oObj.getText())
-    Test.MethodTested("getText()",bOK)
-
-    Test.StartMethod("getTextRange()")
-    bOK = true
-    bOK = bOK AND (accText = oObj.getTextRange(0,chCount))
-    Test.MethodTested("getTextRange()",bOK)
-
-    Test.StartMethod("getTextAtIndex()")
-    bOK = true
-    accTextSegment = oObj.getTextAtIndex(chCount - 1, 4)
-    bOK = bOK AND (accText = accTextSegment.SegmentText)
-    Test.MethodTested("getTextAtIndex()",bOK)
-
-    Test.StartMethod("getTextBeforeIndex()")
-    bOK = true
-    accTextSegment = oObj.getTextBeforeIndex(1, 1)
-    bOK = bOK AND (accTextSegment.SegmentText = utils.getCharacter(1,accText))
-    Test.MethodTested("getTextBeforeIndex()",bOK)
-
-    Test.StartMethod("getTextBehindIndex()")
-    bOK = true
-    accTextSegment = oObj.getTextBehindIndex(chCount-2,1)
-    bOK = bOK AND (accTextSegment.SegmentText = utils.getCharacter(chCount,accText))
-    Test.MethodTested("getTextBehindIndex()",bOK)
-
-    Test.StartMethod("copyText()")
-    bOK = true
-    bOK = bOK AND oObj.copyText(0,chCount)
-    if readOnly then bOK = true
-    Test.MethodTested("copyText()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/script.xlb
deleted file mode 100644
index 26416634cad1..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/accessibility_XAccessibleValue.xba b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/accessibility_XAccessibleValue.xba
deleted file mode 100644
index d5a665a9842b..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/accessibility_XAccessibleValue.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="accessibility_XAccessibleValue" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.accessibility.XAccessibleValue
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getMinimumValue()")
-    Dim minVal As Variant
-    bOK = true
-    minVal = oObj.getMinimumValue()
-    Out.Log("Minimum value is "+minVal)
-    Test.MethodTested("getMinimumValue()",bOK)
-
-    Test.StartMethod("getMaximumValue()")
-    Dim maxVal As Variant
-    bOK = true
-    maxVal = oObj.getMaximumValue()
-    Out.Log("Maximum value is "+maxVal)
-    Test.MethodTested("getMaximumValue()",bOK)
-
-    Test.StartMethod("getCurrentValue()")
-    Dim curVal As Variant
-    bOK = true
-    curVal = oObj.getCurrentValue()
-    bOK = bOK AND (curVal &gt;= minVal) AND (curVal &lt;= maxVal)
-    Test.MethodTested("getCurrentValue()",bOK)
-
-
-    Test.StartMethod("setCurrentValue()")
-    Dim newVal As Variant, resVal As Variant
-    bOK = true
-    newVal = curVal + 1
-    if (newVal &gt; maxVal) then newVal = newVal - 2
-
-    Out.Log("Setting new value: "+newVal)
-    bOK = bOK AND oObj.setCurrentValue(newVal)
-    resVal = oObj.getCurrentValue()
-    Out.Log("Result: "+resVal)
-    bOK = bOK AND (Abs(newVal - resVal) &lt; 0.00001)
-
-    Out.Log("Setting new value: "+minVal)
-    bOK = bOK AND oObj.setCurrentValue(minVal)
-    resVal = oObj.getCurrentValue()
-    Out.Log("Result: "+resVal)
-    bOK = bOK AND (Abs(minVal - resVal) &lt; 0.00001)
-
-    Out.Log("Setting new value: "+maxVal)
-    bOK = bOK AND oObj.setCurrentValue(maxVal)
-    resVal = oObj.getCurrentValue()
-    Out.Log("Result: "+resVal)
-    bOK = bOK AND (Abs(maxVal - resVal) &lt; 0.00001)
-
-    newVal = minVal - 1
-    Out.Log("Setting new value: "+newVal)
-    bOK = bOK AND oObj.setCurrentValue(newVal)
-    resVal = oObj.getCurrentValue()
-    Out.Log("Result: "+resVal)
-    bOK = bOK AND (Abs(minVal - resVal) &lt; 0.00001)
-
-    newVal = maxVal + 1
-    Out.Log("Setting new value: "+newVal)
-    bOK = bOK AND oObj.setCurrentValue(newVal)
-    resVal = oObj.getCurrentValue()
-    Out.Log("Result: "+resVal)
-    bOK = bOK AND (Abs(maxVal - resVal) &lt; 0.00001)
-
-    Test.MethodTested("setCurrentValue()",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/script.xlb b/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/script.xlb
deleted file mode 100644
index 24a50a082374..000000000000
--- a/qadevOOo/tests/basic/ifc/accessibility/XAccessibleValue/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="accessibility_XAccessibleValue" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="accessibility_XAccessibleValue"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/awt_UnoControlButtonModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/awt_UnoControlButtonModel.xba
deleted file mode 100644
index d55c0adca69a..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/awt_UnoControlButtonModel.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("DefaultButton")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("PushButtonType", Array(0,1,2,3))
-    
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("ImageAlign")
-
-    PropertyTester.TestProperty("ImageURL")
-
-    PropertyTester.TestProperty("State")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/script.xlb
deleted file mode 100644
index 575dc0d406db..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/awt_UnoControlCheckBoxModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/awt_UnoControlCheckBoxModel.xba
deleted file mode 100644
index 779c47611918..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/awt_UnoControlCheckBoxModel.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlCheckBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlCheckBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("State", Array(0, 1, 2))
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("TriState")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/script.xlb
deleted file mode 100644
index bb8edace5f96..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlCheckBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlCheckBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlCheckBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/awt_UnoControlComboBoxModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/awt_UnoControlComboBoxModel.xba
deleted file mode 100644
index 781b03931675..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/awt_UnoControlComboBoxModel.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlComboBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlComboBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("Autocomplete")
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Dropdown")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("LineCount")
-
-    PropertyTester.TestProperty("MaxTextLen")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("StringItemList")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-    
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/script.xlb
deleted file mode 100644
index 042089bbce64..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlComboBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlComboBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlComboBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/awt_UnoControlContainerModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/awt_UnoControlContainerModel.xba
deleted file mode 100644
index 6c313fbc79c9..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/awt_UnoControlContainerModel.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlContainerModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlContainerModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/script.xlb
deleted file mode 100644
index 9cf1130d81fd..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlContainerModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlContainerModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlContainerModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/awt_UnoControlCurrencyFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/awt_UnoControlCurrencyFieldModel.xba
deleted file mode 100644
index 929b2f044ea2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/awt_UnoControlCurrencyFieldModel.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlCurrencyFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlCurrencyFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Long
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("CurrencySymbol")
-
-    PropertyTester.TestProperty("DecimalAccuracy")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("ShowThousandsSeparator")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Spin")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    Test.StartMethod("Value")
-    bOK = true
-    oldVal = oObj.Value
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 999) then 
-        oObj.Value = 999
-    else
-        oObj.Value = 1000
-    endif
-    newVal = oObj.Value
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("Value",bOK)
-
-    Test.StartMethod("ValueMax")
-    bOK = true
-    oldVal = oObj.ValueMax
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 1000000) then 
-        oObj.ValueMax = 1000000
-    else
-        oObj.ValueMax = 1000001
-    endif
-    newVal = oObj.ValueMax
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("ValueMax",bOK)
-
-    Test.StartMethod("ValueMin")
-    bOK = true
-    oldVal = oObj.ValueMin
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; -1000000) then 
-        oObj.ValueMin = -1000000
-    else
-        oObj.ValueMin = -1000001
-    endif
-    newVal = oObj.ValueMin
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("ValueMin",bOK)
-
-    PropertyTester.TestProperty("ValueStep")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("PrependCurrencySymbol")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/script.xlb
deleted file mode 100644
index 5c30de64c3d9..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlCurrencyFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlCurrencyFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlCurrencyFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/awt_UnoControlDateFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/awt_UnoControlDateFieldModel.xba
deleted file mode 100644
index f4ce19b0c3c3..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/awt_UnoControlDateFieldModel.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlDateFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlDateFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Date")
-
-    PropertyTester.TestProperty("DateMax")
-
-    PropertyTester.TestProperty("DateMin")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("DateFormat")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Spin")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-	PropertyTester.TestProperty("DateShowCentury")
-	
-	PropertyTester.TestProperty("Dropdown")
-	
-	PropertyTester.TestProperty("FontEmphasisMark")
-	
-	PropertyTester.TestProperty("FontRelief")
-	
-	PropertyTester.TestProperty("TextLineColor")
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/script.xlb
deleted file mode 100644
index e6df7c36ad13..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDateFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlDateFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlDateFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/awt_UnoControlDialogElement.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/awt_UnoControlDialogElement.xba
deleted file mode 100644
index e43f59078e63..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/awt_UnoControlDialogElement.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlDialogElement" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.UnoControlDialogElement
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("Height")
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("PositionX")
-
-    PropertyTester.TestProperty("PositionY")
-
-    PropertyTester.TestProperty("Step")
-
-    PropertyTester.TestProperty("TabIndex")
-
-    PropertyTester.TestProperty("Tag")
-
-    PropertyTester.TestProperty("Width")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/script.xlb
deleted file mode 100644
index 89e4478a99ea..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogElement/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlDialogElement" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="awt_UnoControlDialogElement"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/awt_UnoControlDialogModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/awt_UnoControlDialogModel.xba
deleted file mode 100644
index 803bb0f589fa..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/awt_UnoControlDialogModel.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlDialogModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlDialogModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("Sizeable")
-
-    PropertyTester.TestProperty("Closeable")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("Moveable")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/script.xlb
deleted file mode 100644
index 2620497dbca1..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlDialogModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlDialogModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlDialogModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/awt_UnoControlEditModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/awt_UnoControlEditModel.xba
deleted file mode 100644
index 8b8897e24304..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/awt_UnoControlEditModel.xba
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlEditModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlEditModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Align")
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("EchoChar")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("HardLineBreaks")
-
-    PropertyTester.TestProperty("HScroll")
-
-    PropertyTester.TestProperty("MaxTextLen")
-
-    PropertyTester.TestProperty("MultiLine")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("VScroll")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/script.xlb
deleted file mode 100644
index 2d5fed3dde2a..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlEditModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlEditModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlEditModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/awt_UnoControlFileControlModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/awt_UnoControlFileControlModel.xba
deleted file mode 100644
index e1503c8db41b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/awt_UnoControlFileControlModel.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlFileControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlFileControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/script.xlb
deleted file mode 100644
index 6a8d0cd06aa6..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFileControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlFileControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlFileControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/awt_UnoControlFixedLineModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/awt_UnoControlFixedLineModel.xba
deleted file mode 100644
index 06143238c33c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/awt_UnoControlFixedLineModel.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlFixedLineModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlFixedLineModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/script.xlb
deleted file mode 100644
index 8a4820d1748c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedLineModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlFixedLineModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlFixedLineModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/awt_UnoControlFixedTextModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/awt_UnoControlFixedTextModel.xba
deleted file mode 100644
index a6266d0f68cd..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/awt_UnoControlFixedTextModel.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlFixedTextModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlFixedTextModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Align")
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("MultiLine")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/script.xlb
deleted file mode 100644
index 1afae23f637f..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFixedTextModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlFixedTextModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlFixedTextModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/awt_UnoControlFormattedFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/awt_UnoControlFormattedFieldModel.xba
deleted file mode 100644
index 13123db2711c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/awt_UnoControlFormattedFieldModel.xba
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlFormattedFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlFormattedFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Long
-
-    PropertyTester.TestProperty("Align")
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("EffectiveDefault")
-
-    Test.StartMethod("EffectiveValue")
-    bOK = true
-    oldVal = oObj.EffectiveValue
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 9999) then 
-        oObj.EffectiveValue = 9999
-    else
-        oObj.EffectiveValue = 10000
-    endif
-    newVal = oObj.EffectiveValue
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("EffectiveValue",bOK)
-
-    Test.StartMethod("EffectiveMax")
-    bOK = true
-    oldVal = oObj.EffectiveMax
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 100000) then 
-        oObj.EffectiveMax = 100000
-    else
-        oObj.EffectiveMax = 100001
-    endif
-    newVal = oObj.EffectiveMax
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("EffectiveMax",bOK)
-
-    Test.StartMethod("EffectiveMin")
-    bOK = true
-    oldVal = oObj.EffectiveMin
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; -100000) then 
-        oObj.EffectiveMin = -100000
-    else
-        oObj.EffectiveMin = -100001
-    endif
-    newVal = oObj.EffectiveMin
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("EffectiveMin",bOK)
-
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("FormatKey")
-
-    PropertyTester.TestProperty("FormatsSupplier")
-
-    PropertyTester.TestProperty("MaxTextLen")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Spin")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-    PropertyTester.TestProperty("TreatAsNumber")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/script.xlb
deleted file mode 100644
index 323535b485e2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlFormattedFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlFormattedFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlFormattedFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/awt_UnoControlGroupBoxModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/awt_UnoControlGroupBoxModel.xba
deleted file mode 100644
index 2be838ae72a0..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/awt_UnoControlGroupBoxModel.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlGroupBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlGroupBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/script.xlb
deleted file mode 100644
index 8bf009c7ad32..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlGroupBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlGroupBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlGroupBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/awt_UnoControlImageControlModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/awt_UnoControlImageControlModel.xba
deleted file mode 100644
index c77f88d0042c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/awt_UnoControlImageControlModel.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlImageControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlImageControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("ImageURL")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("ScaleImage")
-
-    PropertyTester.TestProperty("Tabstop")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/script.xlb
deleted file mode 100644
index 78f757c5fae6..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlImageControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlImageControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlImageControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/awt_UnoControlListBoxModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/awt_UnoControlListBoxModel.xba
deleted file mode 100644
index 5de3bb3a9794..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/awt_UnoControlListBoxModel.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlListBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlListBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Dropdown")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("LineCount")
-
-    PropertyTester.TestProperty("MultiSelection")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("SelectedItems")
-
-    PropertyTester.TestProperty("StringItemList")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/script.xlb
deleted file mode 100644
index 1748dfbeff32..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlListBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlListBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlListBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlModel/awt_UnoControlModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlModel/awt_UnoControlModel.xba
deleted file mode 100644
index bdffcb1337e8..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlModel/awt_UnoControlModel.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlModel" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.UnoControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-'
-    PropertyTester.TestProperty("DefaultControl")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlModel/script.xlb
deleted file mode 100644
index 583895a0bcd4..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlModel" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="awt_UnoControlModel"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/awt_UnoControlNumericFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/awt_UnoControlNumericFieldModel.xba
deleted file mode 100644
index 55c389124214..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/awt_UnoControlNumericFieldModel.xba
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlNumericFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlNumericFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Long
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("DecimalAccuracy")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("ShowThousandsSeparator")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Spin")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    Test.StartMethod("Value")
-    bOK = true
-    oldVal = oObj.Value
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 999) then 
-        oObj.Value = 999
-    else
-        oObj.Value = 1000
-    endif
-    newVal = oObj.Value
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("Value",bOK)
-
-    Test.StartMethod("ValueMax")
-    bOK = true
-    oldVal = oObj.ValueMax
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 10000) then 
-        oObj.ValueMax = 10000
-    else
-        oObj.ValueMax = 10001
-    endif
-    newVal = oObj.ValueMax
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("ValueMax",bOK)
-
-    Test.StartMethod("ValueMin")
-    bOK = true
-    oldVal = oObj.ValueMin
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; -10000) then 
-        oObj.ValueMin = -10000
-    else
-        oObj.ValueMin = -10001
-    endif
-    newVal = oObj.ValueMin
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("ValueMin",bOK)
-
-    PropertyTester.TestProperty("ValueStep")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/script.xlb
deleted file mode 100644
index 0755e1320b9a..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlNumericFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlNumericFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlNumericFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/awt_UnoControlPatternFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/awt_UnoControlPatternFieldModel.xba
deleted file mode 100644
index 096ee101f54c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/awt_UnoControlPatternFieldModel.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlPatternFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlPatternFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("EditMask")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("LiteralMask")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("Text")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("MaxTextLen")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/script.xlb
deleted file mode 100644
index b37bb62f8f7e..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlPatternFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlPatternFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlPatternFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/awt_UnoControlProgressBarModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/awt_UnoControlProgressBarModel.xba
deleted file mode 100644
index c14ed80fd151..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/awt_UnoControlProgressBarModel.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlProgressBarModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlProgressBarModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FillColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ProgressValue")
-
-    PropertyTester.TestProperty("ProgressValueMax")
-
-    PropertyTester.TestProperty("ProgressValueMin")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/script.xlb
deleted file mode 100644
index 388de9e782d6..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlProgressBarModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlProgressBarModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlProgressBarModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/awt_UnoControlRadioButtonModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/awt_UnoControlRadioButtonModel.xba
deleted file mode 100644
index 4babfe686c5b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/awt_UnoControlRadioButtonModel.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlRadioButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlRadioButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("Label")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("State", Array(0,1))
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/script.xlb
deleted file mode 100644
index e3e8530eb508..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlRadioButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlRadioButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlRadioButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/awt_UnoControlScrollBarModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/awt_UnoControlScrollBarModel.xba
deleted file mode 100644
index 103266b45df2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/awt_UnoControlScrollBarModel.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlScrollBarModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlScrollBarModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BlockIncrement")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("LineIncrement")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ScrollValue")
-
-    PropertyTester.TestProperty("ScrollValueMax")
-
-    PropertyTester.TestProperty("VisibleSize")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/script.xlb
deleted file mode 100644
index 00d8fd9cf3e7..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlScrollBarModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlScrollBarModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlScrollBarModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/awt_UnoControlTimeFieldModel.xba b/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/awt_UnoControlTimeFieldModel.xba
deleted file mode 100644
index f7fbdf2c94a1..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/awt_UnoControlTimeFieldModel.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_UnoControlTimeFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.awt.UnoControlTimeFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("BackgroundColor")
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("FontEmphasisMark")
-
-    PropertyTester.TestProperty("FontRelief")
-
-    PropertyTester.TestProperty("HelpText")
-
-    PropertyTester.TestProperty("HelpURL")
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("ReadOnly")
-
-    PropertyTester.TestProperty("Spin")
-
-    PropertyTester.TestProperty("StrictFormat")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-    PropertyTester.TestProperty("TextLineColor")
-
-    PropertyTester.TestProperty("Time")
-
-    PropertyTester.TestProperty("TimeFormat")
-
-    PropertyTester.TestProperty("TimeMax")
-
-    PropertyTester.TestProperty("TimeMin")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/script.xlb
deleted file mode 100644
index 482f6d802418..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/UnoControlTimeFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_UnoControlTimeFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_UnoControlTimeFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XButton/awt_XButton.xba b/qadevOOo/tests/basic/ifc/awt/XButton/awt_XButton.xba
deleted file mode 100644
index c01f3669a326..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XButton/awt_XButton.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bAL_actionPerformed As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener As Object
-
-    Out.Log("create com.sun.star.awt.XActionListener")
-    oListener = createUNOListener("AL_", "com.sun.star.awt.XActionListener")
-
-    Test.StartMethod("addActionListener()")
-    bAL_actionPerformed = False
-    oObj.addActionListener(oListener)
-    Out.Log("Can be checked only interactively !!!")
-    bOK = True
-    Test.MethodTested("addActionListener()", bOK)
-
-    Test.StartMethod("removeActionListener()")
-    oObj.removeActionListener(oListener)
-    bOK = true
-    Test.MethodTested("removeActionListener()", bOK)
-
-    Test.StartMethod("setLabel()")
-    oObj.setLabel("XButton Label")
-    bOK = True
-    Test.MethodTested("setLabel()", bOK)
-
-    Test.StartMethod("setActionCommand()")
-    oObj.setActionCommand("XButtonComand")
-    bOK = True
-    Test.MethodTested("setActionCommand()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub AL_disposing
-End Sub
-
-Sub AL_actionPerformed
-    Out.Log("CallBack for ActionListener actionPerformed was called.")
-    bAL_actionPerformed = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XButton/script.xlb b/qadevOOo/tests/basic/ifc/awt/XButton/script.xlb
deleted file mode 100644
index 7ef5c2ab0762..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XCheckBox/awt_XCheckBox.xba b/qadevOOo/tests/basic/ifc/awt/XCheckBox/awt_XCheckBox.xba
deleted file mode 100644
index 30036638c4a2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XCheckBox/awt_XCheckBox.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XCheckBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bIL_itemStateChanged As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XCheckBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener As Object
-
-    bIL_itemStateChanged = False
-    out.log("create listener for item events")
-    oListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-
-    Test.StartMethod("addItemListener()")
-    oObj.addItemListener(oListener)
-    out.log("Can be checked only interactively !!!")
-    bOK = True
-    Test.MethodTested("addItemListener()", bOK)
-
-    Test.StartMethod("removeItemListener()")
-    oObj.removeItemListener(oListener)
-    bOK = True
-    Test.MethodTested("removeItemListener()", bOK)
-
-    Test.StartMethod("getState()")
-    Test.StartMethod("setState()")
-    Dim state, newState As Integer
-    state = oObj.getState()
-    Out.Log("current state of check-box: " + state)
-    newState = 0
-    If state = 0 Then
-        newState = 1
-    EndIf
-    Out.Log("set new state: " + newState)
-    oObj.setState(newState)
-    bOK = (newState = oObj.getState())
-    Test.MethodTested("getState()", bOK)
-    Test.MethodTested("setState()", bOK)
-
-    Test.StartMethod("setLabel()")
-    oObj.setLabel("XCheckBox test")
-    bOK = true
-    Test.MethodTested("setLabel()", bOK)
-
-    Test.StartMethod("enableTriState()")
-    oObj.enableTriState(True)
-    bOK = true
-    Test.MethodTested("enableTriState()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub IL_disposing
-End Sub
-
-Sub IL_itemStateChanged
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    bIL_itemStateChanged = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XCheckBox/script.xlb b/qadevOOo/tests/basic/ifc/awt/XCheckBox/script.xlb
deleted file mode 100644
index 2b7206d80a00..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XCheckBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XCheckBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XCheckBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XComboBox/awt_XComboBox.xba b/qadevOOo/tests/basic/ifc/awt/XComboBox/awt_XComboBox.xba
deleted file mode 100644
index 574a6f6576a0..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XComboBox/awt_XComboBox.xba
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bIL_itemStateChanged, bAL_actionPerformed As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oIListener, oAListener As Object
-
-    bIL_itemStateChanged = False
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-
-    Test.StartMethod("addItemListener()")
-    oObj.addItemListener(oIListener)
-    bOK = True
-    Test.MethodTested("addItemListener()", bOK)
-
-    Test.StartMethod("removeItemListener()")
-    oObj.removeItemListener(oIListener)
-    bOK = True
-    Test.MethodTested("removeItemListener()", bOK)
-
-    bAL_actionPerformed = False
-    oAListener = createUnoListener("AL_", "com.sun.star.awt.XActionListener")
-    Test.StartMethod("addActionListener()")
-    oObj.addActionListener(oAListener)
-    bOK = True
-    Test.MethodTested("addActionListener()", bOK)
-
-    Test.StartMethod("removeActionListener()")
-    oObj.removeActionListener(oAListener)
-    bOK = True
-    Test.MethodTested("removeActionListener()", bOK)
-
-    Dim itemCount As Integer
-    Test.StartMethod("getItemCount()")
-    itemCount = oObj.getItemCount()
-    bOK = itemCount &gt; 0 or itemCount = 0
-    Test.MethodTested("getItemCount()", bOK)
-
-    Test.StartMethod("addItem()")
-    oObj.addItem("Item1", itemCount)
-    bOK = oObj.getItemCount() = (itemCount + 1)
-    Test.MethodTested("addItem()", bOK)
-
-    Dim itemNames As Variant
-    itemNames = Array("Item2", "Item3")
-    Dim oldCount As Integer
-    oldCount = oObj.getItemCount()
-    Test.StartMethod("addItems()")
-    oObj.addItems(itemNames(), oldCount)
-    bOK = (oldCount + 2) = oObj.getItemCount()
-    Test.MethodTested("addItems()", bOK)
-
-    Test.StartMethod("getItem()")
-    bOK = (oObj.getItem(itemCount) = "Item1")
-    Test.MethodTested("getItem()", bOK)
-
-    Test.StartMethod("getItems()")
-    itemNames = oObj.getItems()
-    Dim i As Integer
-    bOK = True
-    Dim iname As String
-    For i = itemCount to itemCount + 2
-        iname = "Item" + (i + 1)
-        bOK = bOK and itemNames(i) = iname
-        out.log(iname + "   " + itemNames(i))
-    Next i
-    Test.MethodTested("getItems()", bOK)
-
-    Test.StartMethod("removeItems()")
-    oObj.removeItems(0, oObj.getItemCount())
-    bOK = oObj.getItemCount = 0
-    Test.MethodTested("removeItems()", bOK)
-
-    Dim lineCount As Integer
-    Test.StartMethod("getDropDownLineCount()")
-    lineCount = oObj.getDropDownLineCount()
-    bOK = True
-    Test.MethodTested("getDropDownLineCount()", bOK)
-
-    Test.StartMethod("setDropDownLineCount()")
-    oObj.setDropDownLineCount(lineCount + 1)
-    bOK = oObj.getDropDownLineCount() = lineCount + 1
-    Test.MethodTested("setDropDownLineCount()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub IL_itemStateChanged
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    bIL_itemStateChanged = true
-End Sub
-
-Sub AL_actionPerformed
-    Out.Log("CallBack for ActionListener actionPerformed was called.")
-    bAL_actionPerformed = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XComboBox/script.xlb b/qadevOOo/tests/basic/ifc/awt/XComboBox/script.xlb
deleted file mode 100644
index 042993e00091..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XControl/awt_XControl.xba b/qadevOOo/tests/basic/ifc/awt/XControl/awt_XControl.xba
deleted file mode 100644
index e66aadc3b22b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XControl/awt_XControl.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global oModel As Object
-'Global oContext As Object
-'Global oWinpeer As Object
-'Global oToolkit As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XControl
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    If isNull(oContext) then
-       Out.Log("'oContext' as global variable required!")
-    End If
-    If isNull(oWinpeer) then
-       Out.Log("'oWinper' as global variable required!")
-    End If
-    If isNull(oToolkit) then
-       Out.Log("'oToolkit' as global variable required!")
-    End If
-
-    Test.StartMethod("setContext()")
-    bOK = true
-    oObj.setContext(oContext)
-    Test.MethodTested("setContext()", bOK)
-
-    Test.StartMethod("getContext()")
-    bOK = hasUnoInterfaces(oObj.getContext(), "com.sun.star.uno.XInterface")
-    Test.MethodTested("getContext()", bOK)
-
-    Test.StartMethod("createPeer()")
-    bOK = true
-    oObj.createPeer(oToolkit, oWinpeer)
-    Test.MethodTested("createPeer()", bOK)
-
-    Test.StartMethod("getPeer()")
-    bOK = hasUnoInterfaces(oObj.getPeer(),"com.sun.star.awt.XWindowPeer")
-    Test.MethodTested("getPeer()", bOK)
-
-    Test.StartMethod("setModel()")
-    bOK = true
-    oObj.setModel(oModel)
-    Test.StartMethod("getModel()")
-    bOK = bOK AND hasUnoInterfaces(oObj.getModel(), "com.sun.star.awt.XControlModel")
-    Test.MethodTested("setModel()", bOK)
-    Test.MethodTested("getModel()", bOK)
-
-    Test.StartMethod("getView()")
-    bOK = hasUnoInterfaces(oObj.getView(), "com.sun.star.awt.XView")
-    Test.MethodTested("getView()", bOK)
-
-    Test.StartMethod("setDesignMode()")
-    bOK = true
-    oObj.setDesignMode(true)
-    Test.StartMethod("isDesignMode()")
-    bOk = bOk AND oObj.isDesignMode()
-    oObj.setDesignMode(false)
-    bOk = bOk AND NOT oObj.isDesignMode()
-    Test.MethodTested("setDesignMode()", bOK)
-    Test.MethodTested("isDesignMode()", bOK)
-
-    Test.StartMethod("isTransparent()")
-    bOk = VarType(oObj.isTransparent()) = 11
-    Test.MethodTested("isTransparent()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XControl/script.xlb b/qadevOOo/tests/basic/ifc/awt/XControl/script.xlb
deleted file mode 100644
index 1f8c19a30aa1..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XControlContainer/awt_XControlContainer.xba b/qadevOOo/tests/basic/ifc/awt/XControlContainer/awt_XControlContainer.xba
deleted file mode 100644
index 518671293db0..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XControlContainer/awt_XControlContainer.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XControlContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global oXControl1 as Object
-'Global oXControl2 as Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XControlContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    If isNull(oXControl1) then
-       Out.Log("'oXControl1' as global variable required!")
-    End If
-    If isNull(oXControl2) then
-       Out.Log("'oXControl2' as global variable required!")
-    End If
-
-    Dim vGetControls As Variant
-    Dim oGetControl As Object
-
-    Test.StartMethod("setStatusText()")
-    bOK = true
-    oObj.setStatusText("testing XControlContainer::setStatusText(String)")
-    Test.MethodTested("setStatusText()", bOK)
-
-    Test.StartMethod("addControl()")
-    bOK = true
-    oObj.addControl("Control1", oXControl1)
-    oObj.addControl("Control2", oXControl2)
-    Test.StartMethod("getControls()")
-    vGetControls = oObj.getControls()
-Dim nControls As Integer
-    nControls = uBound(vGetControls)
-    bOK = bOK AND (nControls &gt;= 1)
-    Test.MethodTested("addControl()", bOK)
-    Test.MethodTested("getControls()", bOK)
-
-    Test.StartMethod("getControl()")
-    oGetControl = oObj.getControl("Control1")
-    bOK = bOK AND NOT isNull(oGetControl)
-    Test.MethodTested("getControl()", bOK)
-
-    Test.StartMethod("removeControl()")
-    bOK = true
-    oObj.removeControl(oXControl2)
-    Test.StartMethod("getControls()")
-    vGetControls = oObj.getControls()
-    bOK = bOK AND ((nControls - ubound(vGetControls)) = 1)
-    Test.MethodTested("removeControl()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XControlContainer/script.xlb b/qadevOOo/tests/basic/ifc/awt/XControlContainer/script.xlb
deleted file mode 100644
index a9d5ee8ca37b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XControlContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XControlContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XControlContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XCurrencyField/awt_XCurrencyField.xba b/qadevOOo/tests/basic/ifc/awt/XCurrencyField/awt_XCurrencyField.xba
deleted file mode 100644
index 94e0acfe8bc2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XCurrencyField/awt_XCurrencyField.xba
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XCurrencyField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XCurrencyField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getValue()")
-    Dim value As Double
-    value = oObj.getValue()
-    bOK = True
-    Test.MethodTested("getValue()", bOK)
-
-    Test.StartMethod("setValue()")
-    oObj.setValue(value + 1.1)
-    bOK = oObj.getValue() = (value + 1.1)
-    Test.MethodTested("setValue()", bOK)
-
-    Test.StartMethod("getMin()")
-    Dim min As Double
-    min = oObj.getMin()
-    bOK = True
-    Test.MethodTested("getMin()", bOK)
-
-    Test.StartMethod("setMin()")
-    oObj.setMin(min + 1.1)
-    bOK = oObj.getMin() = (min + 1.1)
-    Test.MethodTested("setMin()", bOK)
-
-    Test.StartMethod("getMax()")
-    Dim max As Double
-    max = oObj.getMax()
-    bOK = True
-    Test.MethodTested("getMax()", bOK)
-
-    Test.StartMethod("setMax()")
-    oObj.setMax(max + 1.1)
-    bOK = oObj.getMax() = (max + 1.1)
-    Test.MethodTested("setMax()", bOK)
-
-    Test.StartMethod("getFirst()")
-    Dim first As Double
-    first = oObj.getFirst()
-    bOK = True
-    Test.MethodTested("getFirst()", bOK)
-
-    Test.StartMethod("setFirst()")
-    oObj.setFirst(first + 1.1)
-    bOK = oObj.getFirst() = first + 1.1
-    Test.MethodTested("setFirst()", bOK)
-
-    Test.StartMethod("getLast()")
-    Dim last As Double
-    last = oObj.getLast()
-    bOK = True
-    Test.MethodTested("getLast()", bOK)
-
-    Test.StartMethod("setLast()")
-    oObj.setLast(last + 1.1)
-    bOK = oObj.getLast() = (last + 1.1)
-    Test.MethodTested("setLast()", bOK)
-
-    Test.StartMethod("getSpinSize()")
-    Dim spinSize As Double
-    spinSize = oObj.getSpinSize()
-    bOK = True
-    Test.MethodTested("getSpinSize()", bOK)
-
-    Test.StartMethod("setSpinSize()")
-    oObj.setSpinSize(spinSize + 1.1)
-    bOK = oObj.getSpinSize() = (spinSize + 1.1)
-    Test.MethodTested("setSpinSize()", bOK)
-
-    Test.StartMethod("getDecimalDigits()")
-    Dim digits As Integer
-    digits = oObj.getDecimalDigits()
-    bOK = True
-    Test.MethodTested("getDecimalDigits()", bOK)
-
-    Test.StartMethod("setDecimalDigits()")
-    oObj.setDecimalDigits(digits + 1)
-    bOK = oObj.getDecimalDigits() = (digits + 1)
-    Test.MethodTested("setDecimalDigits()", bOK)
-
-    Test.StartMethod("isStrictFormat()")
-    Dim strict As Boolean
-    strict = oObj.isStrictFormat()
-    bOK = True
-    Test.MethodTested("isStrictFormat()", bOK)
-
-    Test.StartMethod("setStrictFormat()")
-    oObj.setStrictFormat(Not strict)
-    bOK = oObj.isStrictFormat() &lt;&gt; strict
-    Test.MethodTested("setStrictFormat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XCurrencyField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XCurrencyField/script.xlb
deleted file mode 100644
index 54cb2fa783c1..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XCurrencyField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XCurrencyField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XCurrencyField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/awt_XDataTransferProviderAccess.xba b/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/awt_XDataTransferProviderAccess.xba
deleted file mode 100644
index 7184cc654875..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/awt_XDataTransferProviderAccess.xba
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XDataTransferProviderAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XDataTransferProviderAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    ' Here create a window for testing getDragGestureRecognizer(), getDragSource(), getDropTarget() methods
-    Dim oWndDescr As new com.sun.star.awt.WindowDescriptor
-    Dim oBounds As new com.sun.star.awt.Rectangle
-    oWndDescr.Type = com.sun.star.awt.WindowClass.TOP
-    oWndDescr.WindowServiceName = ""
-    oWndDescr.ParentIndex = -1
-    oBounds.X = 10 : oBounds.Y = 20
-    oBounds.Width = 110 : oBounds.Height = 120
-    oWndDescr.Bounds = oBounds
-    with com.sun.star.awt.WindowAttribute
-        oWndDescr.WindowAttributes = .CLOSEABLE AND .MOVEABLE AND .SIZEABLE AND .BORDER AND .SHOW
-    end with
-
-    Dim oWnd As Object
-    oWnd = oObj.createWindow(oWndDescr)
-
-    Test.StartMethod("getDragGestureRecognizer()")
-    bOK = true
-    Dim oRecognizer As Object
-    oRecognizer = oObj.getDragGestureRecognizer(oWnd)
-    Out.Log("Recognizer is NULL : " &amp; isNULL(oRecognizer))
-    bOK = bOK AND NOT isNULL(oRecognizer)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oRecognizer, "com.sun.star.datatransfer.dnd.XDragGestureRecognizer")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XDragGestureRecognizer interface.")
-    end if
-    Test.MethodTested("getDragGestureRecognizer()", bOK)
-
-    Test.StartMethod("getDragSource()")
-    bOK = true
-    Dim oDragSource As Object
-    oDragSource = oObj.getDragSource(oWnd)
-    Out.Log("DragSource is NULL : " &amp; isNULL(oDragSource))
-    bOK = bOK AND NOT isNULL(oDragSource)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oDragSource, "com.sun.star.datatransfer.dnd.XDragSource")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XDragSource interface.")
-    end if
-    Test.MethodTested("getDragSource()", bOK)
-
-    Test.StartMethod("getDropTarget()")
-    bOK = true
-    Dim oDropTarget As Object
-    oDropTarget = oObj.getDropTarget(oWnd)
-    Out.Log("DropTarget is NULL : " &amp; isNULL(oDropTarget))
-    bOK = bOK AND NOT isNULL(oDropTarget)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oDropTarget, "com.sun.star.datatransfer.dnd.XDropTarget")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XDropTarget interface.")
-    end if
-     Test.MethodTested("getDropTarget()", bOK)
-
-    Test.StartMethod("getClipboard()")
-    bOK = true
-    Dim oClipboard As Object
-    oClipboard = oObj.getClipboard("")
-    Out.Log("Clipboard is NULL : " &amp; isNULL(oClipboard))
-    bOK = bOK AND NOT isNULL(oClipboard)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oClipboard, "com.sun.star.datatransfer.clipboard.XClipboard")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XClipboard interface.")
-    end if
-    Test.MethodTested("getClipboard()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/script.xlb b/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/script.xlb
deleted file mode 100644
index e574ae92bd2b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDataTransferProviderAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XDataTransferProviderAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XDataTransferProviderAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDateField/awt_XDateField.xba b/qadevOOo/tests/basic/ifc/awt/XDateField/awt_XDateField.xba
deleted file mode 100644
index c6b2d9589415..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDateField/awt_XDateField.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XDateField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XDateField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("setDate()")
-    bOK = true
-    oObj.setDate(5087)
-    Test.StartMethod("getDate()")
-    bOK = bOK AND (oObj.getDate() = 5087)
-    Test.MethodTested("setDate()", bOK)
-    Test.MethodTested("getDate()", bOK)
-
-    Test.StartMethod("setMin()")
-    bOK = true
-    oObj.setMin(4978)
-    Test.StartMethod("getMin()")
-    bOK = bOK AND (oObj.getMin() = 4978)
-    Test.MethodTested("setMin()", bOK)
-    Test.MethodTested("getMin()", bOK)
-
-    Test.StartMethod("setMax()")
-    bOK = true
-    oObj.setMax(27856)
-    Test.StartMethod("getMax()")
-    bOK = bOK AND (oObj.getMax() = 27856)
-    Test.MethodTested("setMax()", bOK)
-    Test.MethodTested("getMax()", bOK)
-
-    Test.StartMethod("setFirst()")
-    bOK = true
-    oObj.setFirst(5118)
-    Test.StartMethod("getFirst()")
-    bOK = bOK AND (oObj.getfirst() = 5118)
-    Test.MethodTested("setFirst()", bOK)
-    Test.MethodTested("getFirst()", bOK)
-
-    Test.StartMethod("setLast()")
-    bOK = true
-    oObj.setLast(23450)
-    Test.StartMethod("getLast()")
-    bOK = bOK AND (oObj.getLast() = 23450)
-    Test.MethodTested("setLast()", bOK)
-    Test.MethodTested("getLast()", bOK)
-
-    Test.StartMethod("setLongFormat()")
-    bOK = true
-    oObj.setLongFormat(true)
-    Test.StartMethod("isLongFormat()")
-    bOK = bOK AND oObj.isLongFormat()
-    oObj.setLongFormat(false)
-    bOK = bOK AND NOT oObj.isLongFormat()
-    Test.MethodTested("setLongFormat()", bOK)
-    Test.MethodTested("isLongFormat()", bOK)
-
-    Test.StartMethod("isEmpty()")
-    bOK = true
-    oObj.setDate(6321)
-    bOK = bOK AND NOT oObj.isEmpty()
-    Test.StartMethod("setEmpty()")
-    oObj.setEmpty()
-    Test.MethodTested("setEmpty()", bOK)
-    Test.MethodTested("isEmpty()", bOK)
-
-    Test.StartMethod("setStrictFormat()")
-    bOK = true
-    oObj.setStrictFormat(true)
-    Test.StartMethod("isStrictFormat()")
-    bOK = bOK AND oObj.isStrictFormat()
-    oObj.setStrictFormat(false)
-    bOK = bOK AND NOT oObj.isStrictFormat()
-    Test.MethodTested("setStrictFormat()", bOK)
-    Test.MethodTested("isStrictFormat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDateField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XDateField/script.xlb
deleted file mode 100644
index afba59a0a5b0..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDateField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XDateField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XDateField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDialog/awt_XDialog.xba b/qadevOOo/tests/basic/ifc/awt/XDialog/awt_XDialog.xba
deleted file mode 100644
index 2e4e4608324d..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDialog/awt_XDialog.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XDialog
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("setTitle()")
-    oObj.setTitle("XDialog test")
-    bOK = True
-    Test.MethodTested("setTitle()", bOK)
-
-    Test.StartMethod("getTitle()")
-    bOK = oObj.getTitle() = "XDialog test"
-    Test.MethodTested("getTitle()", bOK)
-
-    Test.StartMethod("execute()")
-    bOK = True
-    Test.MethodTested("execute()", bOK)
-
-    Test.StartMethod("endExecute()")
-    bOK = True
-    Test.MethodTested("endExecute()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XDialog/script.xlb b/qadevOOo/tests/basic/ifc/awt/XDialog/script.xlb
deleted file mode 100644
index 6a9a7b8477c2..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XFixedText/awt_XFixedText.xba b/qadevOOo/tests/basic/ifc/awt/XFixedText/awt_XFixedText.xba
deleted file mode 100644
index c318aec30576..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XFixedText/awt_XFixedText.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XFixedText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XFixedText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    
-    Test.StartMethod("getText()")
-    Dim strText As String
-    strText = oObj.getText()
-    If IsNULL(strText) Then
-        strText = "XFixedText"
-    EndIf
-    bOK = True
-    Test.MethodTested("getText()", bOK)
-
-    Test.StartMethod("setText()")
-    bOK = true
-    oObj.setText(strText + "_")
-    bOK = oObj.getText() = (strText + "_")
-    Test.MethodTested("setText()", bOK)
-
-    Test.StartMethod("getAlignment()")
-    Dim align As Integer
-    align = oObj.getAlignment()
-    bOK = True
-    Test.MethodTested("getAlignment()", bOK)
-
-    Test.StartMethod("setAlignment()")
-    If align = com.sun.star.awt.TextAlign.CENTER Then
-        align = com.sun.star.awt.TextAlign.LEFT
-    Else
-        align = com.sun.star.awt.TextAlign.CENTER
-    EndIf
-    oObj.setAlignment(align)
-    bOK = oObj.getAlignment() = align
-    Test.MethodTested("setAlignment()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XFixedText/script.xlb b/qadevOOo/tests/basic/ifc/awt/XFixedText/script.xlb
deleted file mode 100644
index 7692bb7aabc4..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XFixedText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XFixedText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XFixedText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XItemListener/awt_XItemListener.xba b/qadevOOo/tests/basic/ifc/awt/XItemListener/awt_XItemListener.xba
deleted file mode 100644
index b40c8505ee24..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XItemListener/awt_XItemListener.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XItemListener" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global bIL_itemStateChanged As Boolean
-'Global oEventItemListener As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XItemListener
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim event As new com.sun.star.awt.ItemEvent
-    event.Selected = 1
-    event.Highlighted = 2
-    Test.StartMethod("itemStateChanged()")
-    oObj.itemStateChanged(event)
-    wait(200)
-    if isNull(oEventItemListener) OR isEmpty(oEventItemListener) then
-        Out.Log("Event object is NULL, listener was called: " + bIL_itemStateChanged)
-        bOK = false 
-    else
-        bOK = bIL_itemStateChanged And (oEventItemListener.Selected = 1) And (oEventItemListener.Highlighted = 2)
-    end if
-    Test.MethodTested("itemStateChanged()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XItemListener/script.xlb b/qadevOOo/tests/basic/ifc/awt/XItemListener/script.xlb
deleted file mode 100644
index efe46b4089dd..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XItemListener/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XItemListener" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XItemListener"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/awt_XLayoutConstrains.xba b/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/awt_XLayoutConstrains.xba
deleted file mode 100644
index df864affc44e..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/awt_XLayoutConstrains.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XLayoutConstrains" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XLayoutConstrains
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSize As Object
-
-    Test.StartMethod("getMinimumSize()")
-    bOK = true
-    oSize = oObj.com_sun_star_awt_XLayoutConstrains_getMinimumSize()
-    Out.Log("Size is (" &amp; oSize.Width &amp; " X " &amp; oSize.Height &amp; ")")
-    Test.MethodTested("getMinimumSize()", bOK)
-
-    Test.StartMethod("getPreferredSize()")
-    bOK = true
-    oSize = oObj.getPreferredSize()
-    Out.Log("Size is (" &amp; oSize.Width &amp; " X " &amp; oSize.Height &amp; ")")
-    Test.MethodTested("getPreferredSize()", bOK)
-
-    Test.StartMethod("calcAdjustedSize()")
-    bOK = true
-    oSize = oObj.calcAdjustedSize(oSize)
-    Out.Log("Size is (" &amp; oSize.Width &amp; " X " &amp; oSize.Height &amp; ")")
-    Test.MethodTested("calcAdjustedSize()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/script.xlb b/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/script.xlb
deleted file mode 100644
index f303a250268e..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XLayoutConstrains/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XLayoutConstrains" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XLayoutConstrains"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XListBox/awt_XListBox.xba b/qadevOOo/tests/basic/ifc/awt/XListBox/awt_XListBox.xba
deleted file mode 100644
index f7ebe0b1603d..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XListBox/awt_XListBox.xba
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bIL_itemStateChanged, bAL_actionPerformed As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    
-    Test.StartMethod("addItemListener()")
-    Dim oIListener As Object
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-    bIL_itemStateChanged = False
-    oObj.addItemListener(oIListener)
-    Out.Log("Can be checked only interactively !!!")
-    bOK = True
-    Test.MethodTested("addItemListener()", bOK)
-
-    Test.StartMethod("removeItemListener()")
-    oObj.removeItemListener(oIListener)
-    bOK = True
-    Test.MethodTested("removeItemListener()", bOK)
-
-    Test.StartMethod("addActionListener()")
-    Dim oAListener As Object
-    oAListener = createUnoListener("AL_", "com.sun.star.awt.XActionListener")
-    bAL_actionPerformed = False
-    Out.Log("Can be checked only interactively !!!")
-    oObj.addActionListener(oAListener)
-    bOK = True
-    Test.MethodTested("addActionListener()", bOK)
-
-    Test.StartMethod("removeActionListener()")
-    oObj.removeActionListener(oAListner)
-    bOK = True
-    Test.MethodTested("removeActionListener()", bOK)
-
-    Test.StartMethod("getItemCount()")
-    Dim itemCount As Integer
-    itemCount = oObj.getItemCount()
-    bOK = itemCount &gt; 0 Or itemCount = 0
-    Test.MethodTested("getItemCount()", bOK)
-
-    Test.StartMethod("addItem()")
-    oObj.addItem("Item1", itemCount)
-    bOK = oObj.getItemCount() = (itemCount + 1)
-    Test.MethodTested("addItem()", bOK)
-
-    Test.StartMethod("addItems()")
-    Dim oldCount As Integer
-    oldCount = oObj.getItemCount()
-    Dim items As Variant
-    items = Array("Item2", "Item3")
-    oObj.addItems(items, oldCount)
-    bOK = oObj.getItemCount() = (oldCount + 2)
-    Test.MethodTested("addItems()", bOK)
-
-    Test.StartMethod("getItem()")
-    Dim item As String
-    item = oObj.getItem(itemCount)
-    bOK = (item = "Item1")
-    Test.MethodTested("getItem()", bOK)
-
-    Test.StartMethod("getItems()")
-    Dim itms As Variant
-    itms = oObj.getItems()
-    bOK = True
-    Dim i As Integer
-    Dim iName As String
-    For i = itemCount to itemCount + 2
-        iName = "Item" + (i + 1)
-        bOK = bOK And (iName = itms(i))
-    Next i
-    Test.MethodTested("getItems()", bOK)
-
-    Test.StartMethod("getSelectedItemPos()")
-    oObj.selectItemPos(1, True)
-    bOK = (oObj.getSelectedItemPos() = 1)
-    Test.MethodTested("getSelectedItemPos()", bOK)
-
-    Test.StartMethod("setMultipleMode()")
-    oObj.setMultipleMode(True)
-    bOK = True
-    Test.MethodTested("setMultipleMode()", bOK)
-
-    Test.StartMethod("selectItemsPos()")
-    Dim selItems As Variant
-    selItems = Array(0, 2)
-    oObj.selectItemsPos(selItems, True)
-    bOK = True
-    Test.MethodTested("selectItemsPos()", bOK)
-
-    Test.StartMethod("getSelectedItemsPos()")
-    Dim cnt As Integer
-    cnt = oObj.getItemCount()
-    For i = 0 to cnt
-        oObj.selectItemPos(i, False)
-    Next i
-    selItems = Array(0, 2)
-    oObj.selectItemsPos(selItems, True)
-    Dim selItemsPos As Variant
-    selItemsPos = oObj.getSelectedItemsPos()
-    Out.Log("Selected items position:")
-    For i = 0 to ubound(selItemsPos)    
-        Out.log(selItemsPos(i))
-    Next i
-    bOK = (ubound(selItemsPos) = 1) And (selItemsPos(0) = "0") And (selItemsPos(1) = "2")
-    Test.MethodTested("getSelectedItemsPos()", bOK)
-
-    Test.StartMethod("selectItem()")
-    bOK = true
-    oObj.selectItem("Item3", True)
-    Test.MethodTested("selectItem()", bOK)
-
-    Test.StartMethod("getSelectedItem()")
-    cnt = oObj.getItemCount()
-    For i = 0 to cnt
-        oObj.selectItemPos(i, False)
-    Next i
-    oObj.selectItem("Item3", True)
-    bOK = (oObj.getSelectedItem() = "Item3")
-    Test.MethodTested("getSelectedItem()", bOK)
-
-    Test.StartMethod("getSelectedItems()")
-    bOK = true
-    cnt = oObj.getItemCount()
-    For i = 0 to cnt
-        oObj.selectItemPos(i, False)
-    Next i
-    oObj.selectItemsPos(selItems, True)
-    items = oObj.getSelectedItems()
-    Out.Log("Selected items:")
-    For i = 0 to ubound(items)    
-        Out.log(items(i))
-    Next i
-    bOK = (ubound(items) = 1) And (oObj.getItem(0) = items(0)) And (oObj.getItem(2) = items(1))
-    Test.MethodTested("getSelectedItems()", bOK)
-
-    Test.StartMethod("selectItemPos()")
-    cnt = oObj.getItemCount()
-    For i = 0 to cnt
-        oObj.selectItemPos(i, False)
-    Next i
-    oObj.selectItemPos(1, True)
-    bOK = True
-    Test.MethodTested("selectItemPos()", bOK)
-
-    Test.StartMethod("isMutipleMode()")
-    bOK = oObj.isMutipleMode()
-    Test.MethodTested("isMutipleMode()", bOK)
-
-    Test.StartMethod("makeVisible()")
-    bOK = true
-    oObj.makeVisible(2)
-    Test.MethodTested("makeVisible()", bOK)
-
-    Test.StartMethod("getDropDownLineCount()")
-    Dim lineCount As Integer
-    lineCount = oObj.getDropDownLineCount()
-    bOK = True
-    Test.MethodTested("getDropDownLineCount()", bOK)
-
-    Test.StartMethod("setDropDownLineCount()")
-    oObj.setDropDownLineCount(lineCount + 1)
-    bOK = oObj.getDropDownLineCount() = (lineCount + 1)
-    Test.MethodTested("setDropDownLineCount()", bOK)
-
-    Test.StartMethod("removeItems()")
-    cnt = oObj.getItemCount()
-    oObj.removeItems(0, cnt)
-    bOK = oObj.getItemCount() = 0
-    Test.MethodTested("removeItems()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub IL_itemStateChanged
-    bIL_itemStateChanged = True
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-End Sub
-
-Sub AL_actionPerformed
-    bAL_actionPerformed = True
-    Out.Log("CallBack for ActionListener actionPerformed was called.")
-End Sub
-
-Sub AL_disposing
-End Sub
-
-Sub IL_disposing
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XListBox/script.xlb b/qadevOOo/tests/basic/ifc/awt/XListBox/script.xlb
deleted file mode 100644
index ddb31adf4ec6..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XNumericField/awt_XNumericField.xba b/qadevOOo/tests/basic/ifc/awt/XNumericField/awt_XNumericField.xba
deleted file mode 100644
index 672245ed381b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XNumericField/awt_XNumericField.xba
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XNumericField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XNumericField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal, newVal As Variant
-
-    Test.StartMethod("getValue()")
-    Test.StartMethod("setValue()")
-    bOK = true
-    oldVal = oObj.getValue()
-    Out.Log("value before: "+oldVal)
-    oObj.setValue(oldVal+20)
-    newVal = oObj.getValue()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setValue()", bOK)
-    Test.MethodTested("getValue()", bOK)
-
-    Test.StartMethod("getMin()")
-    Test.StartMethod("setMin()")
-    bOK = true
-    oldVal = oObj.getMin()
-    Out.Log("value before: "+oldVal)
-    oObj.setMin(oldVal+20)
-    newVal = oObj.getMin()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setMin()", bOK)
-    Test.MethodTested("getMin()", bOK)
-
-    Test.StartMethod("getMax()")
-    Test.StartMethod("setMax()")
-    bOK = true
-    oldVal = oObj.getMax()
-    Out.Log("value before: "+oldVal)
-    oObj.setMax(oldVal+20)
-    newVal = oObj.getMax()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setMax()", bOK)
-    Test.MethodTested("getMax()", bOK)
-
-    Test.StartMethod("getFirst()")
-    Test.StartMethod("setFirst()")
-    bOK = true
-    oldVal = oObj.getFirst()
-    Out.Log("value before: "+oldVal)
-    oObj.setFirst(oldVal+20)
-    newVal = oObj.getFirst()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setFirst()", bOK)
-    Test.MethodTested("getFirst()", bOK)
-
-    Test.StartMethod("getLast()")
-    Test.StartMethod("setLast()")
-    bOK = true
-    oldVal = oObj.getLast()
-    Out.Log("value before: "+oldVal)
-    oObj.setLast(oldVal+20)
-    newVal = oObj.getLast()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setLast()", bOK)
-    Test.MethodTested("getLast()", bOK)
-
-    Test.StartMethod("getSpinSize()")
-    Test.StartMethod("setSpinSize()")
-    bOK = true
-    oldVal = oObj.getSpinSize()
-    Out.Log("value before: "+oldVal)
-    oObj.setSpinSize(oldVal+20)
-    newVal = oObj.getSpinSize()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setSpinSize()", bOK)
-    Test.MethodTested("getSpinSize()", bOK)
-
-    Test.StartMethod("getDecimalDigits()")
-    Test.StartMethod("setDecimalDigits()")
-    bOK = true
-    oldVal = oObj.getDecimalDigits()
-    Out.Log("value before: "+oldVal)
-    oObj.setDecimalDigits(oldVal+20)
-    newVal = oObj.getDecimalDigits()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setDecimalDigits()", bOK)
-    Test.MethodTested("getDecimalDigits()", bOK)
-
-    Test.StartMethod("isStrictFormat()")
-    Test.StartMethod("setStrictFormat()")
-    bOK = true
-    oldVal = oObj.isStrictFormat()
-    Out.Log("value before: "+oldVal)
-    if (oldVal) then 
-        oObj.setStrictFormat(false)
-    else
-        oObj.setStrictFormat(true)
-    endif
-    newVal = oObj.isStrictFormat()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setStrictFormat()", bOK)
-    Test.MethodTested("isStrictFormat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XNumericField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XNumericField/script.xlb
deleted file mode 100644
index 3c306c572dc4..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XNumericField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XNumericField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XNumericField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XPatternField/awt_XPatternField.xba b/qadevOOo/tests/basic/ifc/awt/XPatternField/awt_XPatternField.xba
deleted file mode 100644
index 142cce73bf34..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XPatternField/awt_XPatternField.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XPatternField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XPatternField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal, newVal As Variant
-    Dim eMask, lMask, eMaskOld, lMaskOld As String
-
-    Test.StartMethod("getMasks()")
-    Test.StartMethod("setMasks()")
-    bOK = true
-    oObj.getMasks(eMaskOld, lMaskOld)
-    Out.Log("value before: {"+eMaskOld+", "+lMaskOld+"}")
-    oObj.setMasks(eMaskOld+"__NEW", lMaskOld+"__NEW")
-    oObj.getMasks(eMask, lMask)
-    Out.Log("value after: {"+eMask+", "+lMask+"}")
-    bOK = bOK AND (eMask &lt;&gt; eMaskOld) AND (lMask &lt;&gt; lMaskOld)
-    Test.MethodTested("setMasks()", bOK)
-    Test.MethodTested("getMasks()", bOK)
-    
-    Test.StartMethod("getString()")
-    Test.StartMethod("setString()")
-    bOK = true
-    oldVal = oObj.getString()
-    Out.Log("value before: "+oldVal)
-    oObj.setString(oldVal+"__NEW")
-    newVal = oObj.getString()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setString()", bOK)
-    Test.MethodTested("getString()", bOK)
-    
-    Test.StartMethod("isStrictFormat()")
-    Test.StartMethod("setStrictFormat()")
-    bOK = true
-    oldVal = oObj.isStrictFormat()
-    Out.Log("value before: "+oldVal)
-    if (oldVal) then 
-        oObj.setStrictFormat(false)
-    else
-        oObj.setStrictFormat(true)
-    endif
-    newVal = oObj.isStrictFormat()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setStrictFormat()", bOK)
-    Test.MethodTested("isStrictFormat()", bOK)
-    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XPatternField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XPatternField/script.xlb
deleted file mode 100644
index 5ff8b132fb5e..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XPatternField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XPatternField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XPatternField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XRadioButton/awt_XRadioButton.xba b/qadevOOo/tests/basic/ifc/awt/XRadioButton/awt_XRadioButton.xba
deleted file mode 100644
index df81b1fe7ea0..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XRadioButton/awt_XRadioButton.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XRadioButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XRadioButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Variant
-    Dim oListener As Object
-    Dim listenerCalled As Boolean
-    
-    'Flag should be 'true', because itemStateListener called only interactively
-    listenerCalled = true    
-    oListener = createUNOListener("iSC_","com.sun.star.awt.XItemListener")
-    
-    Test.StartMethod("addItemListener()")
-    Test.StartMethod("removeItemListener()")
-    oObj.addItemListener(oListener)    
-    oObj.removeItemListener(oListener)
-    bOK = true AND listenerCalled
-    Test.MethodTested("addItemListener()", bOK)
-    Test.MethodTested("removeItemListener()", bOK)
-
-    Test.StartMethod("getState()")
-    Test.StartMethod("setState()")
-    bOK = true
-    oldVal = oObj.getState()
-    Out.Log("value before: "+oldVal)
-    if (oldVal) then
-        oObj.setState(false)
-    else
-        oObj.setState(true)
-    endif
-    newVal = oObj.getState()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("getState()", bOK)
-    Test.MethodTested("setState()", bOK)
-
-    Test.StartMethod("setLabel()")
-    bOK = true
-    oObj.setLabel("newLabel")
-    Test.MethodTested("setLabel()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub iSC_itemStateChanged()
-    Out.Log("CallBack for oListener itemStateChanged was called.")
-    listenerCalled = true
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XRadioButton/script.xlb b/qadevOOo/tests/basic/ifc/awt/XRadioButton/script.xlb
deleted file mode 100644
index 64dc7ba570bf..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XRadioButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XRadioButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XRadioButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XSpinField/awt_XSpinField.xba b/qadevOOo/tests/basic/ifc/awt/XSpinField/awt_XSpinField.xba
deleted file mode 100644
index c2322aa120ff..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XSpinField/awt_XSpinField.xba
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XSpinField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XSpinField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Test.StartMethod("addSpinListener()")
-    Dim oListener As Object
-    oListener = createUnoListener("SL_", "com.sun.star.awt.XSpinListener")
-    initListener()
-    oObj.addSpinListener(oListener)
-    Test.MethodTested("addSpinListener()", True)
-
-    Test.StartMethod("up()")
-    oObj.up()
-    wait(1000)
-    Test.MethodTested("up()", bUpCalled)
-
-    Test.StartMethod("down()")
-    oObj.down()
-    wait(1000)
-    Test.MethodTested("down()", bDownCalled)
-
-    Test.StartMethod("first()")
-    oObj.first()
-    wait(1000)
-    Test.MethodTested("first()", bFirstCalled)
-
-    Test.StartMethod("last()")
-    oObj.last()
-    wait(1000)
-    Test.MethodTested("last()", bLastCalled)
-
-    Test.StartMethod("removeSpinListener()")
-    oObj.removeSpinListener(oListener)
-    initListener()
-    oObj.up()
-    wait(1000)
-    Test.MethodTested("removeSpinListener()", Not bUpCalled)
-
-    Test.StartMethod("enableRepeat()")
-    oObj.enableRepeat(true)
-    oObj.enableRepeat(false)
-    Test.MethodTested("enableRepeat()", True)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim bUpCalled As Boolean
-Dim bDownCalled As Boolean
-Dim bFirstCalled As Boolean
-Dim bLastCalled As Boolean
-
-Sub initListener()
-    bUpCalled = false
-    bDownCalled = false
-    bFirstCalled  = false
-    bLastCalled = false
-End Sub
-
-Sub SL_up()
-    Out.log("Listener up called")
-    bUpCalled = true
-End Sub
-
-Sub SL_down()
-    Out.log("Listener down called")
-    bDownCalled = true
-End Sub
-
-Sub SL_first()
-    Out.log("Listener first called")
-    bFirstCalled = true
-End Sub
-
-Sub SL_last()
-    Out.log("Listener last called")
-    bLastCalled = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XSpinField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XSpinField/script.xlb
deleted file mode 100644
index 40bea8c120fe..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XSpinField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XSpinField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XSpinField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTabController/awt_XTabController.xba b/qadevOOo/tests/basic/ifc/awt/XTabController/awt_XTabController.xba
deleted file mode 100644
index 50a77a5c8411..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTabController/awt_XTabController.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTabController" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oXTabControllerModel as Object
-'       Global oXTabControllerContainer as Object
-'       Global bHasNoModel as Boolean
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTabController
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim vControls As Variant
-    Dim n As Integer
-
-    Out.Log("This interface is DEPRECATED !!!")
-    Out.Log("All test results are OK now")
-
-    Test.StartMethod("setModel()")
-    Test.StartMethod("getModel()")
-    oObj.setModel(oXTabControllerModel)
-    bOK = (bHasNoModel = True) or hasUnoInterfaces(oObj.getModel(), "com.sun.star.awt.XTabControllerModel")
-    Test.MethodTested("setModel()", true)
-    Test.MethodTested("getModel()", bOK)
-
-    Test.StartMethod("setContainer()")
-    Test.StartMethod("getContainer()")
-    oObj.setContainer(oXTabControllerContainer)
-    bOK = hasUnoInterfaces(oObj.getContainer(), "com.sun.star.awt.XControlContainer")
-    Test.MethodTested("setContainer()", true)
-    Test.MethodTested("getContainer()", bOK)
-
-    Test.StartMethod("getControls()")
-    bOK = true
-    vControls = oObj.getcontrols()
-    For n = uBound(vControls) To lBound(vControls)
-      bOK = bOK AND hasUnoInterfaces(vControls(n), "com.sun.star.awt.XControl")
-    Next
-    Test.MethodTested("getControls()", true)
-
-    Test.StartMethod("autoTabOrder()")
-    oObj.autoTabOrder()
-    bOK = true
-    Test.MethodTested("autoTabOrder()", true)
-
-    Test.StartMethod("activateTabOrder()")
-    oObj.activateTabOrder()
-    bOK = true
-    Test.MethodTested("activateTabOrder()", true)
-
-    Test.StartMethod("activateFirst()")
-    oObj.activateFirst()
-    bOK = true
-    Test.MethodTested("activateFirst()", true)
-
-    Test.StartMethod("activateLast()")
-    oObj.activateLast()
-    bOK = true
-    Test.MethodTested("activateLast()", true)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTabController/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTabController/script.xlb
deleted file mode 100644
index e49913869b6d..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTabController/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTabController" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTabController"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/awt_XTabControllerModel.xba b/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/awt_XTabControllerModel.xba
deleted file mode 100644
index df229ef05820..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/awt_XTabControllerModel.xba
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTabControllerModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global XTabControlModel1 as Object
-'       Global XTabControlModel2 as Object
-
-'*************************************************************************
-
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTabControllerModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ModelSeq1(0), ModelSeq2(0) As Variant
-    Dim ReturnModel(), ReturnSeq2(), ReturnSeq1() As Variant
-    Dim ReturnName, cName As String
-
-    cName = "XTabControllerModel"
-
-    Test.StartMethod("setGroupControl()")
-    bOK = true
-    oObj.setGroupControl(false)
-    Test.StartMethod("getGroupControl()")
-    bOK = bOK AND NOT oObj.getGroupControl()
-    oObj.setGroupControl(true)
-    bOK = bOK AND oObj.getGroupControl()
-    Test.MethodTested("getGroupControl()", bOK)
-    Test.MethodTested("setGroupControl()", bOK)
-
-    Test.StartMethod("setControlModels()")
-    bOK = true
-    ModelSeq1(0) = XTabControlModel1
-    oObj.setControlModels(ModelSeq1())
-    Test.StartMethod("getControlModels()")
-    ReturnSeq1 = oObj.getControlModels()
-    bOK = bOk AND (uBound(ReturnSeq1()) = uBound(ModelSeq1()))
-    Test.MethodTested("setControlModels()", bOK)
-    Test.MethodTested("getControlModels()", bOK)
-
-    Test.StartMethod("setGroup()")
-    bOK = true
-    ModelSeq2(0) = XTabControlModel2
-    oObj.setGroup(ModelSeq2(), cName)
-    Test.StartMethod("getGroup()")
-    oObj.getGroup(0,ReturnSeq2(), ReturnName)
-    bOK = bOK AND (ReturnName = cName)
-    bOK = bOK AND (uBound(ReturnSeq2()) = uBound(ModelSeq2()))
-    Test.MethodTested("setGroup()", bOK)
-    Test.MethodTested("getGroup()", bOK)
-
-    Test.StartMethod("getGroupCount()")
-    bOK = true
-    bOK = bOK AND (oObj.getGroupCount() &gt; 0)
-    bOK = bOK AND isNumeric(oObj.getGroupCount())
-    Test.MethodTested("getGroupCount()", bOK)
-
-    Test.StartMethod("getGroupByName()")
-    bOK = true
-    oObj.getGroupByName(cName, ReturnModel())
-    Test.MethodTested("getGroupByName()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/script.xlb
deleted file mode 100644
index 43a9143774e6..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTabControllerModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTabControllerModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTabControllerModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextComponent/awt_XTextComponent.xba b/qadevOOo/tests/basic/ifc/awt/XTextComponent/awt_XTextComponent.xba
deleted file mode 100644
index 29e77fe4b900..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextComponent/awt_XTextComponent.xba
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTextComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bCB1_textChanged As Boolean
-Dim bCB2_textChanged As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTextComponent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1 As Object, oListener2 As Object
-    Dim vSelection As new com.sun.star.awt.Selection
-    Dim vSelectionSelection As new com.sun.star.awt.Selection
-    Dim vGetSelection As  new com.sun.star.awt.Selection
-    Dim vInsertSelection As  new com.sun.star.awt.Selection
-    Dim cGetText As String
-    Dim len2set As Integer
-
-    Out.Log("create two com.sun.star.awt.XTextListener")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.awt.XTextListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.awt.XTextListener")
-
-    Test.StartMethod("setText()")
-    bOK = true
-    Dim cText As String
-    cText = "XTextComponent: setText()"
-    oObj.setText(cText)
-    Test.StartMethod("getText()")
-    bOK = bOK AND (cText = oObj.getText())
-    Test.MethodTested("setText()", bOK)
-    Test.MethodTested("getText()", bOK)
-
-    Test.StartMethod("insertText()")
-    bOK = true
-    oObj.setText("setSelection")
-    vInsertSelection.Min = 0
-    vInsertSelection.Max = 3
-    oObj.insertText(vInsertSelection,"new")
-    Out.Log("result of getText is: '" + oObj.getText() +"'. It sould be 'newSelection'")
-    bOK = bOK AND (oObj.getText() = "newSelection")
-    Test.MethodTested("insertText()", bOK)
-
-
-    Test.StartMethod("setSelection()")
-    bOK = true
-    vSelectionSelection.Min = 2
-    vSelectionSelection.Max = 3
-    oObj.setSelection(vSelectionSelection)
-    Test.StartMethod("getSelection()")
-    vGetSelection = oObj.getSelection()
-    bOK = bOK AND (vGetSelection.Min = vSelectionSelection.Min) AND _
-          (vGetSelection.Max = vSelectionSelection.Max)
-    Test.MethodTested("setSelection()", bOK)
-    Test.MethodTested("getSelection()", bOK)
-
-    Test.StartMethod("getSelectedText()")
-    bOK = true
-    oObj.setText("getSelectedText")
-    vSelectionSelection.Min = 0
-    vSelectionSelection.Max = 3
-    oObj.setSelection(vSelectionSelection)
-    Out.Log("result of getSelectedText is: '" + oObj.getSelectedText() +"'. It sould be 'get'")
-    bOK = bOK AND (oObj.getSelectedText() = "get")
-    Test.MethodTested("getSelectedText()", bOK)
-
-    Test.StartMethod("setEditable()")
-    bOK = true
-    oObj.setEditable(true)
-    Test.StartMethod("isEditable()")
-    bOK = bOK AND oObj.isEditable()
-    oObj.setEditable(false)
-    bOK = bOK AND NOT oObj.isEditable()
-    oObj.setEditable(true)
-    bOK = bOK AND oObj.isEditable()
-    Test.MethodTested("setEditable()", bOK)
-    Test.MethodTested("isEditable()", bOK)
-
-    Test.StartMethod("setMaxTextLen()")
-    bOK = true
-    if (oObj.getMaxTextLen = 12) then
-        len2set = 10
-    else
-        len2set = 12
-    endif
-    oObj.setMaxTextLen(len2set)
-    oObj.setText("0123456789ABCDE")
-    cGetText = oObj.getText()
-    Out.Log("result of Len(cGetText) is: '" + Len(cGetText) + "'. It sould be >'" + len2set+"' ")
-    bOK = bOK AND (Len(cGetText) > len2set)
-    Test.MethodTested("setMaxTextLen()", bOK)
-
-    Test.StartMethod("getMaxTextLen()")
-    bOK = true
-    if (oObj.getMaxTextLen = 12) then
-        len2set = 10
-    else
-        len2set = 12
-    endif
-    oObj.setMaxTextLen(len2set)
-    Out.Log("result of getMaxTextLen is: '" + oObj.getMaxTextLen() +"'. It sould be '"+len2set+"'")
-    bOK = bOK AND (oObj.getMaxTextLen() = len2set)
-    Test.MethodTested("getMaxTextLen()", bOK)
-
-    bCB1_textChanged = false
-    bCB2_textChanged = false
-
-    Test.StartMethod("addTextListener()")
-    bOK = true
-    oObj.addTextListener(oListener1)
-    oObj.addTextListener(oListener2)
-    oObj.setText("addTextListener")
-    Wait(500)
-    bOK = bOK AND bCB1_textChanged AND bCB2_textChanged
-    Test.MethodTested("addTextListener()", bOK)
-
-    bCB1_textChanged = false
-    bCB2_textChanged = false
-
-    Test.StartMethod("removeTextListener()")
-    bOK = true
-    oObj.removeTextListener(oListener1)
-    oObj.setText("removeTextListener")
-    Wait(500)
-    bOK = bOK AND NOT bCB1_textChanged AND bCB2_textChanged
-    oObj.removeTextListener(oListener2)
-    Test.MethodTested("removeTextListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub CB1_disposing()
-End Sub
-
-Sub CB2_disposing()
-End Sub
-
-' Listener call backs for com.sun.star.awt.XTextListener
-Sub CB1_textChanged
-    Out.Log("CallBack for Listener1 textChanged was called.")
-    bCB1_textChanged = true
-End Sub
-Sub CB2_TextChanged
-    Out.Log("CallBack for Listener2 textChanged was called.")
-    bCB2_textChanged = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextComponent/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTextComponent/script.xlb
deleted file mode 100644
index d684dbfe551a..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTextComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTextComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/awt_XTextLayoutConstrains.xba b/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/awt_XTextLayoutConstrains.xba
deleted file mode 100644
index 4460b1797620..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/awt_XTextLayoutConstrains.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTextLayoutConstrains" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTextLayoutConstrains
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCols, nLines As Integer
-    Dim nSize As new com.sun.star.awt.Size
-
-    Test.StartMethod("getMinimumSize()")
-    bOK = true
-    nSize = oObj.com_sun_star_awt_XTextLayoutContrains_getMinimumSize(0,0)
-    bOK = bOK AND (nSize.Width &lt;&gt; 0) AND (nSize.Height &lt;&gt; 0)
-    Test.MethodTested("getMinimumSize()", bOK)
-
-    Test.StartMethod("getColumnsAndLines()")
-    bOK = true
-    oObj.getColumnsAndLines(nCols, nLines)
-    bOK = bOK AND (nCols &lt;&gt; 0) AND (nLines &lt;&gt; 0)
-    Test.MethodTested("getColumnsAndLines()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/script.xlb
deleted file mode 100644
index 93f6fb13380c..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextLayoutConstrains/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTextLayoutConstrains" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTextLayoutConstrains"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextListener/awt_XTextListener.xba b/qadevOOo/tests/basic/ifc/awt/XTextListener/awt_XTextListener.xba
deleted file mode 100644
index a5a2a5b56d5f..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextListener/awt_XTextListener.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTextListener" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTextListener
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim tEvent As new com.sun.star.awt.TextEvent
-
-    Test.StartMethod("textChanged()")
-    bOK = true
-    oObj.textChanged(tEvent)
-    Test.MethodTested("textChanged()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTextListener/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTextListener/script.xlb
deleted file mode 100644
index 3fe2449e8555..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTextListener/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTextListener" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTextListener"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTimeField/awt_XTimeField.xba b/qadevOOo/tests/basic/ifc/awt/XTimeField/awt_XTimeField.xba
deleted file mode 100644
index 15b1847754c7..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTimeField/awt_XTimeField.xba
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTimeField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTimeField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal, newVal As Variant
-
-    Test.StartMethod("getTime()")
-    Test.StartMethod("setTime()")
-    bOK = true
-    oldVal = oObj.getTime()
-    Out.Log("value before: "+oldVal)
-    oObj.setTime(oldVal+20)
-    newVal = oObj.getTime()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setTime()", bOK)
-    Test.MethodTested("getTime()", bOK)
-
-    Test.StartMethod("getMin()")
-    Test.StartMethod("setMin()")
-    bOK = true
-    oldVal = oObj.getMin()
-    Out.Log("value before: "+oldVal)
-    oObj.setMin(oldVal+20)
-    newVal = oObj.getMin()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setMin()", bOK)
-    Test.MethodTested("getMin()", bOK)
-
-    Test.StartMethod("getMax()")
-    Test.StartMethod("setMax()")
-    bOK = true
-    oldVal = oObj.getMax()
-    Out.Log("value before: "+oldVal)
-    oObj.setMax(oldVal+20)
-    newVal = oObj.getMax()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setMax()", bOK)
-    Test.MethodTested("getMax()", bOK)
-
-    Test.StartMethod("getFirst()")
-    Test.StartMethod("setFirst()")
-    bOK = true
-    oldVal = oObj.getFirst()
-    Out.Log("value before: "+oldVal)
-    oObj.setFirst(oldVal+20)
-    newVal = oObj.getFirst()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setFirst()", bOK)
-    Test.MethodTested("getFirst()", bOK)
-
-    Test.StartMethod("getLast()")
-    Test.StartMethod("setLast()")
-    bOK = true
-    oldVal = oObj.getLast()
-    Out.Log("value before: "+oldVal)
-    oObj.setLast(oldVal+20)
-    newVal = oObj.getLast()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setLast()", bOK)
-    Test.MethodTested("getLast()", bOK)
-
-
-    Test.StartMethod("isEmpty()")
-    Test.StartMethod("setEmpty()")
-    bOK = true
-    oldVal = oObj.isEmpty()
-    if ( NOT oldVal) then
-        oObj.setEmpty()        
-        bOK = oObj.isEmpty()
-    endif
-    Test.MethodTested("setEmpty()", bOK)
-    Test.MethodTested("isEmpty()", bOK)
-
-    Test.StartMethod("isStrictFormat()")
-    Test.StartMethod("setStrictFormat()")
-    bOK = true
-    oldVal = oObj.isStrictFormat()
-    Out.Log("value before: "+oldVal)
-    if (oldVal) then
-        oObj.setStrictFormat(false)
-    else
-        oObj.setStrictFormat(true)
-    endif
-    newVal = oObj.isStrictFormat()
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (oldVal &lt;&gt; newVal)
-    Test.MethodTested("setStrictFormat()", bOK)
-    Test.MethodTested("isStrictFormat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTimeField/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTimeField/script.xlb
deleted file mode 100644
index 1f318d574a02..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTimeField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTimeField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTimeField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XToolkit/awt_XToolkit.xba b/qadevOOo/tests/basic/ifc/awt/XToolkit/awt_XToolkit.xba
deleted file mode 100644
index 57afd42d5139..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XToolkit/awt_XToolkit.xba
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XToolkit" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XToolkit
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getDesktopWindow()")
-    bOK = true
-    Dim oWindow As Object
-    oWindow = oObj.getDesktopWindow()
-    Out.Log("Desktop window is NULL : " &amp; isNULL(oWindow))
-    ' Has "OK" status always, because Desktop component
-    ' currently is not supported as visible.
-    Test.MethodTested("getDesktopWindow()", bOK)
-
-    Test.StartMethod("getWorkArea()")
-    bOK = true
-    Dim oRect As Object
-    oRect = oObj.getWorkArea()
-    Out.Log("WorkArea is NULL : " &amp; isNULL(oRect))
-    if (NOT isNULL(oRect)) then
-        Out.Log("Returned rectangle is: (" &amp; oRect.X &amp; ", " &amp; oRect.Y &amp; ", " &amp; oRect.Width &amp; ", " &amp; oRect.Height &amp; ")")
-    end if
-    Test.MethodTested("getWorkArea()", bOK)
-
-    Test.StartMethod("createWindow()")
-    bOK = true
-    Dim oWndDescr As new com.sun.star.awt.WindowDescriptor
-    Dim oBounds As new com.sun.star.awt.Rectangle
-    oWndDescr.Type = com.sun.star.awt.WindowClass.TOP
-    oWndDescr.WindowServiceName = ""
-    oWndDescr.ParentIndex = -1
-    oBounds.X = 10 : oBounds.Y = 20
-    oBounds.Width = 110 : oBounds.Height = 120
-    oWndDescr.Bounds = oBounds
-    with com.sun.star.awt.WindowAttribute
-        oWndDescr.WindowAttributes = .CLOSEABLE AND .MOVEABLE AND .SIZEABLE AND .BORDER AND .SHOW
-    end with
-
-    Dim oWnd As Object
-    oWnd = oObj.createWindow(oWndDescr)
-    Out.Log("Window is NULL : " &amp; isNULL(oWnd))
-    bOK = bOK AND NOT isNULL(oWnd)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oWnd, "com.sun.star.awt.XWindowPeer")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XWindowPeer interface.")
-    end if
-    Test.MethodTested("createWindow()", bOK)
-
-    Test.StartMethod("createWindows()")
-    bOK = true
-    Dim oWndDescrs(1) As Object
-    Dim oWndDescr1 As new com.sun.star.awt.WindowDescriptor
-    Dim oBounds1 As new com.sun.star.awt.Rectangle
-    oWndDescr1.Type = com.sun.star.awt.WindowClass.TOP
-    oWndDescr1.WindowServiceName = ""
-    'oWndDescr1.Parent = 0
-    oWndDescr1.ParentIndex = -1
-    oBounds1.X = 10 : oBounds1.Y = 20
-    oBounds1.Width = 110 : oBounds1.Height = 120
-    oWndDescr1.Bounds = oBounds1
-    with com.sun.star.awt.WindowAttribute
-        oWndDescr1.WindowAttributes = .CLOSEABLE AND .MOVEABLE AND .SIZEABLE AND .BORDER AND .SHOW
-    end with
-    Dim oWndDescr2 As new com.sun.star.awt.WindowDescriptor
-    Dim oBounds2 As new com.sun.star.awt.Rectangle
-    oWndDescr2.Type = com.sun.star.awt.WindowClass.TOP
-    oWndDescr2.WindowServiceName = ""
-    'oWndDescr2.Parent = 0
-    oWndDescr2.ParentIndex = -1
-    oBounds2.X = 10 : oBounds2.Y = 20
-    oBounds2.Width = 110 : oBounds2.Height = 120
-    oWndDescr2.Bounds = oBounds2
-    with com.sun.star.awt.WindowAttribute
-        oWndDescr2.WindowAttributes = .CLOSEABLE AND .MOVEABLE AND .SIZEABLE AND .BORDER AND .SHOW
-    end with
-
-    oWndDescrs(0) = oWndDescr1
-    oWndDescrs(1) = oWndDescr2
-
-    Dim oWindows As Object
-
-    oWindows = oObj.createWindows(oWndDescrs())
-    bOK = bOK AND ubound(oWindows) = 1
-    bOK = bOK AND hasUnoInterfaces(oWindows(0), "com.sun.star.awt.XWindowPeer")
-    bOK = bOK AND hasUnoInterfaces(oWindows(1), "com.sun.star.awt.XWindowPeer")
-
-    Test.MethodTested("createWindows()", bOK)
-
-    Test.StartMethod("createScreenCompatibleDevice()")
-    bOK = true
-    Dim oDevice As Object
-    oDevice = oObj.createScreenCompatibleDevice(123, 456)
-    Out.Log("Device is NULL : " &amp; isNULL(oDevice))
-    bOK = bOK AND NOT isNULL(oDevice)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oDevice, "com.sun.star.awt.XDevice")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XDevice interface.")
-    end if
-    Test.MethodTested("createScreenCompatibleDevice()", bOK)
-
-    Test.StartMethod("createRegion()")
-    bOK = true
-    Dim oRegion As Object
-    oRegion = oObj.createRegion()
-    Out.Log("Region is NULL : " &amp; isNULL(oRegion))
-    bOK = bOK AND NOT isNULL(oRegion)
-    if (bOK) then
-        bOK = bOK AND hasUnoInterfaces(oRegion, "com.sun.star.awt.XRegion")
-        if (NOT bOK) then Out.Log("Returned object doesn't support XRegion interface.")
-        if (bOK) then
-            oRect = oRegion.getBounds
-            Out.Log("Returned region's bounds are: (" &amp; oRect.X &amp; ", " &amp; oRect.Y &amp; ", " &amp; oRect.Width &amp; ", " &amp; oRect.Height &amp; ")")
-        end if
-    end if
-
-    Test.MethodTested("createRegion()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XToolkit/script.xlb b/qadevOOo/tests/basic/ifc/awt/XToolkit/script.xlb
deleted file mode 100644
index 24a288f1f84a..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XToolkit/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XToolkit" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XToolkit"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTopWindow/awt_XTopWindow.xba b/qadevOOo/tests/basic/ifc/awt/XTopWindow/awt_XTopWindow.xba
deleted file mode 100644
index 7e69cee5760b..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTopWindow/awt_XTopWindow.xba
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XTopWindow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XTopWindow
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim list1 As Object, list2 As Object
-    Dim aDoc As Object
-    
-    list1 = createUnoListener("L1_", "com.sun.star.awt.XTopWindowListener")
-    list2 = createUnoListener("L2_", "com.sun.star.awt.XTopWindowListener")
-    
-    l1Called = false
-    l2Called = false
-
-    Test.StartMethod("addTopWindowListener()")
-    bOK = true
-
-    oObj.addTopWindowListener(list1)
-    oObj.addTopWindowListener(list2)
-
-    Test.StartMethod("removeTopWindowListener()")
-    oObj.removeTopWindowListener(list1)
-
-    Out.Log("Creating a doc ...")
-    aDoc = utils.createDocument("swriter", "Window On Top")
-    Out.Log("Doc created.")
-    wait(1000)
-
-    Test.StartMethod("toFront()")
-    bOK = true
-    activated = false
-    deactivated = false
-    oObj.toFront()
-    wait(1000)
-    bOK = bOK AND activated AND NOT deactivated
-    Test.MethodTested("toFront()", bOK)
-
-    Test.StartMethod("toBack()")
-    bOK = true
-    activated = false
-    deactivated = false
-    oObj.toBack()
-    wait(1000)
-    bOK = bOK AND deactivated AND NOT activated
-    Test.MethodTested("toBack()", bOK)
-    
-    Out.Log("Disposing a doc ...")
-    aDoc.dispose()
-    Out.Log("Doc disposed.")
-    wait(1000)
-
-    bOK = L2Called
-    Test.MethodTested("addTopWindowListener()", bOK)
-    bOK = bOK AND NOT L1Called
-    Test.MethodTested("removeTopWindowListener()", bOK)
-
-    Test.StartMethod("setMenuBar()")
-    bOK = true
-    Dim menu As Object
-    menu = createUnoService("com.sun.star.awt.MenuBar")
-    menu.insertItem(1, "MenuItem", com.sun.star.awt.MenuItemStyle.CHECKABLE, 1)
-    oObj.setMenuBar(menu)
-    Test.MethodTested("setMenuBar()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim L1Called As Boolean
-Dim L2Called As Boolean
-
-Dim activated As Boolean
-Dim deactivated As Boolean
-
-Sub L1_windowActivated()
-    L1Called = true
-End Sub
-Sub L1_windowDeactivated()
-    L1Called = true
-End Sub
-
-Sub L2_windowActivated()
-    L2Called = true
-    activated = true
-    Out.Log("Activated ...")
-End Sub
-Sub L2_windowDeactivated()
-    L2Called = true
-    deactivated = true
-    Out.Log("Deactivated ...")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XTopWindow/script.xlb b/qadevOOo/tests/basic/ifc/awt/XTopWindow/script.xlb
deleted file mode 100644
index 3d6045b6752d..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XTopWindow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XTopWindow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XTopWindow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XView/awt_XView.xba b/qadevOOo/tests/basic/ifc/awt/XView/awt_XView.xba
deleted file mode 100644
index 18911ee8be17..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XView/awt_XView.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oGraphics as Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oGetGraphics As Object
-    Dim vSize As Variant
-
-    Test.StartMethod("setGraphics()")
-    bOK = true
-    oObj.setGraphics(oGraphics)
-    Test.StartMethod("getGraphics()")
-    oGetGraphics = oObj.getGraphics()
-    bOK = bOK AND hasUnoInterfaces(oGetGraphics , "com.sun.star.awt.XGraphics")
-    Test.MethodTested("setGraphics()", bOK)
-    Test.MethodTested("getGraphics()", bOK)
-
-    Test.StartMethod("getSize()")
-    vSize = oObj.getSize()
-    bOK = (vSize.Height &lt;&gt; 0)
-    Test.MethodTested("getSize()", bOK)
-
-    Test.StartMethod("draw()")
-    bOk = true
-    oObj.draw(20,20)
-    Test.MethodTested("draw()", bOK)
-
-    Test.StartMethod("setZoom()")
-    bOK = true
-    oObj.setZoom(2,2)
-    Test.MethodTested("setZoom()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XView/script.xlb b/qadevOOo/tests/basic/ifc/awt/XView/script.xlb
deleted file mode 100644
index b65b2ad1e3ee..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/awt/XWindow/awt_XWindow.xba b/qadevOOo/tests/basic/ifc/awt/XWindow/awt_XWindow.xba
deleted file mode 100644
index 175ff95d1ef5..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XWindow/awt_XWindow.xba
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="awt_XWindow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-
-'*************************************************************************
-'       Global oXWindow as Object
-'       Global oCtrlShape as Variant (could be NULL)
-
-
-Dim bCB1_windowResized As Boolean
-Dim bCB2_windowResized As Boolean
-Dim bCB1_windowMoved As Boolean
-Dim bCB2_windowMoved As Boolean
-Dim bCB1_windowHidden As Boolean
-Dim bCB2_windowHidden As Boolean
-Dim bCB1_windowShown As Boolean
-Dim bCB2_windowShown As Boolean
-Dim bCB1_disposing As Boolean
-Dim bCB2_disposing As Boolean
-Dim bCB3_focusGained As Boolean
-Dim bCB4_focusGained As Boolean
-Dim bCB3_focusLost As Boolean
-Dim bCB4_focusLost As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.awt.XWindow
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    If isNull(oXWindow) Then
-		Out.Log("Could not get relation 'oXWindow' !")
-    End If
-    Dim oListener1 As Object, oListener2 As Object
-    Dim oListener3 As Object, oListener4 As Object
-    Dim oListener5 As Object, oListener6 As Object
-    Dim oListener7 As Object, oListener8 As Object
-    Dim oListener9 As Object, oListener10 As Object
-    Dim oListener11 As Object, oListener12 As Object
-    Dim size As Variant, pos As Variant
-    
-    bCB1_windowResized = false
-    bCB2_windowResized = false
-    bCB1_windowMoved = false
-    bCB2_windowMoved = false
-    bCB1_windowHidden = false
-    bCB2_windowHidden = false
-    bCB1_windowShown = false
-    bCB2_windowShown = false
-    bCB1_disposing = false
-    bCB2_disposing = false
-    bCB3_focusGained = false
-    bCB4_focusLost = false
-    bCB3_focusGained = false
-    bCB4_focusLost = false
-
-    Out.Log("create two com.sun.star.awt.XWindowListener")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.awt.XWindowListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.awt.XWindowListener")
-    Out.Log("create two  com.sun.star.awt.XFocusListener")
-    oListener3 = createUNOListener("CB3_", "com.sun.star.awt.XFocusListener")
-    oListener4 = createUNOListener("CB4_", "com.sun.star.awt.XFocusListener")
-    Out.Log("create two com.sun.star.awt.XKeyListener")
-    oListener5 = createUNOListener("CB5_", "com.sun.star.awt.XKeyListener")
-    oListener6 = createUNOListener("CB6_", "com.sun.star.awt.XKeyListener")
-    Out.Log("create two com.sun.star.awt.XMouseListener")
-    oListener7 = createUNOListener("CB7_", "com.sun.star.awt.XMouseListener")
-    oListener8 = createUNOListener("CB8_", "com.sun.star.awt.XMouseListener")
-    Out.Log("create two com.sun.star.awt.XMouseMotionListener")
-    oListener9 = createUNOListener("CB9_", "com.sun.star.awt.XMouseMotinListener")
-    oListener10 = createUNOListener("CB10_", "com.sun.star.awt.XMouseMotinListener")
-    Out.Log("create two com.sun.star.awt.XPaintListener")
-    oListener11 = createUNOListener("CB11_", "com.sun.star.awt.XPaintListener")
-    oListener12 = createUNOListener("CB12_", "com.sun.star.awt.XPaintListener")
-
-    Test.StartMethod("setPosSize()")
-    bOK = true
-    oObj.setPosSize(250,250,250,250,com.sun.star.awt.PosSize.POSSIZE)
-    Out.Log("oObj.setPosSize(250,250,250,250,com.sun.star.awt.PosSize.POSSIZE")
-    Test.StartMethod("getPosSize()")
-    Dim vRectangle As Variant
-    vRectangle = oObj.getPosSize()
-    Out.Log("Returned Values: X=" + vRectangle.X + " Y=" + vRectangle.Y _
-           + " WIDTH=" + vRectangle.WIDTH + " HEIGTH=" + vRectangle.HEIGHT
-    bOK = bOK AND vRectangle.X = 250
-    bOK = bOK AND vRectangle.Y = 250
-    bOK = bOK AND vRectangle.Width = 250
-    bOK = bOK AND vRectangle.Height = 250
-    Test.MethodTested("setPosSize()", bOK)
-    Test.MethodTested("getPosSize()", bOK)
-
-    Test.StartMethod("setVisible()")
-    bOK = true
-    oObj.setVisible(false)
-    oObj.setVisible(true)
-    Test.MethodTested("setVisible()", bOK)
-
-    Test.StartMethod("setEnable()")
-    bOK = true
-    oObj.setEnable(false)
-    oObj.setEnable(true)
-    Test.MethodTested("setEnable()", bOK)
-
-    Test.StartMethod("setFocus()")
-    bOK = true
-    oObj.setFocus()
-    oXWindow.setFocus()
-    oObj.setFocus()
-    Test.MethodTested("setFocus()", bOK)
-
-    Test.StartMethod("addWindowListener()")
-    bOK = true
-    oObj.addWindowListener(oListener1)
-    oObj.addWindowListener(oListener2)
-    oObj.setVisible(false)
-    oObj.setVisible(true)
-    if NOT isNull(oCtrlShape) then
-        size = oCtrlShape.Size
-        size.Width = size.Width + 100
-        size.Height = size.Height + 100
-        oCtrlShape.Size = size
-        
-        pos = oCtrlShape.Position
-        pos.X = pos.X + 100
-        pos.Y = pos.Y + 100
-        oCtrlShape.Position = pos
-    else
-        Out.Log("oObj.setPosSize(300,300,300,300,com.sun.star.awt.PosSize.POSSIZE)")
-        oObj.setPosSize(300,300,300,300,com.sun.star.awt.PosSize.POSSIZE)
-    end if
-    wait(1000)
-    bOK = bOK AND bCB1_windowResized AND bCB2_windowResized AND bCB1_windowMoved AND _
-          bCB2_windowMoved AND bCB1_windowHidden AND bCB2_windowHidden AND _
-          bCB1_windowShown AND bCB2_windowShown AND NOT bCB1_disposing AND NOT _
-          bCB2_disposing
-    Test.MethodTested("addWindowListener()", bOK)
-
-    Test.StartMethod("removeWindowListener()")
-    bOK = true
-    bCB1_windowResized = false
-    bCB2_windowResized = false
-    bCB1_windowMoved = false
-    bCB2_windowMoved = false
-    bCB1_windowHidden = false
-    bCB2_windowHidden = false
-    bCB1_windowShown = false
-    bCB2_windowShown = false
-    bCB1_disposing = false
-    bCB2_disposing = false
-    oObj.removeWindowListener(oListener2)
-    oObj.setVisible(false)
-    oObj.setVisible(true)
-    oObj.setVisible(false)
-    oObj.setVisible(true)
-    if NOT isNull(oCtrlShape) then
-        size = oCtrlShape.Size
-        size.Width = size.Width + 100
-        size.Height = size.Height + 100
-        oCtrlShape.Size = size
-        
-        pos = oCtrlShape.Position
-        pos.X = pos.X + 100
-        pos.Y = pos.Y + 100
-        oCtrlShape.Position = pos
-    else
-        Out.Log("oObj.setPosSize(300,300,300,300,com.sun.star.awt.PosSize.POSSIZE)")
-        oObj.setPosSize(301,301,301,301,com.sun.star.awt.PosSize.POSSIZE)
-    end if
-    wait(200)
-    bOK = bOK AND bCB1_windowResized AND NOT bCB2_windowResized AND bCB1_windowMoved AND NOT _
-          bCB2_windowMoved AND bCB1_windowHidden AND NOT bCB2_windowHidden AND _
-          bCB1_windowShown AND NOT bCB2_windowShown AND NOT bCB1_disposing AND NOT _
-          bCB2_disposing
-    oObj.removeWindowListener(oListener1)
-    Test.MethodTested("removeWindowListener()", bOK)
-
-    Test.StartMethod("addFocusListener()")
-    bOK = true
-    oObj.addFocusListener(oListener3)
-    oObj.addFocusListener(oListener4)
-    oObj.setFocus()
-    wait(200)
-    oXWindow.setFocus()
-    wait(200)
-    oObj.setFocus()
-    wait(200)
-    bOK = bOK AND bCB3_focusGained AND bCB4_focusLost AND bCB3_focusGained AND bCB4_focusLost
-    Test.MethodTested("addFocusListener()", bOK)
-
-    Test.StartMethod("removeFocusListener()")
-    bOK = true
-    bCB3_focusGained = false
-    bCB4_focusLost = false
-    bCB3_focusGained = false
-    bCB4_focusLost = false
-    oObj.removeFocusListener(oListener4)
-    oObj.setFocus()
-    wait(200)
-    oXWindow.setFocus()
-    wait(200)
-    oObj.setFocus()
-    wait(200)
-    bOK = bOK AND bCB3_focusGained AND NOT bCB4_focusLost AND bCB3_focusGained AND NOT bCB4_focusLost
-    oObj.removeFocusListener(oListener3)
-    Test.MethodTested("removeFocusListener()", bOK)
-
-'***************************************************************************************
-'* LISTENERS which needs interactions                                                  *
-'***************************************************************************************
-'*
-'* The following listener tests need interactions. That means i.e. a
-'* com.sun.star.awt.XKeyListener needs action from the keyboard. This is not possible in
-'* the automatic API-Testing. To test the listener you can set a breakpoint at the
-'* specific function call. Then do interaction which should call the listener. It must be
-'* pop up a message box.
-'*
-'***************************************************************************************
-
-    Test.StartMethod("addKeyListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.addKeyListener(oListener5)
-    oObj.addKeyListener(oListener6)
-    bOK = bOK AND true
-    Test.MethodTested("addKeyListener()", bOK)
-
-    Test.StartMethod("removeKeyListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.removeKeyListener(oListener5)
-    bOK = bOK AND true
-    oObj.removeKeyListener(oListener6)
-    Test.MethodTested("removeKeyListener()", bOK)
-
-    Test.StartMethod("addMouseListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.addMouseListener(oListener7)
-    oObj.addMouseListener(oListener8)
-    bOK = bOK AND true
-    Test.MethodTested("addMouseListener()", bOK)
-
-    Test.StartMethod("removeMouseListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.removeMouseListener(oListener7)
-    bOK = bOK AND true
-    oObj.removeMouseListener(oListener8)
-    Test.MethodTested("removeMouseListener()", bOK)
-
-    Test.StartMethod("addMouseMotionListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.addMouseMotionListener(oListener9)
-    oObj.addMouseMotionListener(oListener10)
-    bOK = bOK AND true
-    Test.MethodTested("addMouseMotionListener()", bOK)
-
-    Test.StartMethod("removeMouseMotionListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.removeMouseMotionListener(oListener9)
-    bOK = bOK AND true
-    oObj.removeMouseMotionListener(oListener10)
-    Test.MethodTested("removeMouseMotionListener()", bOK)
-
-    Test.StartMethod("addPaintListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.addPaintListener(oListener11)
-    oObj.addPaintListener(oListener12)
-    bOK = bOK AND true
-    Test.MethodTested("addPaintListener()", bOK)
-
-    Test.StartMethod("removePaintListener()")
-    bOK = true
-    Out.Log("Not realy tested! Please see comments in Basic-Source.")
-    oObj.removePaintListener(oListener11)
-    bOK = bOK AND true
-    oObj.removePaintListener(oListener12)
-    Test.MethodTested("removePaintListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-' Listener call backs for com.sun.star.awt.XWindowListener
-Sub CB1_windowResized
-    Out.Log("CallBack for Listener1 windowResized was called.")
-    bCB1_windowResized = true
-End Sub
-Sub CB2_windowResized
-    Out.Log("CallBack for Listener2 windowResized was called.")
-    bCB2_windowResized = true
-End Sub
-Sub CB1_windowMoved
-    Out.Log("CallBack for Listener1 windowMoved was called.")
-    bCB1_windowMoved = true
-End Sub
-Sub CB2_windowMoved
-    Out.Log("CallBack for Listener2 windowMoved was called.")
-    bCB2_windowMoved = true
-End Sub
-Sub CB1_windowHidden
-    Out.Log("CallBack for Listener1 windowHidden was called.")
-    bCB1_windowHidden = true
-End Sub
-Sub CB2_windowHidden
-    Out.Log("CallBack for Listener2 windowHidden was called.")
-    bCB2_windowHidden = true
-End Sub
-Sub CB1_windowShown
-    Out.Log("CallBack for Listener1 windowShown was called.")
-    bCB1_windowShown = true
-End Sub
-Sub CB2_windowShown
-    Out.Log("CallBack for Listener2 windowShown was called.")
-    bCB2_windowShown = true
-End Sub
-Sub CB1_disposing
-    Out.Log("CallBack for Listener1 disposing was called")
-    bCB1_disposing = true
-End Sub
-Sub CB2_disposing
-    Out.Log("CallBack for Listener2 disposing was called")
-    bCB2_disposing = true
-End Sub
-
-' Listener call backs for com.sun.star.awt.XFocusListener
-Sub CB3_focusGained
-    Out.Log("CallBack for Listener3 'focusGained' was called")
-    bCB3_focusGained = true
-End Sub
-Sub CB4_focusGained
-    Out.Log("CallBack for Listener4 'focusGained' was called")
-    bCB4_focusGained = true
-End Sub
-Sub CB3_focusLost
-    Out.Log("CallBack for Listener3 'focusLost' was called")
-    bCB3_focusLost = true
-End Sub
-Sub CB4_focusLost
-    Out.Log("CallBack for Listener4 'focusLost' was called")
-    bCB4_focusLost = true
-End Sub
-Sub CB3_disposing
-End Sub
-Sub CB4_disposing
-End Sub
-
-' Listener call backs for com.sun.star.awt.XKeyListener
-' They will never be called beause of no interaction in API-Testing
-Sub CB5_keyPressed
-  MsgBox("CallBack for Listener5 'keyPressed' was called")
-End Sub
-Sub CB6_keyPressed
-  MsgBox("CallBack for Listener6 'keyPressed' was called")
-End Sub
-Sub CB5_keyReleased
-  MsgBox("CallBack for Listener5 'keyReleased' was called")
-End Sub
-Sub CB6_keyReleased
-  MsgBox("CallBack for Listener6 'keyReleased' was called")
-End Sub
-Sub CB5_disposing
-End Sub
-Sub CB6_disposing
-End Sub
-
-
-' Listener call backs for com.sun.star.awt.XMouseListener
-' They will never be called beause of no interaction in API-Testing
-Sub CB7_mousePressed
-  MsgBox("CallBack for Listener7 'mousePressed' was called")
-End Sub
-Sub CB8_mousePressed
-  MsgBox("CallBack for Listener8 'mousePressed' was called")
-End Sub
-Sub CB7_mouseReleased
-  MsgBox("CallBack for Listener8 'mouseReleased' was called")
-End Sub
-Sub CB8_mouseReleased
-  MsgBox("CallBack for Listener8 'mouseReleased' was called")
-End Sub
-Sub CB7_mouseEntered
-  MsgBox("CallBack for Listener7 'mouseEntered' was called")
-End Sub
-Sub CB8_mouseEntered
-  MsgBox("CallBack for Listener8 'mouseEntered' was called")
-End Sub
-Sub CB7_mouseExited
-  MsgBox("CallBack for Listener7 'mouseExited' was called")
-End Sub
-Sub CB8_mouseExited
-  MsgBox("CallBack for Listener8 'mouseExited' was called")
-End Sub
-Sub CB7_disposing
-End Sub
-Sub CB8_disposing
-End Sub
-
-
-' Listener call backs for com.sun.star.awt.XMouseMotionListener
-' They will never be called beause of no interaction in API-Testing
-Sub CB9_mouseDragged
-  MsgBox("CallBack for Listener9 'mouseDragged' was called")
-End Sub
-Sub CB10_mouseDragged
-  MsgBox("CallBack for Listener10 'mouseDragged' was called")
-End Sub
-Sub CB9_mouseMoved
-  MsgBox("CallBack for Listener9 'mouseMoved' was called")
-End Sub
-Sub CB10_mouseMoved
-  MsgBox("CallBack for Listener10 'mouseMoved' was called")
-End Sub
-Sub CB9_disposing
-End Sub
-Sub CB10_disposing
-End Sub
-
-
-' Listener call backs for com.sun.star.awt.XMouseMotionListener
-' They will never be called beause of no interaction in API-Testing
-Sub CB11_windowPaint
-  MsgBox("CallBack for Listener11 'windowPaint' was called")
-End Sub
-Sub CB12_windowPaint
-  MsgBox("CallBack for Listener12 'windowPaint' was called")
-End Sub
-Sub CB11_disposing
-End Sub
-Sub CB12_disposing
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/awt/XWindow/script.xlb b/qadevOOo/tests/basic/ifc/awt/XWindow/script.xlb
deleted file mode 100644
index 4ae24a18c765..000000000000
--- a/qadevOOo/tests/basic/ifc/awt/XWindow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="awt_XWindow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="awt_XWindow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XExactName/beans_XExactName.xba b/qadevOOo/tests/basic/ifc/beans/XExactName/beans_XExactName.xba
deleted file mode 100644
index d22b00f4efaa..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XExactName/beans_XExactName.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="XExactName" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following object relations
-' variables, which must be specified in the object creation:
-
-'      ObjectRelation: oObjRelation(0).Name = "expectedName"
-'      ObjectRelation: oObjRelation(0).Value = "MyExpectedName"
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XExactName
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cExpectedName as Variant
-    cExpectedName = utils.getObjectRelation("expectedName")
-    if isNull(cExpectedName) then
-        out.log("Object relation 'expectedName' is missing")
-    end if
-
-    Test.StartMethod("getExactName()")
-    
-    out.log("getting exact name for " + cExpectedName)
-    bOK = TRUE
-    Dim cResult as String
-    cResult = oObj.getExactName(cExpectedName)
-    bOK = bOK AND (cResult = cExpectedName)
-
-    out.log("getting exact name for " + LCase(cExpectedName))
-    bOK = TRUE
-    cResult = oObj.getExactName(LCase(cExpectedName))
-    bOK = bOK AND (cResult = cExpectedName)
-
-    out.log("getting exact name for " + UCase(cExpectedName))
-    bOK = TRUE
-    cResult = oObj.getExactName(UCase(cExpectedName))
-    bOK = bOK AND (cResult = cExpectedName)
-    
-    Test.MethodTested("getExactName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XExactName/script.xlb b/qadevOOo/tests/basic/ifc/beans/XExactName/script.xlb
deleted file mode 100644
index bd759a0334b8..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XExactName/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XExactName" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="beans_XExactName"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/beans_XFastPropertySet.xba b/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/beans_XFastPropertySet.xba
deleted file mode 100644
index 8961bec8d24c..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/beans_XFastPropertySet.xba
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XFastPropertySet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XFastPropertySet
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oPropertySetInfo As Object
-    Dim oProperties As Variant
-    Dim nIndex As Long, nHanlde As Long
-    Dim nCount As Integer
-    Dim vMemVal As Variant, vNewVal As Variant
-    Dim bBoolean As Boolean
-    Dim nInteger As Integer
-    Dim nLong As Long
-    Dim nSingle As Single
-    Dim nDouble As Double
-
-    oPropertySetInfo = oObj.GetPropertySetInfo()
-    oProperties = oPropertySetInfo.Properties
-    nCount = uBound(oProperties)
-
-    nIndex = 0
-    nMem = nIndex
-    'find at first a Boolean Value, if not available a String Property
-    While (NOT bFound) AND (nCount &gt;= nIndex)
-        If VarType(oObj.getFastPropertyValue(oProperties(nIndex).Handle)) = 11 Then ' it is a Boolean Proerty
-            bFound = true
-            nMem = nIndex
-        else
-            If VarType(oObj.getFastPropertyValue(oProperties(nIndex).Handle)) = 8 Then ' it is a String Property
-                nMem = nIndex
-            end if
-        end if
-        nIndex = nIndex + 1
-    Wend
-    nIndex = nMem
-    Out.Log("Property selected: '" + oProperties(nIndex).Name + "'")
-
-    'memory the old Value
-    vMemVal = oObj.getFastPropertyValue(oProperties(nIndex).Handle)
-    ' change the Value
-    select case VarType(oObj.getFastPropertyValue(oProperties(nIndex).Handle)
-        case 11 'boolean
-            bBoolean = NOT oObj.getFastPropertyValue(oProperties(nIndex).Handle)
-            vNewVal = bBoolean
-        case 2 'integer
-            nInteger = oObj.getFastPropertyValue(oProperties(nIndex).Handle) + 1
-            vNewVal = nInteger
-        case 3 'long
-            nLong = oObj.getFastPropertyValue(oProperties(nIndex).Handle) + 1
-            vNewVal = nLong
-        case 4 'single
-            nSingle = oObj.getFastPropertyValue(oProperties(nIndex).Handle) + 1
-            vNewVal = nSingle
-        case 5 'double
-            nDouble = oObj.getFastPropertyValue(oProperties(nIndex).Handle) + 1
-            vNewVal = nDouble
-        case 8 'string
-          vNewVal = oObj.getPropertyValue(oProperties(nIndex).Name) + cIfcShortName
-    end select
-
-    nHandle = oProperties(nIndex).Handle
-
-    Test.StartMethod("getFastPropertyValue()")
-    bOK = true
-    bOK = bOK AND (vMemVal = oObj.getFastPropertyValue(nHandle))
-    Test.MethodTested("getFastPropertyValue()", bOK)
-
-    Test.StartMethod("setFastPropertyValue()")
-    bOK = true
-    oObj.setFastPropertyValue(nHandle, vNewVal)
-    bOK = bOK AND (vMemVal &lt;&gt; oObj.getFastPropertyValue(nHandle))
-    Test.MethodTested("setFastPropertyValue()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/script.xlb b/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/script.xlb
deleted file mode 100644
index 3f8c3c6736e5..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XFastPropertySet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XFastPropertySet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XFastPropertySet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XIntrospection/beans_XIntrospection.xba b/qadevOOo/tests/basic/ifc/beans/XIntrospection/beans_XIntrospection.xba
deleted file mode 100644
index 40209b24e54d..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XIntrospection/beans_XIntrospection.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XIntrospection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XIntrospection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim xInspAccess As Object
-
-
-    Test.StartMethod("inspect()")
-    bOK = true
-    xInspAccess = oObj.inspect(oObj)
-    bOK = bOK AND hasUnoInterfaces(xInspAccess, "com.sun.star.beans.XIntrospectionAccess")
-    Test.MethodTested("inspect()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XIntrospection/script.xlb b/qadevOOo/tests/basic/ifc/beans/XIntrospection/script.xlb
deleted file mode 100644
index 69ffa481df6d..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XIntrospection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XIntrospection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XIntrospection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/beans_XMultiPropertySet.xba b/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/beans_XMultiPropertySet.xba
deleted file mode 100644
index 7ad82a14a229..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/beans_XMultiPropertySet.xba
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XMultiPropertySet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim nCB1Val As Integer, nCB2Val As Integer
-
-
-Sub RunTest() 
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XMultiPropertySet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oPropertySetInfo As Object
-    Dim oProperties As Variant
-    Dim aProp(0 to 1) As new com.sun.star.beans.PropertyValue
-    Dim cType As String
-    Dim oListener1 As Object, oListener2 As Object
-    Dim n As Integer, nMem As Integer, nIndex As Integer
-    Dim m As Integer
-    Dim bFound As Boolean
-    Dim nCount As Integer
-    Dim bBoolean As Boolean
-    Dim nInteger As Integer
-    Dim nLong As Long
-    Dim nSingle As Single
-    Dim nDouble As Double
-    Dim vMemVal As Variant
-    Dim nCB1ValMem As Integer
-    Dim nCB2ValMem As Integer
-
-    bOK = true
-    bFound = false
-    nCB1Val = 0
-    nCB2Val = 0
-    m = 0
-    oPropertySetInfo = oObj.GetPropertySetInfo
-    oProperties = oPropertySetInfo.Properties
-    nCount = uBound(oProperties)
-    Out.Log("The Object has " + nCount + " properties"
-
-    Out.Log("Create linsteners...")
-    oListener1 = createUNOListener("CB1_","com.sun.star.beans.XPropertiesChangeListener")
-    oListener2 = createUNOListener("CB2_","com.sun.star.beans.XPropertiesChangeListener")
-    Out.Log("oListener1 and oListener2 created"
-
-    'create sequences of Propertie-Names and Values
-    'fist get the amount of valid properties
-    for n = 0 to (nCount)
-        'look for readonly-properties
-        If (oProperties(n).Attributes AND com.sun.star.beans.PropertyAttribute.READONLY) = 0 Then
-            'look for MAYBEVOID-Properties
-            If (oProperties(n).Attributes AND com.sun.star.beans.PropertyAttribute.MAYBEVOID) = 0 Then
-                'is the Property testable
-                m = m + 1
-            End If
-        End If
-    next n
-
-    Out.Log("Amount of testable properites (without readonly and MAYBEVOID) is " + m)
-
-    'now store the names in sProperites
-    Dim searchProperties(0 to m-1) As String
-    m = 0
-    for n = 0 to (nCount)
-    'kick off readonly-properties
-        If (oProperties(n).Attributes AND com.sun.star.beans.PropertyAttribute.READONLY) = 0 Then
-        'kick off MYBEVOID-Properties
-            If (oProperties(n).Attributes AND com.sun.star.beans.PropertyAttribute.MAYBEVOID) = 0 Then
-                searchProperties(m) = oProperties(n).Name
-                Out.Log("" + m + " " + searchProperties(m) + " " + oObj.getPropertySetInfo.getPropertyByName(searchProperties(m)).Type.Name + " " + n)          
-                Dim pVal As Variant
-                
-                pVal = oObj.getPropertyValue(searchProperties(m))
-                oObj.setPropertyValues(Array(searchProperties(m)), Array(pVal))
-                m = m + 1
-            End If
-        End If 
-    next n
-    nCount = m - 1
-
-    Dim sProperties(0 to nCount) As String
-    Dim vValues(0 to nCount) As Variant
-    For n = 0 to nCount
-        sProperties(n) = searchProperties(n)
-    next n
-
-    vValues() = oObj.getPropertyValues(sProperties())
-
-    'add ChangeListener
-    oObj.addPropertiesChangeListener(sProperties(),oListener1)
-    oObj.addPropertiesChangeListener(sProperties(),oListener2)
-    Out.Log("oListener1 and oListener2 added to object")
-
-    nIndex = 0
-    nMem = nIndex
-    'find at first a Boolean Value, if not available a String Property
-    While (NOT bFound) AND ((nCount &gt;= nIndex))
-        'get the property-type
-        cType = oObj.getPropertySetInfo.getPropertyByName(sProperties(nIndex)).Type.Name
-        If cType = "boolean" Then ' it is a Boolean Proerty
-            bFound = true
-            nMem = nIndex
-        else
-            If cType = "string" Then ' it is a String Property
-                nMem = nIndex
-            end if
-        end if
-        nIndex = nIndex + 1
-    Wend
-
-    nIndex = nIndex - 1
-    Out.Log("Property to change is: """ + sProperties(nIndex) + """ Type: """ + oObj.getPropertySetInfo.getPropertyByName(sProperties(nIndex)).Type.Name + """")
-    nIndex = nMem
-
-    'memory the old Value
-    vMemVal = vValues(nIndex)
-
-    'change a value of a property, hopefully a boolean or string property
-    select case VarType(vValues(nIndex)
-        case 11 'boolean
-            bBoolean = NOT vValues(nIndex)
-            vValues(nIndex) = bBoolean
-        case 2 'integer
-            nInteger = vValues(nIndex) + 1
-            vValues(nIndex) = nInteger
-        case 3 'long
-            nLong = vValues(nIndex) + 1
-            vValues(nIndex) = nLong
-        case 4 'single
-            nSingle = vValues(nIndex) + 1
-            vValues(nIndex) = nSingle
-        case 5 'double
-            nDouble = vValues(nIndex) + 1
-            vValues(nIndex) = nDouble
-        case 8 'string
-            vValues(nIndex) = vValues(nIndex) + cIfcShortName
-    end select
-
-    Test.StartMethod("getPropertySetInfo()")
-    bOK = bOK AND (uBound(oProperties) &gt; 0)
-    Test.MethodTested("getPropertySetInfo()", bOK)
-
-    Test.StartMethod("getPropertyValues()")
-    bOK = bOK AND (uBound(vValues()) &gt; 0)
-    Test.MethodTested("getPropertyValues()", bOK)
-
-    Test.StartMethod("setPropertyValues()")
-    oObj.setPropertyValues(sProperties(), vValues())
-    vValues() = oObj.getPropertyValues(sProperties())
-    bOK = bOK AND (vValues(nIndex) &lt;&gt; vMemVal)
-    Test.MethodTested("setPropertyValues()", bOK)
-
-    Test.StartMethod("addPropertiesChangeListener()")
-    bOK = (nCB1Val &gt;= 1) AND (nCB2Val &gt;= 1)
-    nCB1ValMem = nCB1Val
-    nCB2ValMem = nCb2Val
-    Test.MethodTested("addPropertiesChangeListener()", bOK)
-
-    'fire !!!
-    Out.Log("Try to fire property change event...")
-    oObj.firePropertiesChangeEvent(sProperties(),oListener1)
-    oObj.firePropertiesChangeEvent(sProperties(),oListener2)
-
-    Test.StartMethod("firePropertiesChangeEvent()")
-    bOK = (nCB1Val &gt;= nCB1ValMem) AND (nCB2Val &gt;= nCB2ValMem)
-    Test.MethodTested("firePropertiesChangeEvent()", bOK)
-    nCB1ValMem = nCB1Val
-    nCB2ValMem = nCb2Val
-
-
-    'remove one Listener and fire
-    Test.StartMethod("removePropertiesChangeListener()")
-    oObj.removePropertiesChangeListener(oListener1)
-    Out.Log("oListener1 removed")
-    select case VarType(vValues(nIndex)
-        case 11 'boolean
-            bBoolean = NOT vValues(nIndex)
-            vValues(nIndex) = bBoolean
-        case 2 'integer
-            nInteger = vValues(nIndex) + 1
-            vValues(nIndex) = nInteger
-        case 3 'long
-            nLong = vValues(nIndex) + 1
-            vValues(nIndex) = nLong
-        case 4 'single
-            nSingle = vValues(nIndex) + 1
-            vValues(nIndex) = nSingle
-        case 5 'double
-            nDouble = vValues(nIndex) + 1
-            vValues(nIndex) = nDouble
-        case 8 'string
-            vValues(nIndex) = vValues(nIndex) + cIfcShortName
-    end select
-    
-    Out.Log("The property '" + sProperties(nIndex) + "' was changed")
-    
-    oObj.setPropertyValues(sProperties(), vValues())
-
-    bOK = (nCB1Val = nCB1ValMem) AND (nCB2Val &gt;= nCB2ValMem)
-    Test.MethodTested("removePropertiesChangeListener()", bOK)
-
-    'remove the last Listener
-    oObj.removePropertiesChangeListener(oListener2)
-    Out.Log("oListener2 removed")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-'callback routine called firePropertiesChangeEvent
-Sub CB1_propertiesChange
-    Out.Log("CallBack for Listener 1 was called.")
-    nCB1Val = nCB1Val + 1
-end Sub
-
-Sub CB2_propertiesChange
-    Out.Log("CallBack for Listener 2 was called.")
-    nCB2Val = nCB2Val + 1
-end Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/script.xlb b/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/script.xlb
deleted file mode 100644
index 55637429dd36..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XMultiPropertySet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XMultiPropertySet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XMultiPropertySet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/beans_XMultiPropertyStates.xba b/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/beans_XMultiPropertyStates.xba
deleted file mode 100644
index 6858ab51a28f..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/beans_XMultiPropertyStates.xba
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XMultiPropertyStates" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Function getPropNames(xPropSet As Object) As Variant
-    Dim props As Variant
-    Dim propNames As Variant
-    Dim i As Integer, propCount As Integer
-    
-    props = xPropSet.getPropertySetInfo().getProperties()
-	propCount = 0
-    for i = 0 to ubound (props)
-    	if (props(i).Attributes AND com.sun.star.beans.PropertyAttribute.READONLY) = 0 _
-    		then propCount = propCount + 1
-    next i
-
-    propNames = DimArray(propCount - 1)
-    aProps = DimArray(propCount - 1)
-    
-    propCount = 0
-    for i = 0 to ubound(props)
-    	if (props(i).Attributes AND com.sun.star.beans.PropertyAttribute.READONLY) = 0 then
-	        propNames(propCount) = props(i).Name
-	        aProps(propCount) = props(i)
-    		propCount = propCount + 1
-    	endif
-    next i
-
-    getPropNames = propNames
-End Function
-
-Dim aProps As Variant
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XMultiPropertyStates
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim aPropNames As Variant
-    Dim aDefaults As Variant
-    Dim aStates As Variant
-    
-    if NOT hasUnoInterfaces(oObj, "com.sun.star.beans.XPropertySet") then
-        Out.Log("The compoent doesn't support XPropertySet this test must be reviewed !!!")
-        exit sub
-    end if
-
-    bOK = true
-    aPropNames = getPropNames(oObj)
-
-    if NOT utils.isSorted(aPropNames) then
-        Out.Log("Property names are not sorted : sorting ...")
-        utils.bubbleSort(aPropNames, false, aProps)
-    end if
-    
-    Out.Log("Totally " + (ubound(aPropNames) + 1) + " properties encountered.")
-    
-    Test.StartMethod("getPropertyDefaults()")
-        
-    aDefaults = oObj.getPropertyDefaults(aPropNames)
-    Out.Log("Number of default values: " + (ubound(aDefaults) + 1))
-    bOK = ubound(aDefaults) = ubound(aPropNames)
-
-    Test.MethodTested("getPropertyDefaults()", bOK)
-
-
-    Test.StartMethod("getPropertyStates()")
-    bOK = true
-        
-    aStates = oObj.getPropertyStates(aPropNames)
-    Out.Log("Number of states: " + (ubound(aStates) + 1))
-    bOK = ubound(aStates) = ubound(aPropNames)
-
-    Test.MethodTested("getPropertyStates()", bOK)
-
-    Test.StartMethod("setPropertiesToDefault()")
-    bOK = true
-    
-    Dim propName As String
-    Dim propIdx As Integer
-    Dim mayBeDef As Boolean 
-    Dim i As Integer
-    propName = aPropNames(0)
-    propIdx = 0
-    mayBeDef = false
-    
-    ' searching for property which currently don't have default value and preferable has MAYBEDEFAULT attr
-    ' if no such properties are found then the first one is selected 
-    for i = 0 to ubound(aPropNames)
-        if NOT mayBeDef AND aStates(i) &lt;&gt; com.sun.star.beans.PropertyState.DEFAULT_VALUE then
-            propName = aPropNames(i)
-            propIdx = i
-            if (aProps(i).Attributes AND com.sun.star.beans.PropertyAttribute.MAYBEDEFAULT) > 0 then
-                Out.Log("Property " + propName + " 'may be default' and doesn't have default value")
-                mayBeDef = true
-            end if
-        end if
-    next i
-    Out.Log("The property " + propName + " selected") 
-    
-    oObj.setPropertiesToDefault(Array(propName))
-    
-    aStates = oObj.getPropertyStates(aPropNames)
-    if aStates(propIdx) &lt;&gt; com.sun.star.beans.PropertyState.DEFAULT_VALUE then
-        Out.Log("The property didn't change its state to default ...")
-        if mayBeDef then
-            Out.Log("   ... and it may be default - FAILED")
-            bOK = false
-        else
-            Out.Log("   ... but it may not be default - OK")
-        end if
-    end if
-
-    Test.MethodTested("setPropertiesToDefault()", bOK)
-
-    Test.StartMethod("setAllPropertiesToDefault()")
-    bOK = true
-
-    oObj.setAllPropertiesToDefault()
-    
-    Out.Log("Checking that all properties are now in DEFAULT state excepting may be those which 'cann't be default'")
-    aStates = oObj.getPropertyStates(aPropNames)
-    for i = 0 to ubound(aStates)
-        if aStates(i) &lt;&gt; com.sun.star.beans.PropertyState.DEFAULT_VALUE then
-            Out.Log("The property " + aPropNames(i) + " didn't change its state to default ...")
-            if (aProps(i).Attributes AND com.sun.star.beans.PropertyAttribute.MAYBEDEFAULT) > 0 then
-                Out.Log("   ... and it has MAYBEDEFAULT attribute - FAILED")
-                bOK = false
-            else 
-                Out.Log("   ... but it has no MAYBEDEFAULT attribute - OK")
-            end if
-        end if
-    next i
-
-    Test.MethodTested("setAllPropertiesToDefault()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/script.xlb b/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/script.xlb
deleted file mode 100644
index 283aa20cf01e..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XMultiPropertyStates/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XMultiPropertyStates" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XMultiPropertyStates"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XProperty/beans_XProperty.xba b/qadevOOo/tests/basic/ifc/beans/XProperty/beans_XProperty.xba
deleted file mode 100644
index b6c372df2ea3..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XProperty/beans_XProperty.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="XProperty" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XProperty
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getAsProperty()")
-    bOK = TRUE
-    Dim vProperty as new com.sun.star.beans.Property
-    vProperty = oObj.getAsProperty()
-    bOK = bOK and not isNull(vProperty)
-    Test.MethodTested("getAsProperty()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XProperty/script.xlb b/qadevOOo/tests/basic/ifc/beans/XProperty/script.xlb
deleted file mode 100644
index 733318087ab3..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XProperty/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XProperty" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="beans_XProperty"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertySet/beans_XPropertySet.xba b/qadevOOo/tests/basic/ifc/beans/XPropertySet/beans_XPropertySet.xba
deleted file mode 100644
index ace2dc6775f3..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertySet/beans_XPropertySet.xba
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XPropertySet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-'Change-Listener needs bound-Properties
-'Veto-Listener needs constrained-Propperties
-
-'*************************************************************************
-
-
-
-
-Const BOUND = 2
-Const CONSTRAINED = 4
-Const MAYBENULL = 8
-Const READONLY = 16
-
-Dim aBoundProps() As String
-Dim aConstrainedProps() As String
-Dim aNormalProps() As String
-Dim aReadOnlyProps() As String
-
-Dim nBoundCount As Integer
-Dim nConstrainedCount As Integer
-Dim nNormalCount As Integer
-Dim nReadOnlyCount As Integer
-
-Dim aAllProps As Object
-
-Dim vetoCalled1 As Boolean
-Dim propCalled1 As Boolean
-Dim vetoCalled2 As Boolean
-Dim propCalled2 As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XPropertySet
-'*************************************************************************
-On Error Goto ErrHndl
-If (bErrHndl) Then On Error Goto ErrHndl
-    Dim oPCListener1 As Object
-    Dim oVListener1 As Object
-    Dim oPCListener2 As Object
-    Dim oVListener2 As Object
-    Dim bOK As boolean
-
-    Test.StartMethod("getPropertySetInfo()")
-    bOK = true
-    bOK = NOT isNULL(oObj.PropertySetInfo)
-    Test.MethodTested("getPropertySetInfo()", bOK)
-
-    Out.Log("Get properties()")
-    bOK = GetProps()
-
-    Out.Log("Create Listeners")
-    oPCListener1 = createUNOListener("CB1_","com.sun.star.beans.XPropertyChangeListener")
-    oVListener1 = createUNOListener("CB1_","com.sun.star.beans.XVetoableChangeListener")
-    oPCListener2 = createUNOListener("CB2_","com.sun.star.beans.XPropertyChangeListener")
-    oVListener2 = createUNOListener("CB2_","com.sun.star.beans.XVetoableChangeListener")
-
-    Test.StartMethod("getPropertyValue()")
-    bOK = true
-    bOK = bOK AND test_getPropertyValue()
-    Test.MethodTested("getPropertyValue()", bOK)
-
-    Test.StartMethod("setPropertyValue()")
-    bOK = true
-    Dim bReadOnlyOK As Boolean
-    Dim bNormalOK As Boolean
-    bReadOnlyOK = false
-    bNormalOK = false
-    Dim bCVOK As boolean
-
-    if (nReadOnlyCount = 0) then
-        bReadOnlyOK = true
-        Out.Log("No ReadOnly properties!")
-    else
-        for i = 0 to nReadOnlyCount - 1
-            Out.Log("READONLY: '" &amp; aReadOnlyProps(i) &amp; "'")
-            if (aReadOnlyProps(i) = "Preview") then
-                bCVOK = true
-            else
-                bCVOK = PropertyTester.TestPropertyWithoutParams(aReadOnlyProps(i), true)
-            end if
-            Out.Log(bCVOK)
-            Out.Log("")
-            bReadOnlyOK = bReadOnlyOK OR bCVOK
-        next i
-    end if
-
-    bOK = bOK AND bReadOnlyOK
-
-    if (nNormalCount = 0) then
-        bNormalOK = true
-        Out.Log("No Normal properties!")
-    else
-        for i = 0 to nNormalCount - 1
-            Out.Log("NORMAL: '" &amp; aNormalProps(i) &amp; "'")
-            bCVOK = PropertyTester.TestPropertyWithoutParams(aNormalProps(i), false)
-            Out.Log(bCVOK)
-            Out.Log("")
-            bNormalOK = bNormalOK OR bCVOK
-        next i
-    end if
-
-    bOK = bOK AND bNormalOK
-
-    Test.MethodTested("setPropertyValue()", bOK)
-
-    Test.StartMethod("addVetoableChangeListener()")
-    Test.StartMethod("removeVetoableChangeListener()")
-    Dim bAddVeto As Boolean
-    Dim bRmvVeto As Boolean
-    bRmvVeto = true
-    bAddVeto = true
-
-    if (nConstrainedCount = 0) then
-        Out.Log("No Constrained properties!")
-        bAddVeto = true
-        bRmvVeto = true
-    else
-        for i = 0 to nConstrainedCount - 1
-            vetoCalled1 = false
-            vetoCalled2 = false
-            oObj.addVetoableChangeListener(aConstrainedProps(i), oVListener1)
-            oObj.addVetoableChangeListener(aConstrainedProps(i), oVListener2)
-            PropertyTester.TestPropertyWithoutParams(aConstrainedProps(i), false)
-            bAddVeto = bAddVeto OR (vetoCalled1 AND vetoCalled2)
-            Out.Log("addVetoableChangeListener: " &amp; aConstrainedProps(i) &amp; " Listener1 must be called: " &amp; vetoCalled1)
-            Out.Log("addVetoableChangeListener: " &amp; aConstrainedProps(i) &amp; " Listener2 must be called: " &amp; vetoCalled2)
-
-            vetoCalled1 = false
-            vetoCalled2 = false
-            oObj.removeVetoableChangeListener(aConstrainedProps(i), oVListener1)
-            PropertyTester.TestPropertyWithoutParams(aConstrainedProps(i), false)
-            bRmvVeto = bRmvVeto OR (NOT vetoCalled1 AND vetoCalled2)
-            Out.Log("removeVetoableChangeListener: " &amp; aConstrainedProps(i) &amp; " Listener1 must not be called: " &amp; NOT vetoCalled1)
-            Out.Log("removeVetoableChangeListener: " &amp; aConstrainedProps(i) &amp; " Listener2 must not be called: " &amp; NOT vetoCalled2)
-            oObj.removeVetoableChangeListener(aConstrainedProps(i), oVListener2)
-        next i
-    end if
-    Test.MethodTested("addVetoableChangeListener()", bAddVeto)
-    Test.MethodTested("removeVetoableChangeListener()", bRmvVeto)
-
-    Test.StartMethod("addPropertyChangeListener()")
-    Test.StartMethod("removePropertyChangeListener()")
-    Dim bAddProp As Boolean
-    Dim bRmvProp As Boolean
-    bRmvProp = true
-    bAddProp = true
-
-    if (nBoundCount = 0) then
-        Out.Log("No Bound properties!")
-        bAddProp = true
-        bRmvProp = true
-    else
-        for i = 0 to nBoundCount - 1
-            propCalled1 = false
-            propCalled2 = false
-            oObj.addPropertyChangeListener(aBoundProps(i), oPCListener1)
-            oObj.addPropertyChangeListener(aBoundProps(i), oPCListener2)
-            PropertyTester.TestPropertyWithoutParams(aBoundProps(i), false)
-            bAddProp = bAddProp OR (propCalled1 AND propCalled2)
-            Out.Log("addPropertyChangeListener: " &amp; aBoundProps(i) &amp; " Listener1 must be called :" &amp; propCalled1)
-            Out.Log("addPropertyChangeListener: " &amp; aBoundProps(i) &amp; " Listener2 must be called :" &amp; propCalled2)
-
-            propCalled1 = false
-            propCalled2 = false
-            oObj.removePropertyChangeListener(aBoundProps(i), oPCListener1)
-            PropertyTester.TestPropertyWithoutParams(aBoundProps(i), false)
-            bRmvProp = bRmvProp OR (NOT propCalled1 AND propCalled2)
-            Out.Log("removePropertyChangeListener: " &amp; aBoundProps(i) &amp; " Listener must not be called: " &amp; NOT propCalled)
-            oObj.removePropertyChangeListener(aBoundProps(i), oPCListener2)
-        next i
-    end if
-
-    Test.MethodTested("addPropertyChangeListener()", bAddProp)
-    Test.MethodTested("removePropertyChangeListener()", bRmvProp)
-
-    ReCreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function GetProps() As Boolean
-On Error Goto ErrHndl
-    Dim bOK as Boolean
-    Dim i As Integer
-    Dim attr As Variant
-    bOK = true
-
-    aAllProps = oObj.propertySetInfo.getProperties
-    nNormalCount = 0
-    nBoundCount = 0
-    nConstrainedCount = 0
-    nReadOnlyCount = 0
-
-    'first we should find out how many properties of different kinds exists
-    for i = lbound(aAllProps) to ubound(aAllProps)
-        attr = aAllProps(i).Attributes
-        if (attr AND READONLY) OR (attr AND BOUND) OR (attr AND CONSTRAINED) then
-            if (attr AND BOUND) then
-                nBoundCount = nBoundCount + 1
-            end if
-            if (attr AND CONSTRAINED) then
-                nConstrainedCount = nConstrainedCount + 1
-            end if
-            if (attr AND READONLY) then
-                nReadOnlyCount = nReadOnlyCount + 1
-            end if
-        else
-            if (NOT isNULL(oObj.getPropertyValue(aAllProps(i).Name))) then
-                nNormalCount = nNormalCount + 1
-            end if
-        end if
-    next i
-
-    Out.Log("" &amp; nNormalCount &amp; " Normal properties found")
-    Out.Log("" &amp; nBoundCount &amp; " Bound properties found")
-    Out.Log("" &amp; nConstrainedCount &amp; " Constrained properties found")
-    Out.Log("" &amp; nReadOnlyCount &amp; " ReadOnly properties found")
-
-    Dim AN(nNormalCount) As String
-    aNormalProps = AN()
-
-    Dim AB(nBoundCount) As String
-    aBoundProps = AB()
-
-    Dim AC(nConstrainedCount) As String
-    aConstrainedProps = AC()
-
-    Dim AR(nReadOnlyCount) As String
-    aReadOnlyProps = AR()
-
-   'Filling up arrays...
-
-    nNormalCount = 0
-    nBoundCount = 0
-    nConstrainedCount = 0
-    nReadOnlyCount = 0
-    for i = lbound(aAllProps) to ubound(aAllProps)
-        attr = aAllProps(i).Attributes
-        if (attr AND READONLY) OR (attr AND BOUND) OR (attr AND CONSTRAINED) then
-            if (attr AND BOUND) then
-                aBoundProps(nBoundCount) = aAllProps(i).Name
-                nBoundCount = nBoundCount + 1
-            end if
-            if (attr AND CONSTRAINED) then
-                aConstrainedProps(nConstrainedCount) = aAllProps(i).Name
-                nConstrainedCount = nConstrainedCount + 1
-            end if
-            if (attr AND READONLY) then
-                aReadOnlyProps(nReadOnlyCount) = aAllProps(i).Name
-                nReadOnlyCount = nReadOnlyCount + 1
-            end if
-        else
-            if (NOT isNULL(oObj.getPropertyValue(aAllProps(i).Name))) then
-                aNormalProps(nNormalCount) = aAllProps(i).Name
-                nNormalCount = nNormalCount + 1
-            end if
-        end if
-    next i
-
-    GetProps = bOK
-Exit Function
-ErrHndl:
-    Test.Exception()
-    resume next
-End Function
-
-Function test_GetPropertyValue() As Boolean
-On Error goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim i As Integer
-    Dim propName As String
-    Dim propVal As Variant
-    bOK = false
-
-    for i = lbound(aAllProps) to ubound(aAllProps)
-        propName = aAllProps(i).Name
-        propVal = oObj.getPropertyValue(propName)
-        bOK = true
-        if (isNULL(propVal)) AND NOT(aAllProps(i).Attributes AND MAYBENULL) then
-                Out.Log(cIfcShortName &amp; " " &amp; aAllProps(i).Name &amp; " is NULL, but it is not MAYBENULL")
-        end if
-    next i
-
-    test_GetPropertyValue() = bOK
-Exit Function
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Function
-
-Sub CB1_propertyChange
-    Out.Log("CallBack 'PropertyChange' for listener 1 was called.")
-    propCalled1 = true
-    CB1_propertyChange = true
-End Sub
-
-Sub CB1_vetoableChange
-    Out.Log("CallBack 'vetoableChange' for listener 1 was called.")
-    vetoCalled1 = true
-End Sub
-
-Sub CB2_propertyChange
-    Out.Log("CallBack 'PropertyChange' for listener 2 was called.")
-    propCalled2 = true
-    CB2_propertyChange = true
-End Sub
-
-Sub CB2_vetoableChange
-    Out.Log("CallBack 'vetoableChange' for listener 2 was called.")
-    vetoCalled2 = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertySet/script.xlb b/qadevOOo/tests/basic/ifc/beans/XPropertySet/script.xlb
deleted file mode 100644
index b5800efed317..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertySet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XPropertySet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XPropertySet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/beans_XPropertySetInfo.xba b/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/beans_XPropertySetInfo.xba
deleted file mode 100644
index 4907ef848c4b..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/beans_XPropertySetInfo.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XPropertySetInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XPropertySetInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aProperties As Variant
-    Dim vPropertie As Variant
-
-
-    Test.StartMethod("getProperties()")
-    bOK = true
-    aProperties = oObj.getProperties()
-    bOK = bOk AND not isNull(aProperties)
-    Test.MethodTested("getProperties()", bOK)
-
-    Test.StartMethod("getPropertyByName()")
-    bOK = true
-    vPropertie = oObj.getPropertyByName(aProperties(0).Name)
-    bOK = bOK AND NOT isNull(vPropertie)
-    Test.MethodTested("getPropertyByName()", bOK)
-
-    Test.StartMethod("hasPropertyByName()")
-    bOK = true
-    bOK = bOK AND oObj.hasPropertyByName(aProperties(0).Name)
-    Test.MethodTested("hasPropertyByName()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/script.xlb b/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/script.xlb
deleted file mode 100644
index 702547f945d2..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertySetInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XPropertySetInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XPropertySetInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertyState/beans_XPropertyState.xba b/qadevOOo/tests/basic/ifc/beans/XPropertyState/beans_XPropertyState.xba
deleted file mode 100644
index ef5b7d797864..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertyState/beans_XPropertyState.xba
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="beans_XPropertyState" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-Const BOUND = 2
-Const CONSTRAINED = 4
-Const MAYBENULL = 8
-Const READONLY = 16
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.beans.XPropertyState
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oProperties As Variant
-    Dim nAllProps As Integer
-    Dim aValue As Variant
-    Dim n As Integer
-    Dim oCoreRefl As Object
-    Dim bTypesEq As Boolean
-
-    bOK = true
-
-    oCoreRefl = createUnoService("com.sun.star.reflection.CoreReflection")
-
-    oProperties = oObj.GetPropertySetInfo().Properties
-    nAllProps = uBound(oProperties)
-    Dim AllPropsNames(nAllProps) As String
-    Out.Log("Found " &amp; nAllProps &amp; " properties.")
-
-    for n = 0 to (nAllProps)
-        AllPropsNames(n) = oProperties(n).Name
-    next n
-
-    Test.StartMethod("getPropertyStates()")
-    Out.Log("getting states for all properties.")
-    bOK = true
-
-    Dim aStates As Variant
-
-    aStates() = oObj.getPropertyStates(AllPropsNames())
-    bOK = bOK AND isArray(aStates())
-    if (bOK) then Out.Log("Length of returned array is " &amp; ubound(aStates()))
-    bOK = bOK AND ubound(aStates()) = nAllProps
-
-    Dim nState As Integer
-    nState = aStates(nAllProps / 2)
-    bOK = bOK AND (nState = com.sun.star.beans.PropertyState.DIRECT_VALUE OR _
-                   nState = com.sun.star.beans.PropertyState.DEFAULT_VALUE OR _
-                   nState = com.sun.star.beans.PropertyState.AMBIGUOUS_VALUE)
-    Test.MethodTested("getPropertyStates()", bOK)
-
-    Test.StartMethod("getPropertyState()")
-    bOK = false
-    n = 0
-
-    ' Here testing getPropertyState method. Method is OK when at least one
-    ' property works correctly.
-
-    while (bOK = false AND n &lt; nAllProps)
-        bOK = true
-        nState = oObj.getPropertyState(AllPropsNames(n))
-        bOK = bOK AND (nState = com.sun.star.beans.PropertyState.DIRECT_VALUE OR _
-                       nState = com.sun.star.beans.PropertyState.DEFAULT_VALUE OR _
-                       nState = com.sun.star.beans.PropertyState.AMBIGUOUS_VALUE)
-        n = n + 1
-    wend
-    Test.MethodTested("getPropertyState()", bOK)
-
-    Test.StartMethod("getPropertyDefault()")
-    bOK = false
-    n = 0
-
-    ' Here testing getPropertyDefault method. Method is OK when at least one
-    ' property works correctly.
-
-    while (bOK = false AND n &lt; nAllProps)
-        bOK = true
-        aValue = oObj.getPropertyDefault(AllPropsNames(n))
-        bOK = bOK AND (oProperties(n).Type.Name = oCoreRefl.getType(aValue).Name)
-        n = n + 1
-    wend
-    Test.MethodTested("getPropertyDefault()", bOK)
-
-    Test.StartMethod("setPropertyToDefault()")
-    bOK = false
-    n = 0
-
-    ' Here testing setPropertyToDefault method. Method is OK when at least one
-    ' property works correctly.
-
-    while (bOK = false AND n &lt; nAllProps)
-        bOK = true
-        oObj.setPropertyToDefault(AllPropsNames(n))
-        n = n + 1
-    wend
-    Test.MethodTested("setPropertyToDefault()", bOK)
-
-
-    ' Here testing getPropertyState for ALL properties. This will
-    ' put all exceptions to .log file (if this method doesn't work with some properties)
-    ' but without any affect to test status.
-
-    n = 0
-    while (n &lt; nAllProps)
-        bOK = true
-        nState = oObj.getPropertyState(AllPropsNames(n))
-        bOK = bOK AND (nState = com.sun.star.beans.PropertyState.DIRECT_VALUE OR _
-                       nState = com.sun.star.beans.PropertyState.DEFAULT_VALUE OR _
-                       nState = com.sun.star.beans.PropertyState.AMBIGUOUS_VALUE)
-
-        if (NOT bOK) then
-            Out.Log("Error while testing getPropertyState() for '" &amp; AllPropsNames(n) &amp; "' FAILED.")
-        else
-            Out.Log("getPropertyState() for property '" &amp; AllPropsNames(n) &amp; "' is OK")
-        end if
-
-        bOK = true
-        aValue = oObj.getPropertyDefault(AllPropsNames(n))
-        bTypesEq = false
-        if (bOK AND (TypeName(aValue) &lt;&gt; "Empty")) then
-            bTypesEq = (oProperties(n).Type.Name = oCoreRefl.getType(aValue).Name)
-        end if
-
-        if (NOT bOK) then ' exception was occurred
-            Out.Log("Error while testing getPropertyDefault() for '" &amp; AllPropsNames(n) &amp; "' FAILED.")
-        elseif ((TypeName(aValue) &lt;&gt; "Empty") AND (NOT bTypesEq)) then
-            Out.Log("Types: '" &amp; oProperties(n).Type.Name &amp; "' and '" &amp; oCoreRefl.getType(aValue).Name &amp; "' are different.")
-        else
-            Out.Log("getPropertyDefault() for property '" &amp; AllPropsNames(n) &amp; "' is OK")
-        end if
-        n = n + 1
-    wend
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/beans/XPropertyState/script.xlb b/qadevOOo/tests/basic/ifc/beans/XPropertyState/script.xlb
deleted file mode 100644
index 4a57254d9d4c..000000000000
--- a/qadevOOo/tests/basic/ifc/beans/XPropertyState/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="beans_XPropertyState" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="beans_XPropertyState"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XBridge/bridge_XBridge.xba b/qadevOOo/tests/basic/ifc/bridge/XBridge/bridge_XBridge.xba
deleted file mode 100644
index 5fa2afa34cdc..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XBridge/bridge_XBridge.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="bridge_XBridge" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global sBridgeName As String
-'      Global sConnectionString As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.bridge.XBridge
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sName As String
-    Dim sDscr As String
-    Dim oInstance As Object
-
-
-    Test.StartMethod("getInstance()")
-    bOK = true
-    oInstance = oObj.getInstance("StarOffice.ServiceManager")
-    bOK = bOK AND NOT isNULL(oInstance)
-    Test.MethodTested("getInstance()", bOK)
-
-    Test.StartMethod("getName()")
-    bOK = true
-    sName = oObj.getName()
-    Out.Log("Bridge's name is '" &amp; sName &amp; "', expected name is '" &amp; sBridgeName &amp; "'")
-    bOK = bOK AND sBridgeName = sName
-    Test.MethodTested("getName()", bOK)
-
-    Test.StartMethod("getDescription()")
-    bOK = true
-    sDscr = oObj.getDescription()
-    Out.Log("Description is '" &amp; sDscr &amp; "'")
-    bOK = bOK AND (inStr(sDscr, sConnectionString) &gt; 0)
-    Test.MethodTested("getDescription()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XBridge/script.xlb b/qadevOOo/tests/basic/ifc/bridge/XBridge/script.xlb
deleted file mode 100644
index 4d8c253b2e17..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XBridge/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="bridge_XBridge" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="bridge_XBridge"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/bridge_XBridgeFactory.xba b/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/bridge_XBridgeFactory.xba
deleted file mode 100644
index eae78d84178c..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/bridge_XBridgeFactory.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="bridge_XBridgeFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global sProtocol As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.bridge.XBridgeFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim connectionStr As String
-    Dim oConnector As Object, oAcceptor As Object
-    Dim xConnection As Object
-    Dim oBridge As Object
-    Dim aBridges As Variant, args(1) As Variant
-    oConnector = createUnoService("basichelper.Connector")
-    oAcceptor = createUnoService("com.sun.star.connection.Acceptor")
-
-    Dim iPos1 As Integer, iPos2 As Integer
-
-    iPos1 = inStr(1, CNCSTR, "socket")
-    iPos2 = inStr(iPos1, CNCSTR, "port=")
-
-    connectionStr = mid(CNCSTR, iPos1, iPos2 - iPos1 + 5) + "18888"
-
-    Out.Log("Connection string is '" + connectionStr + "'")
-
-    args(0) = createUnoService("com.sun.star.connection.Connector")
-    args(1) = connectionStr
-
-    ' When call initialize() method, a new thread is created and tries to
-    ' connect to Acceptor after some seconds.
-
-    oConnector.initialize(args())
-
-    xConnection = oAcceptor.accept(connectionStr)
-
-'    wait(5000)
-
-'    xConnection = oConnector.getByName("Connection")
-
-    if (isNull(xConnector)) then
-        Out.Log("Connection was not created !!!")
-    end if
-    Out.Log("State of connector: " + oConnector.getByName("State"))
-
-    Test.StartMethod("createBridge()")
-    bOK = true
-    oBridge = oObj.createBridge("NewBasicBridge", sProtocol, xConnection, NULL_OBJECT)
-    bOK = bOK AND hasUnoInterfaces(oBridge, "com.sun.star.bridge.XBridge")
-    Test.MethodTested("createBridge()", bOK)
-
-    Test.StartMethod("getBridge()")
-    bOK = true
-    oBridge = oObj.getBridge("NewBasicBridge")
-    bOK = bOK AND NOT isNull(oBridge) AND (oBridge.Name = "NewBasicBridge")
-    Test.MethodTested("getBridge()", bOK)
-
-    Test.StartMethod("getExistingBridges()")
-    bOK = true
-    aBridges = oObj.getExistingBridges()
-    bOK = bOK AND NOT isNull(aBridges) AND ubound(aBridges()) > -1
-    Test.MethodTested("getExistingBridges()", bOK)
-
-    Out.Log("Finally the bridge must be disposed ...")
-    xConnection.close()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/script.xlb b/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/script.xlb
deleted file mode 100644
index 554366c6a09d..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XBridgeFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="bridge_XBridgeFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="bridge_XBridgeFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/bridge_XUnoUrlResolver.xba b/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/bridge_XUnoUrlResolver.xba
deleted file mode 100644
index a70b1a78cad1..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/bridge_XUnoUrlResolver.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="bridge_XUnoUrlResolver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.bridge.XUnoUrlResolver
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ORegSrv As Object
-
-    Test.StartMethod("resolve()")
-    bOK = true
-    ORegSrv = oObj.resolve("uno:" &amp; CNCSTR &amp; ";urp;StarOffice.ServiceManager")
-    bOK = bOK AND NOT isNULL(ORegSrv)
-    Test.MethodTested("resolve()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/script.xlb b/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/script.xlb
deleted file mode 100644
index c24c330f546e..000000000000
--- a/qadevOOo/tests/basic/ifc/bridge/XUnoUrlResolver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="bridge_XUnoUrlResolver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="bridge_XUnoUrlResolver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/BarDiagram/chart_BarDiagram.xba b/qadevOOo/tests/basic/ifc/chart/BarDiagram/chart_BarDiagram.xba
deleted file mode 100644
index 794190a93d8a..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/BarDiagram/chart_BarDiagram.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_BarDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oBarDiagram As Object
-'       Global nGlobalBarDiagram As Long
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.BarDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oObject As Object
-    Dim i As Integer
-
-    ' Change an object to test here!
-    oObject = oObj
-    oObj = oBarDiagram
-
-    if isEmpty(oObj) then
-        Out.Log("Global oBarDiagram As Object is required for this test!")
-    end if
-
-    if oObj.supportsService("com.sun.star.chart.Dim3DDiagram") then
-        oObj.Dim3D = true
-    end if
-
-
-    PropertyTester.TestProperty("Vertical")
-
-    PropertyTester.TestProperty("Deep")
-
-    PropertyTester.TestProperty("StackedBarsConnected")
-
-    if oObj.supportsService("com.sun.star.chart.Dim3DDiagram") then
-         oObj.Dim3D = false
-    end if
-    oObj.Vertical = false
-
-
-    Dim aNumberOfLines(nGlobalBarDiagram) As Integer
-    for i = 0 to nGlobalBarDiagram
-        aNumberOfLines(i) = i
-    next i
-    PropertyTester.TestProperty("NumberOfLines",aNumberOfLines())
-
-    ' Change an object back!
-    oObj = oObject
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/BarDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/BarDiagram/script.xlb
deleted file mode 100644
index c98a69dade8c..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/BarDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_BarDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_BarDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/chart_Chart3DBarProperties.xba b/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/chart_Chart3DBarProperties.xba
deleted file mode 100644
index 12c151847372..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/chart_Chart3DBarProperties.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_Chart3DBarProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.Chart3DBarProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("SolidType")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/script.xlb b/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/script.xlb
deleted file mode 100644
index 097265920816..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Chart3DBarProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_Chart3DBarProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_Chart3DBarProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxis/chart_ChartAxis.xba b/qadevOOo/tests/basic/ifc/chart/ChartAxis/chart_ChartAxis.xba
deleted file mode 100644
index e95822265dc2..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxis/chart_ChartAxis.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartAxis" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartAxis
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    oObj.AutoMax = false
-    PropertyTester.TestProperty("Max")
-
-    oObj.AutoMin = false
-    Dim vMin(0 to 2) As Double
-    vMin(0) = oObj.Origin - 1
-    vMin(1) = oObj.Origin - 1.333
-    vMin(2) = oObj.AutoMin
-    PropertyTester.TestProperty("Min",vMin())
-
-    oObj.AutoOrigin = false
-    PropertyTester.TestProperty("Origin")
-
-    oObj.AutoStepMain = false
-    PropertyTester.TestProperty("StepMain")
-
-    oObj.AutoStepHelp = false
-    PropertyTester.TestProperty("StepHelp")
-
-    PropertyTester.TestProperty("AutoMax")
-
-    PropertyTester.TestProperty("AutoMin")
-
-    PropertyTester.TestProperty("AutoOrigin")
-
-    PropertyTester.TestProperty("AutoStepHelp")
-
-    PropertyTester.TestProperty("AutoStepMain")
-
-    PropertyTester.TestProperty("Logarithmic")
-
-    PropertyTester.TestProperty("DisplayLabels")
-
-    PropertyTester.TestProperty("TextRotation")
-
-    PropertyTester.TestProperty("Marks")
-
-    PropertyTester.TestProperty("HelpMarks")
-
-    PropertyTester.TestProperty("Overlap")
-
-    PropertyTester.TestProperty("GapWidth")
-
-    PropertyTester.TestProperty("ArrangeOrder")
-
-    PropertyTester.TestProperty("TextBreak")
-
-    PropertyTester.TestProperty("TextCanOverlap")
-
-    PropertyTester.TestProperty("NumberFormat")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxis/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartAxis/script.xlb
deleted file mode 100644
index 98571281ce05..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxis/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartAxis" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartAxis"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/chart_ChartAxisXSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/chart_ChartAxisXSupplier.xba
deleted file mode 100644
index 6ef3958aaaa2..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/chart_ChartAxisXSupplier.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartAxisXSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartAxisXSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("HasXAxis")
-
-    oObj.HasXAxis = true
-    PropertyTester.TestProperty("HasXAxisDescription")
-
-    PropertyTester.TestProperty("HasXAxisGrid")
-
-    PropertyTester.TestProperty("HasXAxisHelpGrid")
-
-    PropertyTester.TestProperty("HasXAxisTitle")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/script.xlb
deleted file mode 100644
index c56c3d43895b..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisXSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartAxisXSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartAxisXSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/chart_ChartAxisYSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/chart_ChartAxisYSupplier.xba
deleted file mode 100644
index 7c434f5a8102..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/chart_ChartAxisYSupplier.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartAxisYSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartAxisYSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("HasYAxis")
-
-    oObj.HasYAxis = true
-    PropertyTester.TestProperty("HasYAxisDescription")
-
-    PropertyTester.TestProperty("HasYAxisGrid")
-
-    PropertyTester.TestProperty("HasYAxisHelpGrid")
-
-    PropertyTester.TestProperty("HasYAxisTitle")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/script.xlb
deleted file mode 100644
index 19a8df66c70e..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisYSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartAxisYSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartAxisYSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/chart_ChartAxisZSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/chart_ChartAxisZSupplier.xba
deleted file mode 100644
index e8a190225631..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/chart_ChartAxisZSupplier.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartAxisZSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartAxisZSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("HasZAxis")
-
-    oObj.HasZAxis = true
-    PropertyTester.TestProperty("HasZAxisDescription")
-
-    PropertyTester.TestProperty("HasZAxisGrid")
-
-    PropertyTester.TestProperty("HasZAxisHelpGrid")
-
-    PropertyTester.TestProperty("HasZAxisTitle")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/script.xlb
deleted file mode 100644
index e178b40cd5df..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartAxisZSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartAxisZSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartAxisZSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/chart_ChartDataPointProperties.xba b/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/chart_ChartDataPointProperties.xba
deleted file mode 100644
index bd3c543023e3..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/chart_ChartDataPointProperties.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartDataPointProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartDataPointProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim aCaptions(4) As Integer
-    aCaptions(0) = com.sun.star.chart.ChartDataCaption.NONE
-    aCaptions(1) = com.sun.star.chart.ChartDataCaption.VALUE
-    aCaptions(2) = com.sun.star.chart.ChartDataCaption.PERCENT
-    aCaptions(3) = com.sun.star.chart.ChartDataCaption.TEXT
-    aCaptions(4) = com.sun.star.chart.ChartDataCaption.SYMBOL
-    PropertyTester.TestProperty("DataCaption", aCaptions())
-
-    PropertyTester.TestProperty("SymbolType")
-
-    Test.StartMethod("SymbolBitmapURL")
-    Dim sURL1 As String
-    Dim sURL2 As String
-    oObj.setPropertyValue("SymbolBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "crazy-blue.jpg")
-    sURL1 = oObj.getPropertyValue("SymbolBitmapURL")
-    oObj.setPropertyValue("SymbolBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "space-metal.jpg")
-    sURL2 = oObj.getPropertyValue("SymbolBitmapURL")
-    Test.MethodTested("SymbolBitmapURL", sURL1 &lt;&gt; sURL2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/script.xlb
deleted file mode 100644
index 461713249f6c..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDataPointProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartDataPointProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartDataPointProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/chart_ChartDataRowProperties.xba b/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/chart_ChartDataRowProperties.xba
deleted file mode 100644
index af8c2af6e53b..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/chart_ChartDataRowProperties.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartDataRowProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartDataRowProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Axis")
-
-    PropertyTester.TestProperty("DataRegressionProperties")
-
-    PropertyTester.TestProperty("DataErrorProperties")
-
-    PropertyTester.TestProperty("DataMeanValueProperties")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/script.xlb
deleted file mode 100644
index 21ddb4431bb9..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDataRowProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartDataRowProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartDataRowProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDocument/chart_ChartDocument.xba b/qadevOOo/tests/basic/ifc/chart/ChartDocument/chart_ChartDocument.xba
deleted file mode 100644
index 23db1de23d59..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDocument/chart_ChartDocument.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("HasMainTitle")
-
-    PropertyTester.TestProperty("HasSubTitle")
-
-    PropertyTester.TestProperty("HasLegend")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartDocument/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartDocument/script.xlb
deleted file mode 100644
index c49800c91fda..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartLegend/chart_ChartLegend.xba b/qadevOOo/tests/basic/ifc/chart/ChartLegend/chart_ChartLegend.xba
deleted file mode 100644
index 5c657f62e354..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartLegend/chart_ChartLegend.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartLegend" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartLegend
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Alignment")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartLegend/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartLegend/script.xlb
deleted file mode 100644
index 2ffdad5a3274..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartLegend/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartLegend" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartLegend"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartStatistics/chart_ChartStatistics.xba b/qadevOOo/tests/basic/ifc/chart/ChartStatistics/chart_ChartStatistics.xba
deleted file mode 100644
index 94f34978b537..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartStatistics/chart_ChartStatistics.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartStatistics" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartStatistics
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ConstantErrorLow")
-
-    PropertyTester.TestProperty("ConstantErrorHigh")
-
-    PropertyTester.TestProperty("MeanValue")
-
-    PropertyTester.TestProperty("ErrorCategory")
-
-    PropertyTester.TestProperty("PercentageError")
-
-    PropertyTester.TestProperty("ErrorMargin")
-
-    PropertyTester.TestProperty("ErrorIndicator")
-
-    PropertyTester.TestProperty("RegressionCurves")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartStatistics/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartStatistics/script.xlb
deleted file mode 100644
index 98806825e5ff..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartStatistics/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartStatistics" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartStatistics"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/chart_ChartTableAddressSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/chart_ChartTableAddressSupplier.xba
deleted file mode 100644
index 579ae05ad90a..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/chart_ChartTableAddressSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartTableAddressSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartTableAddressSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("CategoriesRangeAddress")
-
-    PropertyTester.TestProperty("SeriesAddresses")
-
-    PropertyTester.TestProperty("MainTitleAddress")
-
-    PropertyTester.TestProperty("SubTitleAddress")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/script.xlb
deleted file mode 100644
index 71adea8c2158..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTableAddressSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartTableAddressSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartTableAddressSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTitle/chart_ChartTitle.xba b/qadevOOo/tests/basic/ifc/chart/ChartTitle/chart_ChartTitle.xba
deleted file mode 100644
index 825fb3627b25..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTitle/chart_ChartTitle.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartTitle" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartTitle
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("TextRotation")
-
-    PropertyTester.TestProperty("String")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTitle/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartTitle/script.xlb
deleted file mode 100644
index 315635fecd24..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTitle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartTitle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartTitle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/chart_ChartTwoAxisXSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/chart_ChartTwoAxisXSupplier.xba
deleted file mode 100644
index b88a0c8a3947..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/chart_ChartTwoAxisXSupplier.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartTwoAxisXSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartTwoAxisXSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("HasSecondaryXAxis")
-
-    PropertyTester.TestProperty("HasSecondaryXAxisDescription")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/script.xlb
deleted file mode 100644
index 315e3105d221..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisXSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartTwoAxisXSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartTwoAxisXSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/chart_ChartTwoAxisYSupplier.xba b/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/chart_ChartTwoAxisYSupplier.xba
deleted file mode 100644
index ad632a404d0d..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/chart_ChartTwoAxisYSupplier.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_ChartTwoAxisYSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.ChartTwoAxisYSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("HasSecondaryYAxis")
-
-    PropertyTester.TestProperty("HasSecondaryYAxisDescription")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/script.xlb
deleted file mode 100644
index 3ff36ef423a8..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/ChartTwoAxisYSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_ChartTwoAxisYSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_ChartTwoAxisYSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/Diagram/chart_Diagram.xba b/qadevOOo/tests/basic/ifc/chart/Diagram/chart_Diagram.xba
deleted file mode 100644
index 1beb2480cfc2..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Diagram/chart_Diagram.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_Diagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.Diagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("DataRowSource")
-
-    Dim nDataCaption(0 to 4) As Long
-    nDataCaption(0) = 0
-    nDataCaption(1) = 1
-    nDataCaption(2) = 2
-    nDataCaption(3) = 4
-    'nDataCaption(4) = 8 deprecated
-    nDataCaption(4) = 16
-    PropertyTester.TestProperty("DataCaption",nDataCaption())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/Diagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/Diagram/script.xlb
deleted file mode 100644
index c7cc1e56dd64..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Diagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_Diagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_Diagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/chart_Dim3DDiagram.xba b/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/chart_Dim3DDiagram.xba
deleted file mode 100644
index 8fd613796a70..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/chart_Dim3DDiagram.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_Dim3DDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.Dim3DDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Dim3D")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/script.xlb
deleted file mode 100644
index d636a65edc73..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/Dim3DDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_Dim3DDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_Dim3DDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/LineDiagram/chart_LineDiagram.xba b/qadevOOo/tests/basic/ifc/chart/LineDiagram/chart_LineDiagram.xba
deleted file mode 100644
index 7de157b35aec..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/LineDiagram/chart_LineDiagram.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_LineDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     Global oLineDiagram As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.LineDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oObject As Object
-    ' Change an object to test here!
-    oObject = oObj
-    oObj = oLineDiagram
-
-    if isEmpty(oObj) then
-        Out.Log("Global oLineDiagram As Object is required for this test!")
-    End If
-
-    Dim nSymbolType(1) As Integer
-    nSymbolType(0) = com.sun.star.chart.ChartSymbolType.NONE
-    nSymbolType(1) = com.sun.star.chart.ChartSymbolType.AUTO
-    PropertyTester.TestProperty("SymbolType", nSymbolType())
-
-    oObj.SymbolType = com.sun.star.chart.ChartSymbolType.SYMBOL0
-    Dim newSize As new com.sun.star.awt.Size
-    newSize.Width = 300
-    newSize.Height = 300
-    PropertyTester.TestProperty("SymbolSize", Array(newSize))
-
-    Test.StartMethod("SymbolBitmapURL")
-    Dim sURL1 As String
-    Dim sURL2 As String
-    oObj.setPropertyValue("SymbolBitmapURL", utils.Path2URL(cTestDocsDir) + "crazy-blue.jpg")
-    sURL1 = oObj.getPropertyValue("SymbolBitmapURL")
-    oObj.setPropertyValue("SymbolBitmapURL", utils.Path2URL(cTestDocsDir) + "space-metal.jpg")
-    sURL2 = oObj.getPropertyValue("SymbolBitmapURL")
-    Test.MethodTested("SymbolBitmapURL", sURL1 &lt;&gt; sURL2)
-
-    PropertyTester.TestProperty("Lines")
-
-    Dim nSpline(1) As Long
-    nSpline(0) = 0
-    nSpline(1) = 2
-    PropertyTester.TestProperty("SplineType", nSpline())
-
-    PropertyTester.TestProperty("SplineOrder")
-
-    PropertyTester.TestProperty("SplineResolution")
-
-    ' Change an object back!
-    oObj = oObject
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/LineDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/LineDiagram/script.xlb
deleted file mode 100644
index 521f4f8d6088..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/LineDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_LineDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_LineDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/StackableDiagram/chart_StackableDiagram.xba b/qadevOOo/tests/basic/ifc/chart/StackableDiagram/chart_StackableDiagram.xba
deleted file mode 100644
index 469bdfba2131..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/StackableDiagram/chart_StackableDiagram.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_StackableDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global oStackDiagram As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.StackableDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oObject As Object
-    ' Change an object to test here!
-    oObject = oObj
-    oObj = oStackDiagram
-
-    if isEmpty(oObj) then
-        Out.Log("Global oStackDiagram As Object is required for this test!")
-    end if
-
-    PropertyTester.TestProperty("Percent")
-
-    PropertyTester.TestProperty("Stacked")
-
-    ' Change an object back!
-    oObj = oObject
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/StackableDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/StackableDiagram/script.xlb
deleted file mode 100644
index 8f18c62bc326..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/StackableDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_StackableDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_StackableDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/StockDiagram/chart_StockDiagram.xba b/qadevOOo/tests/basic/ifc/chart/StockDiagram/chart_StockDiagram.xba
deleted file mode 100644
index bafaa29d10cc..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/StockDiagram/chart_StockDiagram.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_StockDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oStockDiagram As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.chart.StockDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oObject As Object
-    ' Change an object to test here!
-    oObject = oObj
-    oObj = oStockDiagram
-
-    if isEmpty(oObj) then
-      Out.Log("Global oStockDiagram As Object is required for this test!")
-    end if
-
-    PropertyTester.TestProperty("Volume")
-
-    PropertyTester.TestProperty("UpDown")
-
-    ' Change an object back!
-    oObj = oObject
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/StockDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/StockDiagram/script.xlb
deleted file mode 100644
index a44cabf4ce14..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/StockDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_StockDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_StockDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/X3DDisplay/chart_X3DDisplay.xba b/qadevOOo/tests/basic/ifc/chart/X3DDisplay/chart_X3DDisplay.xba
deleted file mode 100644
index b75b8acc5751..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/X3DDisplay/chart_X3DDisplay.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_X3DDisplay" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.X3DDisplay
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getWall()")
-    bOK = NOT isNULL(oObj.getWall())
-    Test.MethodTested("getWall()", bOK)
-
-    Test.StartMethod("getFloor()")
-    bOK = NOT isNULL(oObj.getFloor())
-    Test.MethodTested("getFloor()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/X3DDisplay/script.xlb b/qadevOOo/tests/basic/ifc/chart/X3DDisplay/script.xlb
deleted file mode 100644
index 7eb194eab6c3..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/X3DDisplay/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_X3DDisplay" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_X3DDisplay"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/chart_XAxisXSupplier.xba b/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/chart_XAxisXSupplier.xba
deleted file mode 100644
index 906e5eecf2d8..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/chart_XAxisXSupplier.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XAxisXSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XAxisXSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getXAxisTitle()")
-    bOK = NOT isNULL(oObj.getXAxisTitle())
-    Test.MethodTested("getXAxisTitle()", bOK)
-
-    Test.StartMethod("getXAxis()")
-    bOK = NOT isNULL(oObj.getXAxis())
-    Test.MethodTested("getXAxis()", bOK)
-
-    Test.StartMethod("getXMainGrid()")
-    bOK = NOT isNULL(oObj.getXMainGrid())
-    Test.MethodTested("getXMainGrid()", bOK)
-
-    Test.StartMethod("getXHelpGrid()")
-    bOK = NOT isNULL(oObj.getXHelpGrid())
-    Test.MethodTested("getXHelpGrid()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/script.xlb
deleted file mode 100644
index 1916f3a2802b..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisXSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XAxisXSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XAxisXSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/chart_XAxisYSupplier.xba b/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/chart_XAxisYSupplier.xba
deleted file mode 100644
index 2d6fba33a104..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/chart_XAxisYSupplier.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XAxisYSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XAxisYSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getYAxisTitle()")
-    bOK = NOT isNULL(oObj.getYAxisTitle())
-    Test.MethodTested("getYAxisTitle()", bOK)
-
-    Test.StartMethod("getYAxis()")
-    bOK = NOT isNULL(oObj.getYAxis())
-    Test.MethodTested("getYAxis()", bOK)
-
-    Test.StartMethod("getYMainGrid()")
-    bOK = NOT isNULL(oObj.getYMainGrid())
-    Test.MethodTested("getYMainGrid()", bOK)
-
-    Test.StartMethod("getYHelpGrid()")
-    bOK = NOT isNULL(oObj.getYHelpGrid())
-    Test.MethodTested("getYHelpGrid()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/script.xlb
deleted file mode 100644
index 3fb6f9844872..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisYSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XAxisYSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XAxisYSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/chart_XAxisZSupplier.xba b/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/chart_XAxisZSupplier.xba
deleted file mode 100644
index dc2db677d1c6..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/chart_XAxisZSupplier.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XAxisZSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XAxisZSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getZAxisTitle()")
-    bOK = NOT isNULL(oObj.getZAxisTitle())
-    Test.MethodTested("getZAxisTitle()", bOK)
-
-    Test.StartMethod("getZAxis()")
-    bOK = NOT isNULL(oObj.getZAxis())
-    Test.MethodTested("getZAxis()", bOK)
-
-    Test.StartMethod("getZMainGrid()")
-    bOK = NOT isNULL(oObj.getZMainGrid())
-    Test.MethodTested("getZMainGrid()", bOK)
-
-    Test.StartMethod("getZHelpGrid()")
-    bOK = NOT isNULL(oObj.getZHelpGrid())
-    Test.MethodTested("getZHelpGrid()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/script.xlb
deleted file mode 100644
index e3ab9d5cc44e..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XAxisZSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XAxisZSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XAxisZSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartData/chart_XChartData.xba b/qadevOOo/tests/basic/ifc/chart/XChartData/chart_XChartData.xba
deleted file mode 100644
index 7d5f1b34d5f9..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartData/chart_XChartData.xba
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XChartData" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     Global oCellToChange As Object
-
-'*************************************************************************
-
-
-
-
-
-Dim nCB1Val as Integer, nCB2Val As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XChartData
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nNumber As Double
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-
-    nCB1Val = 0
-    nCB2Val = 0
-
-
-    Test.StartMethod("getNotANumber()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getNotANumber()) = 5)
-    Test.MethodTested("getNotANumber()", bOK)
-
-    Test.StartMethod("isNotANumber()")
-    bOK = true
-    nNumber = oObj.getNotANumber()
-    bOK = bOK AND oObj.IsNotANumber(nNumber)
-    bOK = bOK AND NOT oObj.IsNotANumber(nNumber + 1)
-    Test.MethodTested("isNotANumber()", bOK)
-
-    Out.Log("create listeners...")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.chart.XChartDataChangeEventListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.chart.XChartDataChangeEventListener")
-
-    'add listeners to object if initialized
-    if NOT(isNull(oListener1)) then
-        oObj.addChartDataChangeEventListener(oListener1)
-    end if
-    if NOT(isNull(oListener2)) then
-        oObj.addChartDataChangeEventListener(oListener2)
-    end if
-
-    Test.StartMethod("addChartDataChangeEventListener()")
-    bOK = true
-    oCellToChange.Value = 100
-    wait 2000
-    bOK = bOK AND ((nCB1Val = 1) AND (nCB2Val = 1))
-    Test.MethodTested("addChartDataChangeEventListener()", bOK)
-
-    Test.StartMethod("removeChartDataChangeEventListener()")
-    bOK = true
-    oObj.removeChartDataChangeEventListener(oListener2)
-    oCellToChange.Value = 10
-    wait 2000
-    bOK = bOK AND ((nCB1Val = 2 ) AND (nCB2Val = 1))
-    Test.MethodTested("removeChartDataChangeEventListener()", bOK)
-
-    Out.Log("Removing last listener.")
-    oObj.removeChartDataChangeEventListener(oListener1)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-' callback routine called chartDataChanged for listener1
-Sub CB1_chartDataChanged
-    Out.Log("CallBack for Listener 1 was called.")
-    nCB1Val = nCB1Val + 1
-End Sub
-
-' callback routine called chartDataChanged for listener2
-Sub CB2_chartDataChanged
-    Out.Log("CallBack for Listener 2 was called.")
-    nCB2Val = nCB2Val + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartData/script.xlb b/qadevOOo/tests/basic/ifc/chart/XChartData/script.xlb
deleted file mode 100644
index 317ed8da3725..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartData/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XChartData" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XChartData"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartDataArray/chart_XChartDataArray.xba b/qadevOOo/tests/basic/ifc/chart/XChartDataArray/chart_XChartDataArray.xba
deleted file mode 100644
index f0d0c705b4ec..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartDataArray/chart_XChartDataArray.xba
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XChartDataArray" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global nTableH As Integer
-'      Global nTableW As Integer
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XChartDataArray
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim i As Integer, j As Integer
-    Dim objRowDsc As Variant, objColDsc As Variant
-    Dim objEl As Variant, newEl As Variant
-    Dim chData As Variant
-    
-    Out.Log("Object is '" + cObjectName + "'")
-    if (cObjectName = "sw.SwXTextTable") then
-        Out.Log("Object is 'SwXTextTable'. First, remove labels.")
-        oObj.setPropertyValue("ChartRowAsLabel", false)
-        oObj.setPropertyValue("ChartColumnAsLabel", false)
-    end if
-
-    Test.StartMethod("getData()")
-    bOK = true
-
-    Dim oData As Object
-    oData = oObj.getData()
-    bOK = bOK AND NOT isNULL(oData)
-    Test.MethodTested("getData()", bOK)
-
-    Test.StartMethod("setData()")
-    bOK = true
-
-    Dim newData(nTableH - 1) As Variant
-    Dim a(nTableW - 1) As Double
-
-    for i = 0 to nTableH - 1
-        ReDim a(nTableW - 1) As Double
-        for j = 0 to nTableW - 1
-            a(j) = ((nTableW * 4) / (i + 2) + j * 2) + 16
-        next j
-        newData(i) = a()
-    next i
-
-    oObj.setData(newData())
-    chData = oObj.getData()
-
-    bOK = bOK AND ubound(oObj.getRowDescriptions()) = nTableH - 1
-    bOK = bOK AND ubound(oObj.getColumnDescriptions()) = nTableW - 1
-
-    for i = 0 to nTableH - 1
-        objEl = chData(i)
-        newEl = newData(i)
-        for j = 0 to nTableW - 1
-            bOK = bOK AND objEl(j) = newEl(j)
-        next j
-    next i
-
-    Test.MethodTested("setData()", bOK)
-
-    if (cObjectName = "sw.SwXTextTable") then
-        Out.Log("Object is 'SwXTextTable'. Initialize labels.")
-        oObj.setPropertyValue("ChartRowAsLabel", true)
-        oObj.setPropertyValue("ChartColumnAsLabel", true)
-    end if
-
-    Test.StartMethod("getRowDescriptions()")
-    bOK = true
-
-    Dim oRowDsc() As String
-    oRowDsc = oObj.getRowDescriptions()
-    bOK = bOK AND NOT isNULL(oRowDsc)
-    Test.MethodTested("getRowDescriptions()", bOK)
-
-    Test.StartMethod("setRowDescriptions()")
-    bOK = true
-
-    Dim newRowDsc(nTableH - 2) As String
-    for i = 0 to nTableH - 2 ' -1 for 0-index and -1 for columns labels
-        newRowDsc(i) = "RowDsc " + i
-    next i
-
-    oObj.setRowDescriptions(newRowDsc())
-
-    objRowDsc = oObj.getRowDescriptions()
-
-    for i = 0 to nTableH - 2
-        bOK = bOK AND newRowDsc(i) = objRowDsc(i)
-    next i
-
-    Test.MethodTested("setRowDescriptions()", bOK)
-
-    Test.StartMethod("getColumnDescriptions()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getColumnDescriptions())
-    Test.MethodTested("getColumnDescriptions()", bOK)
-
-    Test.StartMethod("setColumnDescriptions()")
-    bOK = true
-
-    Dim newColDsc(nTableW - 2) As String
-    for i = 0 to nTableW - 2
-        newColDsc(i) = "ColDsc " + i
-    next i
-
-    oObj.setColumnDescriptions(newColDsc())
-
-    objColDsc = oObj.getColumnDescriptions()
-
-    for i = 0 to nTableW - 2
-        bOK = bOK AND newColDsc(i) = objColDsc(i)
-    next i
-
-    if (cObjectName = "sw.SwXTextTable") then
-        Out.Log("Object is 'SwXTextTable'. Remove labels finally.")
-        oObj.setPropertyValue("ChartRowAsLabel", false)
-        oObj.setPropertyValue("ChartColumnAsLabel", false)
-    end if
-
-    Test.MethodTested("setColumnDescriptions()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartDataArray/script.xlb b/qadevOOo/tests/basic/ifc/chart/XChartDataArray/script.xlb
deleted file mode 100644
index 3c3b763d4073..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartDataArray/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XChartDataArray" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XChartDataArray"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartDocument/chart_XChartDocument.xba b/qadevOOo/tests/basic/ifc/chart/XChartDocument/chart_XChartDocument.xba
deleted file mode 100644
index a3db3fdd658f..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartDocument/chart_XChartDocument.xba
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XChartDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XChartDocument
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oGetArea As Object
-    Dim oGetData As Object
-    Dim oGetDiagram As Object, oNewDiagram As Object
-    Dim oGetLegend As Object
-    Dim oGetSubTitle As Object
-    Dim oGetTitle As Object
-    Dim oSetDiagram As Object
-    Dim oAttachData As Object
-    Dim oRange As Object
-    Dim oXChartData As Variant
-    Dim sColumn As Variant, sColumnNew As Variant
-    Dim vColumnNew As Variant, vColumn As Variant
-
-
-    Test.StartMethod("getArea()")
-    bOK = true
-    oGetArea = oObj.GetArea
-    bOK = bOK AND isNumeric(oGetArea.fillStyle)
-    Test.MethodTested("getArea()", bOK)
-
-    Test.StartMethod("getData()")
-    bOK = true
-    oGetData = oObj.getData()
-    bOK = bOK AND (oGetData.RowDescriptions(0) &gt; "")
-    Test.MethodTested("getData()", bOK)
-
-    Test.StartMethod("getDiagram()")
-    bOK = true
-    oGetDiagram = oObj.getDiagram
-    bOK = bOK AND isNumeric(oGetDiagram.constantErrorHigh)
-    Test.MethodTested("getDiagram()", bOK)
-
-    Test.StartMethod("getLegend()")
-    bOK = true
-    oGetLegend = oObj.getLegend
-    bOK = bOK AND isNumeric(oGetLegend.fillStyle)
-    Test.MethodTested("getLegend()", bOK)
-
-    Test.StartMethod("getSubTitle()")
-    bOK = true
-    oGetSubTitle = oObj.getSubTitle
-    bOK = bOK AND isNumeric(ogetSubTitle.fillStyle)
-    Test.MethodTested("getSubTitle()", bOK)
-
-    Test.StartMethod("getTitle()")
-    bOK = true
-    oGetTitle = oObj.getTitle()
-    bOK = bOK AND isNumeric(oGetTitle.fillStyle)
-    Test.MethodTested("getTitle()", bOK)
-
-    Test.StartMethod("setDiagram()")
-    bOK = true
-    'oGetDiagram = oObj.GetDiagram
-    oNewDiagram = oDoc.createInstance("com.sun.star.chart.PieDiagram")
-    oNewDiagram.DataCaption = oGetDiagram.DataCaption + 1
-    oObj.setDiagram(oNewDiagram)
-    oGetDiagram = oObj.GetDiagram
-    bOK = bOK AND oGetDiagram.DataCaption = oNewDiagram.DataCaption 
-    Test.MethodTested("setDiagram()", bOK)
-
-    Test.StartMethod("attachData()")
-    bOK = true
-    oXChartData = oObj.getData()
-    vColumn = oXChartData.ColumnDescriptions
-    sColumn = vColumn(0)
-    vColumnNew = vColumn
-    vColumnNew(0) = vColumnNew(0) + cIfcShortName
-    oXChartData.ColumnDescriptions = vColumnNew
-    oObj.attachData(oXChartData)
-    sColumnNew = oXChartData.ColumnDescriptions
-    bOK = bOK AND (sColumn &lt;&gt; vColumnNew(0))
-    Test.MethodTested("attachData()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XChartDocument/script.xlb b/qadevOOo/tests/basic/ifc/chart/XChartDocument/script.xlb
deleted file mode 100644
index e4b41cdaf2f0..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XChartDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XChartDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XChartDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XDiagram/chart_XDiagram.xba b/qadevOOo/tests/basic/ifc/chart/XDiagram/chart_XDiagram.xba
deleted file mode 100644
index 6b347b758637..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XDiagram/chart_XDiagram.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oGDPProp As Object
-    Dim oGDRProp As Object
-
-    Test.StartMethod("getDataPointProperties()")
-    bOK = true
-    oGDPProp = oObj.GetDataPointProperties(2,2)
-    bOK = bOK AND NOT (isNull(oGDPProp))
-    Test.MethodTested("getDataPointProperties()", bOK)
-
-    Test.StartMethod("getDataRowProperties()")
-    bOK = true
-    oGDRProp = oObj.GetDataRowProperties(2)
-    bOK = bOK AND NOT (isNull(oGDRProp))
-    Test.MethodTested("getDataRowProperties()", bOK)
-
-    Test.StartMethod("getDiagramType()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getDiagramType) = 8)
-    Test.MethodTested("getDiagramType()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XDiagram/script.xlb b/qadevOOo/tests/basic/ifc/chart/XDiagram/script.xlb
deleted file mode 100644
index e5304e270473..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/chart_XStatisticDisplay.xba b/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/chart_XStatisticDisplay.xba
deleted file mode 100644
index 76643f2cf520..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/chart_XStatisticDisplay.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XStatisticDisplay" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XStatisticDisplay
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oUpBar As Object
-    Dim oDownBar As Object
-    Dim oMMLine As Object
-
-    Test.StartMethod("getUpBar()")
-    bOK = true
-    oUpBar = oObj.getUpBar()
-    bOK = bOK AND NOT isNULL(oUpBar)
-    Test.MethodTested("getUpBar()", bOK)
-
-    Test.StartMethod("getDownBar()")
-    bOK = true
-    oDownBar = oObj.getDownBar()
-    bOK = bOK AND NOT isNULL(oDownBar)
-    Test.MethodTested("getDownBar()", bOK)
-
-    Test.StartMethod("getMinMaxLine()")
-    bOK = true
-    oMMLine = oObj.getMinMaxLine()
-    bOK = bOK AND NOT isNULL(oMMLine)
-    Test.MethodTested("getMinMaxLine()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/script.xlb b/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/script.xlb
deleted file mode 100644
index 641673941507..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XStatisticDisplay/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XStatisticDisplay" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XStatisticDisplay"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/chart_XTwoAxisXSupplier.xba b/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/chart_XTwoAxisXSupplier.xba
deleted file mode 100644
index ae0724232cff..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/chart_XTwoAxisXSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XTwoAxisXSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XTwoAxisXSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oAxis As Object
-
-    Test.StartMethod("getSecondaryXAxis()")
-    bOK = true
-    oAxis = oObj.getSecondaryXAxis()
-    bOK = bOK AND NOT isNULL(oAxis)
-    bOK = bOK AND hasUnoInterfaces(oAxis, "com.sun.star.beans.XPropertySet")                                                       
-    Test.MethodTested("getSecondaryXAxis()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/script.xlb
deleted file mode 100644
index 4360a5980282..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XTwoAxisXSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XTwoAxisXSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XTwoAxisXSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/chart_XTwoAxisYSupplier.xba b/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/chart_XTwoAxisYSupplier.xba
deleted file mode 100644
index 045fc963226d..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/chart_XTwoAxisYSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="chart_XTwoAxisYSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.chart.XTwoAxisYSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oAxis As Object
-
-    Test.StartMethod("getSecondaryYAxis()")
-    bOK = true
-    oAxis = oObj.getSecondaryYAxis()
-    bOK = bOK AND NOT isNULL(oAxis)
-    bOK = bOK AND hasUnoInterfaces(oAxis, "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getSecondaryYAxis()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/script.xlb b/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/script.xlb
deleted file mode 100644
index 2f9e1c0b9715..000000000000
--- a/qadevOOo/tests/basic/ifc/chart/XTwoAxisYSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="chart_XTwoAxisYSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="chart_XTwoAxisYSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/connection/XAcceptor/connection_XAcceptor.xba b/qadevOOo/tests/basic/ifc/connection/XAcceptor/connection_XAcceptor.xba
deleted file mode 100644
index 56c15e60858a..000000000000
--- a/qadevOOo/tests/basic/ifc/connection/XAcceptor/connection_XAcceptor.xba
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="connection_XAcceptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.connection.XAcceptor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oConnector As Object
-    Dim xConnection As Object
-    Dim sConnectionString As String
-    Dim args(1) As Variant
-
-    bOK = true
-
-    Test.startMethod("accept()")
-
-    oConnector = createUnoService("basichelper.Connector")
-
-    Dim iPos1 As Integer, iPos2 As Integer
-
-    iPos1 = inStr(1, CNCSTR, "socket")
-    iPos2 = inStr(iPos1, CNCSTR, "port=")
-
-    sConnectionString = mid(CNCSTR, iPos1, iPos2 - iPos1 + 5) &amp; "18888"
-
-    Out.Log("Connection string is '" &amp; sConnectionString &amp; "'")
-
-    args(0) = createUnoService("com.sun.star.connection.Connector")
-    args(1) = sConnectionString
-
-    ' When call initialize() method, a new thread is created and tries to
-    ' connect to Acceptor after some seconds.
-
-    oConnector.initialize(args())
-
-    ' Starting acception.
-    xConnection = oObj.accept(sConnectionString)
-    wait(500) 'Just to be sure that component had a chance to change it's state.
-
-    bOK = bOK AND hasUNOInterfaces(xConnection, "com.sun.star.connection.XConnection")
-    Out.Log("Connector's state is '" &amp; oConnector.getByName("State") &amp; "'")
-    bOK = bOK AND oConnector.getByName("State") = "connected" ' This means that connection was established.
-
-    if (bOK) then
-        Out.Log("Connection established! Trying to get data from stream.")
-
-        Dim aStr As String
-        Dim aByte As Integer
-        Dim readData() As Variant
-        aStr = ""
-        aByte = 1
-        while (aByte &lt;&gt; 0)
-            ReDim readData() As Variant
-            xConnection.read(readData, 1)
-            aByte = readData(0)
-            if (aByte &lt;&gt; 0) then
-                    aStr = aStr &amp; chr(aByte)
-            end if
-        wend
-
-        Out.Log("Returned data from stream is " &amp; aStr)
-        bOK = bOK AND aStr = sConnectionString
-    end if
-
-    Test.MethodTested("accept()", bOK)
-
-    Test.startMethod("stopAccepting()")
-    bOK = true
-    ' Now stopping acception and trying to connect again
-    ' (we can do this, if connection string is the same.)
-    oObj.stopAccepting()
-
-    Out.Log("Trying to connect after stopping accepting...")
-    oConnector.initialize(args())
-    Out.Log("Connector's state is '" &amp; oConnector.getByName("State") &amp; "'")
-
-    ' Now oConnector shouldn't connect. So, check it's state
-    ' after few seconds (= Connection's Timeout + 3 sec)
-    wait(3000 + oConnector.getByName("Timeout"))
-    Out.Log("Connector's state is '" &amp; oConnector.getByName("State") &amp; "'")
-    bOK = bOK AND oConnector.getByName("State") = "NoConnectException"
-
-    Test.MethodTested("stopAccepting()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/connection/XAcceptor/script.xlb b/qadevOOo/tests/basic/ifc/connection/XAcceptor/script.xlb
deleted file mode 100644
index 3162d8a46614..000000000000
--- a/qadevOOo/tests/basic/ifc/connection/XAcceptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="connection_XAcceptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="connection_XAcceptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/connection/XConnector/connection_XConnector.xba b/qadevOOo/tests/basic/ifc/connection/XConnector/connection_XConnector.xba
deleted file mode 100644
index 08d413dbcffa..000000000000
--- a/qadevOOo/tests/basic/ifc/connection/XConnector/connection_XConnector.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="connection_XConnector" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.connection.XConnector
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim xConn As Object
-    Dim sConnStr As String
-
-
-    Test.StartMethod("connect()")
-    bOK = true
-
-    sConnStr = mid(CNCSTR, inStr(CNCSTR, "socket"))
-    Out.Log("Trying to connect with '" &amp; sConnStr &amp; "'")
-    xConn = oObj.connect(sConnStr)
-    bOK = bOK AND hasUNOInterfaces(xConn, "com.sun.star.connection.XConnection")
-    if (bOK) then
-        Out.Log("Connected! Connection description: " &amp; xConn.getDescription())
-        Out.Log("Closing connection...")
-        xConn.close()
-    end if
-    Test.MethodTested("connect()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/connection/XConnector/script.xlb b/qadevOOo/tests/basic/ifc/connection/XConnector/script.xlb
deleted file mode 100644
index c4424716f1cc..000000000000
--- a/qadevOOo/tests/basic/ifc/connection/XConnector/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="connection_XConnector" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="connection_XConnector"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XChild/container_XChild.xba b/qadevOOo/tests/basic/ifc/container/XChild/container_XChild.xba
deleted file mode 100644
index 99c689d1074d..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XChild/container_XChild.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XChild" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the followingobject relations
-' variables, which must be specified in the object creation:
-
-'      ObjectRelation: oObjRelation(0).Name = "cannotSwitchParent"
-'      ObjectRelation: oObjRelation(0).Value = "configmgr: BasicElement::setParent: cannot move Entry"
-
-'*************************************************************************
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XChild
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oXInterface As Object
-    Dim vRaises As Variant
-
-    Test.StartMethod("getParent()")
-    bOK = isObject(oObj.getParent())
-    Test.MethodTested("getParent()", bOK)
-
-    Test.StartMethod("setParent()")
-    bOK = true
-    Dim cObjRelation as Variant
-    cObjRelation = utils.getObjectRelation("cannotSwitchParent")
-    if isNull(cObjRelation) then
-        oXInterface = oObj.getParent()
-        vRaises = oObj.setParent(oXInterface)
-        bOK = bOK AND isEmpty(vRaises)
-    else
-        out.Log(cObjRelation)
-    end if
-    Test.MethodTested("setParent()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XChild/script.xlb b/qadevOOo/tests/basic/ifc/container/XChild/script.xlb
deleted file mode 100644
index c2d2f44eccf7..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XChild/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XChild" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XChild"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XContainer/container_XContainer.xba b/qadevOOo/tests/basic/ifc/container/XContainer/container_XContainer.xba
deleted file mode 100644
index 2dd3e397d408..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XContainer/container_XContainer.xba
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oElementToInsert As Object
-'      Global oContainer As Object in case if the component tested does 
-'                                  not support XNameContainer
-
-'*************************************************************************
-
-Dim ElIns1 As Integer
-Dim ElIns2 As Integer
-Dim ElRem1 As Integer
-Dim ElRem2 As Integer
-Dim ElRep1 As Integer
-Dim ElRep2 As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1 as Object
-    Dim oListener2 as Object
-    
-    oListener1 = createUNOListener("CB1_", "com.sun.star.container.XContainerListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.container.XContainerListener")
-    bOK = NOT isNULL(oListener1) AND NOT isNULL(oListener2)
-    Out.Log("Listeners creation : " + bOK)
-
-    Test.StartMethod("addContainerListener()")
-    bOK = true
-    oObj.addContainerListener(oListener1)
-    Out.Log("Listener1 was added")
-    oObj.addContainerListener(oListener2)
-    Out.Log("Listener2 was added")
-
-    insertElement()
-    
-    Dim bInsOK As Boolean
-    bInsOK = ElIns1 >= 1 AND ElIns2 >= 1
-    Out.Log("... " + bInsOK)
-    bOK = bOK AND bInsOK
-    
-    removeElement()
-    
-    bRemOK = ElRem1 >= 1 AND ElRem2 >= 1
-    Out.Log("... " + bRemOK)
-    bOK = bOK AND bRemOK
-    
-    Dim bNothingToReplace as Boolean
-    bNothingToReplace = replaceElement()
-    
-    bRepOK = (ElRep1 >= 1 AND ElRep2 >= 1) OR bNothingToReplace
-    Out.Log("... " + bRepOK)
-    bOK = bOK AND bRepOK
-
-    Test.MethodTested("addContainerListener()", bOK)
-
-
-    Test.StartMethod("removeContainerListener()")
-    bOK = true
-    oObj.removeContainerListener(oListener1)
-    Out.Log("Listener1 was removed")
-
-    insertElement()
-    
-    bInsOK = ElIns1 = 0 AND ElIns2 >= 1
-    Out.Log("... " + bInsOK)
-    bOK = bOK AND bInsOK
-
-    removeElement()
-    
-    bRemOK = ElRem1 = 0 AND ElRem2 >= 1
-    Out.Log("... " + bRemOK)
-    bOK = bOK AND bRemOK
-
-    bNothingToReplace = replaceElement()
-        
-    bRepOK = (ElRep1 = 0 AND ElRep2 >= 1) or bNothingToReplace 
-    Out.Log("... " + bRepOK)
-    bOK = bOK AND bRepOK
-    Test.MethodTested("removeContainerListener()", bOK)
-
-    oObj.removeContainerListener(oListener2)
-    Out.Log("Listener2 was removed")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub insertElement()
-    Out.Log("Inserting element ... ")
-    ResetCounters()
-    if hasUnoInterfaces(oObj, "com.sun.star.container.XNameContainer") then
-        oObj.InsertByName(cIfcShortName, oElementToInsert)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.container.XNameContainer") then
-        oContainer.InsertByName(cIfcShortName, oElementToInsert)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.awt.XControlContainer") then
-        oContainer.addControl("NewControl", oElementToInsert)
-    else
-        Out.LOG("There is nothig to trigger the Listener!")
-    end if
-end Sub
-
-
-Sub removeElement()
-    Out.Log("Removing element ... ")
-    ResetCounters()
-    if hasUnoInterfaces(oObj, "com.sun.star.container.XNameContainer") then
-        oObj.RemoveByName(cIfcShortName)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.container.XNameContainer") then
-        oContainer.RemoveByName(cIfcShortName)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.awt.XControlContainer") then
-        oContainer.removeControl(oElementToInsert)
-    end if
-end Sub
-
-Function replaceElement() as Boolean
-    Out.Log("Replacing element ... ")
-    ResetCounters()
-    Dim bNothingToReplace as Boolean
-    bNothingToReplace = FALSE
-    Dim old As Variant
-    if hasUnoInterfaces(oObj, "com.sun.star.container.XIndexReplace") then
-        old = oObj.getByIndex(0)
-        oObj.ReplaceByIndex(0, oElementToInsert)
-        oObj.ReplaceByIndex(0, old)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.container.XIndexReplace") then
-        old = oContainer.getByIndex(0)
-        oContainer.ReplaceByIndex(0, oElementToInsert)
-        oContainer.ReplaceByIndex(0, old)
-    elseif (hasUnoInterfaces(oContainer, "com.sun.star.container.XNameAccess") and _
-            hasUnoInterfaces(oContainer, "com.sun.star.container.XNameReplace")) then
-        Dim cNames() as String
-        cNames = oObj.getElementNames()
-        old = oContainer.getByName(cNames(0))
-        oContainer.ReplaceByName(cNames(0), oElementToInsert)
-        oContainer.ReplaceByName(cNames(0), old)
-    elseif hasUnoInterfaces(oContainer, "com.sun.star.awt.XControlContainer") then
-        bNothingToReplace = TRUE
-    else
-        Out.LOG("There is nothig to trigger the Listener!")
-    end if
-    replaceElement() = bNothingToReplace
-end Function
-
-Sub CB1_elementInserted(ev As Object)
-    Out.Log("CB1 called: element was inserted")
-    ElIns1 = ElIns1 + 1
-End Sub
-
-Sub CB1_elementRemoved(ev As Object)
-    Out.Log("CB1 called: element was removed")
-    ElRem1 = ElRem1 + 1
-End Sub
-
-Sub CB1_elementReplaced(ev As Object)
-    Out.Log("CB1 called: element was replaced")
-    ElRep1 = ElRep1 + 1
-End Sub
-
-Sub CB2_elementInserted(ev As Object)
-    Out.Log("CB2 called: element was inserted")
-    ElIns2 = ElIns2 + 1
-End Sub
-
-Sub CB2_elementRemoved(ev As Object)
-    Out.Log("CB2 called: element was removed")
-    ElRem2 = ElRem2 + 1
-End Sub
-
-Sub CB2_elementReplaced(ev As Object)
-    Out.Log("CB2 called: element was replaced")
-    ElRep2 = ElRep2 + 1
-End Sub
-
-Sub ResetCounters()
-    ElIns1 = 0
-    ElIns2 = 0
-    ElRem1 = 0
-    ElRem2 = 0
-    ElRep1 = 0
-    ElRep2 = 0
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XContainer/script.xlb b/qadevOOo/tests/basic/ifc/container/XContainer/script.xlb
deleted file mode 100644
index 91f039fed92a..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/container_XContentEnumerationAccess.xba b/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/container_XContentEnumerationAccess.xba
deleted file mode 100644
index 42c81cc2f676..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/container_XContentEnumerationAccess.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XContentEnumerationAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XContentEnumerationAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getAvailableServiceNames()")
-    bOK = true
-    aNames = oObj.getAvailableServiceNames()
-    bOK = bOK AND NOT isNULL(aNames)
-    Test.MethodTested("getAvailableServiceNames()", bOK)
-
-    Test.StartMethod("createContentEnumeration()")
-    bOK = true
-    oEnum = oObj.createContentEnumeration(aNames(0))
-    bOK = bOK AND hasUnoInterfaces(oEnum, "com.sun.star.container.XEnumeration")
-    Test.MethodTested("createContentEnumeration()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/script.xlb
deleted file mode 100644
index 05077a300f27..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XContentEnumerationAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XContentEnumerationAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XContentEnumerationAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XElementAccess/container_XElementAccess.xba b/qadevOOo/tests/basic/ifc/container/XElementAccess/container_XElementAccess.xba
deleted file mode 100644
index 6a8aa0348ba4..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XElementAccess/container_XElementAccess.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XElementAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XElementAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oType As Object
-
-    Test.StartMethod("hasElements()")
-    bOK = oObj.hasElements()
-    Test.MethodTested("hasElements()", bOK)
-
-    Test.StartMethod("getElementType()")
-    bOK = true
-    oType = oObj.getElementType()
-    Out.Log("Element type is " &amp; oType.Name)
-    Test.MethodTested("getElementType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XElementAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XElementAccess/script.xlb
deleted file mode 100644
index 3460dde77388..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XElementAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XElementAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XElementAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XEnumeration/container_XEnumeration.xba b/qadevOOo/tests/basic/ifc/container/XEnumeration/container_XEnumeration.xba
deleted file mode 100644
index 3f826f988d54..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XEnumeration/container_XEnumeration.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XEnumeration
-'*************************************************************************
-On Error goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("hasMoreElements()")
-    bOK = oObj.hasMoreElements()
-    Test.MethodTested("hasMoreElements()", bOK)
-
-    Test.StartMethod("nextElement()")
-    bOK = NOT isNULL (oObj.nextElement())
-    Test.MethodTested("nextElement()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XEnumeration/script.xlb b/qadevOOo/tests/basic/ifc/container/XEnumeration/script.xlb
deleted file mode 100644
index bca9e4edf129..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/container_XEnumerationAccess.xba b/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/container_XEnumerationAccess.xba
deleted file mode 100644
index 91762f537688..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/container_XEnumerationAccess.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XEnumerationAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XEnumerationAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oEnum As Object
-    Dim bOK As Boolean
-
-    Test.StartMethod("createEnumeration()")
-    bOK = true
-    oEnum = oObj.createEnumeration()
-    bOK = bOK AND (NOT isNull(oEnum))
-    bOK = bOK AND hasUnoInterfaces(oEnum, "com.sun.star.container.XEnumeration")
-    Test.MethodTested("createEnumeration()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/script.xlb
deleted file mode 100644
index 5c72301ebb22..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XEnumerationAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XEnumerationAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XEnumerationAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XHierarchicalName/container_XHierarchicalName.xba b/qadevOOo/tests/basic/ifc/container/XHierarchicalName/container_XHierarchicalName.xba
deleted file mode 100644
index 8170e8a97de7..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XHierarchicalName/container_XHierarchicalName.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XHierarchicalName" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' This Interface/Service test depends on the followingobject relations
-' variables, which must be specified in the object creation:
-
-'      ObjectRelation: oObjRelation(0).Name = "ElementName"
-'      ObjectRelation: oObjRelation(0).Value = "MyAccessibleElementName"
-'      ObjectRelation: oObjRelation(1).Name = "HierarchicalName"
-'      ObjectRelation: oObjRelation(1).Value = "MyHierachicalName"
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XHierarchicalName
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cElemName as Variant
-    cElemName = utils.getObjectRelation("ElementName")
-    if isNull(cElemName) then
-        out.log("Could not get relation 'ElenemtName' -> FALSE")
-    end if
-
-    Dim cExpName as Variant
-    cExpName = utils.getObjectRelation("HierarchicalName")
-    if isNull(cExpName) then
-        out.log("Could not get relation 'HierarchicalName' -> FALSE")
-    end if
-
-    Test.StartMethod("getHierarchicalName()")
-    bOK = TRUE
-    Dim cHName as String 
-    cHName = oObj.getHierarchicalName()
-    Dim result as String
-    result = instr(cHName, cExpName)
-    if len(result) = 0 then
-        olt.log("Getting: " + cHName + " but expected it to start with " + _
-                cExpName)
-        bOK = FALSE
-    end if
-    Test.MethodTested("getHierarchicalName()", bOK)
-
-    Test.StartMethod("composeHierarchicalName()")
-    bOK = TRUE
-    Dim  gettedName as String
-    gettedName = oObj.composeHierarchicalName(cElemName)
-    result = instr(gettedName, cElemName)
-    if len(result) = 0 then
-        olt.log("Getting: " + gettedName + " but expected it to start with " + _
-                cElemetName)
-        bOK = FALSE
-    end if
-    Test.MethodTested("composeHierarchicalName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XHierarchicalName/script.xlb b/qadevOOo/tests/basic/ifc/container/XHierarchicalName/script.xlb
deleted file mode 100644
index e9f49c898c1c..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XHierarchicalName/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XHierarchicalName" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="container_XHierarchicalName"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/container_XHierarchicalNameAccess.xba b/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/container_XHierarchicalNameAccess.xba
deleted file mode 100644
index 841c4481e19c..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/container_XHierarchicalNameAccess.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XHierarchicalNameAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' This Interface/Service test depends on the following object relations
-' variables, which must be specified in the object creation:
-
-'      ObjectRelation: oObjRelation(0).Name = "ElementName"
-'      ObjectRelation: oObjRelation(0).Value = "MyAccessibleElementName"
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XHierarchicalNameAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cObjRelation as Variant
-    cObjRelation = utils.getObjectRelation("ElementName")
-    if isNull(cObjRelation) then
-        cObjRelation = cIfcLongName
-    end if
-    
-    Test.StartMethod("getByHierarchicalName()")
-    bOK = true
-    Dim oRet as Variant
-    oRet = oObj.getByHierarchicalName(cObjRelation)
-    if TypeName(oRet) = "String" then
-        out.log("oRet = " + oRet)
-        bOK = bOK and (oRet = cObjRelation) 
-    else
-        bOK = bOK AND oRet.Name = cObjRelation
-    end if
-    Test.MethodTested("getByHierarchicalName()", bOK)
-
-    Test.StartMethod("hasByHierarchicalName()")
-    bOK = true
-    bOK = bOK AND oObj.hasByHierarchicalName(cObjRelation)
-    bOK = bOK AND NOT oObj.hasByHierarchicalName(cObjRelation + "ThisIsAnInvalidName")
-    Test.MethodTested("hasByHierarchicalName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/script.xlb
deleted file mode 100644
index 26b107612f8b..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XHierarchicalNameAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XHierarchicalNameAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XHierarchicalNameAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexAccess/container_XIndexAccess.xba b/qadevOOo/tests/basic/ifc/container/XIndexAccess/container_XIndexAccess.xba
deleted file mode 100644
index 77ce846ea255..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexAccess/container_XIndexAccess.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XIndexAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XIndexAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim nCount As Integer
-    Dim bOK As Boolean
-
-    Test.StartMethod("getCount()")
-    bOK = true
-    nCount = oObj.Count
-    bOK = bOK AND nCount
-    Test.MethodTested("getCount()", bOK)
-
-    Test.StartMethod("getByIndex()")
-    bOK = true
-    if (nCount) then
-        bOK = bOK AND NOT isNull(oObj.getByIndex(nCount - 1))
-        Test.MethodTested("getByIndex()", bOK)
-    else
-        Out.Log("No elements")
-    end if
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XIndexAccess/script.xlb
deleted file mode 100644
index a27bd13b282e..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XIndexAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XIndexAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexContainer/container_XIndexContainer.xba b/qadevOOo/tests/basic/ifc/container/XIndexContainer/container_XIndexContainer.xba
deleted file mode 100644
index c35d5f4ffd3e..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexContainer/container_XIndexContainer.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XIndexContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oInstance As Object for InsertByName
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XIndexContainer
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim nCount As Integer
-
-    nCount = oObj.count
-
-    Test.StartMethod("insertByIndex()")
-    bOK = true
-    oObj.insertByIndex(nCount, oInstance)
-    bOK = bOK AND (oObj.count &gt; nCount)
-    Test.MethodTested("insertByIndex()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(nCount)
-    bOK = bOK AND (oObj.Count = nCount)
-    Test.MethodTested("removeByIndex()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexContainer/script.xlb b/qadevOOo/tests/basic/ifc/container/XIndexContainer/script.xlb
deleted file mode 100644
index 085014bd065a..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XIndexContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XIndexContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexReplace/container_XIndexReplace.xba b/qadevOOo/tests/basic/ifc/container/XIndexReplace/container_XIndexReplace.xba
deleted file mode 100644
index c7d0cdee17ee..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexReplace/container_XIndexReplace.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XIndexReplace" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      the Test-Object must contain two diffrent named Objects
-'   Global oIdxReplaceInstance as Object
-
-'*************************************************************************
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XIndexReplace
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim nCount As Integer
-    Dim oOld As Object
-    Dim oNew As Object
-
-    Test.StartMethod("replaceByIndex()")
-    bOK = true
-
-    nCount = oObj.count
-    Out.Log("There are " &amp; nCount &amp; " objects")
-    oOld = oObj.getByIndex(nCount - 1)
-
-    oObj.replaceByIndex(nCount - 1, oIdxReplaceInstance)
-    oNew = oObj.getByIndex(nCount - 1)
-    bOK = bOK AND (oOld.Name &lt;&gt; oNew.Name)
-
-    Test.MethodTested("replaceByIndex()", bOK)
-
-    Out.Log("replace old Object.")
-    oObj.replaceByIndex(nCount - 1, oOld)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XIndexReplace/script.xlb b/qadevOOo/tests/basic/ifc/container/XIndexReplace/script.xlb
deleted file mode 100644
index 568e937677d5..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XIndexReplace/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XIndexReplace" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XIndexReplace"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameAccess/container_XNameAccess.xba b/qadevOOo/tests/basic/ifc/container/XNameAccess/container_XNameAccess.xba
deleted file mode 100644
index 3bee5352a307..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameAccess/container_XNameAccess.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XNameAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XNameAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim aElementNames() As Variant
-    Dim bOK As Boolean
-    Dim oElem As Variant
-    Dim cName As String
-
-    Test.StartMethod("getElementNames()")
-    bOK = true
-    aElementnames() = oObj.getElementNames()
-    if hasUnoInterfaces(oObj, "com.sun.star.container.XIndexAccess") then
-        bOK = bOK AND (uBound(aElementnames()) = oObj.count - 1)
-    else
-        bOK = bOK AND (uBound(aElementnames()) &gt; -1)
-    end if
-    Test.MethodTested("getElementNames()", bOK)
-
-    Test.StartMethod("getByName()")
-    bOK = true
-    oElem = oObj.getByName(aElementNames(0))
-    bOK = bOK AND NOT isNull(oElem)
-    Test.MethodTested("getByName()", bOK)
-
-    Test.StartMethod("hasByName()")
-    bOK = true
-    cName = aElementNames(uBound(aElementNames()))
-    bOK = bOK AND oObj.hasByName(cName)
-    Test.MethodTested("hasByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameAccess/script.xlb b/qadevOOo/tests/basic/ifc/container/XNameAccess/script.xlb
deleted file mode 100644
index df0fdb783771..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XNameAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XNameAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameContainer/container_XNameContainer.xba b/qadevOOo/tests/basic/ifc/container/XNameContainer/container_XNameContainer.xba
deleted file mode 100644
index 9250232df7ad..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameContainer/container_XNameContainer.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XNameContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global oInstance As Object instance to insert
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XNameContainer
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    Test.StartMethod("insertByName()")
-    bOK = true
-    oObj.insertByName(cIfcShortName, oInstance)
-    bOK = bOK AND oObj.hasByName(cIfcShortName)
-    Test.MethodTested("insertByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName(cIfcShortName)
-    bOK = bOK AND NOT oObj.hasByName(cIfcShortName)
-    Test.MethodTested("removeByName()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameContainer/script.xlb b/qadevOOo/tests/basic/ifc/container/XNameContainer/script.xlb
deleted file mode 100644
index 69c98b8f0573..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XNameContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XNameContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameReplace/container_XNameReplace.xba b/qadevOOo/tests/basic/ifc/container/XNameReplace/container_XNameReplace.xba
deleted file mode 100644
index ca0c7086d9a2..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameReplace/container_XNameReplace.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XNameReplace" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global cNameToReplace As String 'name of instance to be replased
-'      Global oReplaceInstance As Variant 'instance, that will be inserted
-'      instead old one
-
-'*************************************************************************
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XNameReplace
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oOldObject As Object
-    Dim cOldObjName As String
-    Dim oNewControl As Object
-    Dim cNewObjName As String        
-    Dim NewAddress As Object
-    Dim InstAddress As Object
-    Dim cReplInstName As String
-
-    Test.StartMethod("replaceByName()")
-    bOK = true
-
-    if (cObjectName = "sc.ScCellRangesObj") then
-        oOldObject = oObj.getByName(cNameToReplace)
-        InstAddress = oReplaceInstance.getRangeAddress
-
-        oObj.replaceByName(cNameToReplace, oReplaceInstance)
-
-        oNewControl = oObj.getByName(cNameToReplace)
-        NewAddress = oNewControl.getRangeAddress
-
-        bOK = bOK AND NewAddress.Sheet = InstAddress.Sheet
-        bOK = bOK AND NewAddress.StartColumn = InstAddress.StartColumn
-        bOK = bOK AND NewAddress.EndColumn = InstAddress.EndColumn
-        bOK = bOK AND NewAddress.StartRow = InstAddress.StartRow
-        bOK = bOK AND NewAddress.EndRow = InstAddress.EndRow
-        
-    elseif typename(oReplaceInstance) = "String" then
-        Dim oNewObj as Variant
-        Dim oOldObj as Variant
-        oOldObj = oObj.getByName(cNameToReplace)
-        oObj.replaceByName(cNameToReplace, oReplaceInstance)
-        oNewObj = oObj.getByName(cNameToReplace)
-        bOK = bOK and not PropertyTester.equals(oOldObj, oNewObj)
-    else
-        oOldObject = oObj.getByName(cNameToReplace)
-        cReplInstName = oReplaceInstance.Name
-        Out.Log("ReplaceInstance.name = '" &amp; cReplInstName &amp; "'")
-        cOldObjName = oOldObject.Name
-        Out.Log("OldObject.name = '" &amp; cOldObjName &amp; "'")
-
-        oObj.replaceByName(cNameToReplace, oReplaceInstance)
-        oNewControl = oObj.getByName(cNameToReplace)
-
-        cReplInstName = oReplaceInstance.Name
-        Out.Log("ReplaceInstance.name = '" &amp; cReplInstName &amp; "'")
-        cNewObjName = oNewControl.Name
-        Out.Log("NewObject.name = '" &amp; cNewObjName &amp; "'")
-
-        bOK = bOK AND (oReplaceInstance.Name = cNameToReplace)
-    end if
-
-    Test.MethodTested("replaceByName()", bOK)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XNameReplace/script.xlb b/qadevOOo/tests/basic/ifc/container/XNameReplace/script.xlb
deleted file mode 100644
index 268ac95bb0f9..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNameReplace/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XNameReplace" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XNameReplace"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XNamed/container_XNamed.xba b/qadevOOo/tests/basic/ifc/container/XNamed/container_XNamed.xba
deleted file mode 100644
index da0f6ad1f3c7..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNamed/container_XNamed.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XNamed" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'      Global cNameToSet As String "fixed" if name is fixed
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XNamed
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cName As String, cNewName As String
-
-    if VarType(cNameToSet) = 8 then 
-        if cNameToSet = "" then
-            cNewName = cIfcShortName
-        else
-            cNewName = cNameToSet
-        endif
-    else
-        cNewName = cIfcShortName
-    endif
-
-    Test.StartMethod("getName()")
-    bOK = true
-    cName = oObj.getName()
-    Out.Log("Name is '" + cName + "'")
-    bOK = bOK AND NOT isNULL(cName)
-    bOK = bOK AND (VarType(oObj.Name) = 8 )
-    Test.MethodTested("getName()", bOK)
-
-    Test.StartMethod("setName()")
-    bOK = true
-    Out.Log("nameToSet is '" + cNewName + "'")
-
-    if (cNewName = "fixed") then
-        Out.Log("Object " + cObjectName + " has fixed name.")
-        on error goto ex1:
-            Out.Log("Trying to change fixed name")
-            oObj.setName(cNewName)
-            Out.Log("After setting name, oObj.Name is '" + oObj.Name + "'")
-            bOK = bOK AND oObj.Name &lt;&gt; cNameToSet
-            if (NOT bOK) then Out.Log("Fixed name was changed! - FAILED")
-            goto cont1:
-        ex1:
-            Out.Log("Expected exception - OK")
-            resume next
-        cont1:
-    else
-        oObj.setName(cNewName)
-        Out.Log("After setting name, oObj.Name is '" + oObj.Name + "'")
-        bOK = bOK AND (cName &lt;&gt; oObj.Name)
-        oObj.Name = cName
-        bOK = bOK AND (cName = oObj.Name)
-    end if
-    Test.MethodTested("setName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XNamed/script.xlb b/qadevOOo/tests/basic/ifc/container/XNamed/script.xlb
deleted file mode 100644
index 6feab3be05c3..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XNamed/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XNamed" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XNamed"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/container/XSet/container_XSet.xba b/qadevOOo/tests/basic/ifc/container/XSet/container_XSet.xba
deleted file mode 100644
index 0c422451bf2e..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XSet/container_XSet.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="container_XSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.container.XSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Out.Log("Creating enumeration... ")
-    oEnum = oObj.createEnumeration()
-    if oEnum.hasMoreElements then
-        oElem = oEnum.nextElement
-    end if
-    bOK = bOK AND NOT inNULL(oElem)
-    Out.Log("Enumeration creationg - " &amp; bOK)
-
-    Test.StartMethod("has()")
-    bOK = true
-    bOK = bOK AND oObj.has(oElem)
-    Test.MethodTested("has()", bOK)
-
-    Test.StartMethod("remove()")
-    bOK = true
-    oObj.remove(oElem)
-    bOK = bOK AND NOT oObj.has(oElem)
-    Test.MethodTested("remove()", bOK)
-
-    Test.StartMethod("insert()")
-    bOK = true
-    oObj.insert(oElem)
-    bOK = bOK AND oObj.has(oElem)
-    Test.MethodTested("insert()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/container/XSet/script.xlb b/qadevOOo/tests/basic/ifc/container/XSet/script.xlb
deleted file mode 100644
index 2ccfbb891f4e..000000000000
--- a/qadevOOo/tests/basic/ifc/container/XSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="container_XSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="container_XSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/datatransfer_XDataFormatTranslator.xba b/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/datatransfer_XDataFormatTranslator.xba
deleted file mode 100644
index 506edac5a612..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/datatransfer_XDataFormatTranslator.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_XDataFormatTranslator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.XDataFormatTranslator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim dataFlavor As new com.sun.star.datatransfer.DataFlavor
-    Dim oCoreRefl As Object
-    Dim sysDataType As Variant
-    Dim sysDataFlavour As Variant
-
-    oCoreRefl = createUNOService("com.sun.star.reflection.CoreReflection")
-
-    Test.StartMethod("getSystemDataTypeFromDataFlavor()")
-    bOK = true
-    dataFlavor.MimeType = "text/plain"
-    dataFlavor.HumanPresentableName = "MyDataFlavor"
-
-    sysDataType = oObj.getSystemDataTypeFromDataFlavor(dataFlavor)
-
-    bOK = bOK AND NOT isNULL(sysDataType)
-    bOK = bOK AND NOT isEmpty(sysDataType)
-
-    if (bOK) then
-        Out.Log("Type of SystemDataType is: " &amp; oCoreRefl.getType(sysDataType).Name)
-    else
-        Out.Log("Can't get system data type.")
-    end if
-
-    Test.MethodTested("getSystemDataTypeFromDataFlavor()", bOK)
-
-    Test.StartMethod("getDataFlavorFromSystemDataType()")
-    if (NOT bOK) then
-        Out.Log("Can't test getDataFlavorFromSystemDataType() without getSystemDataTypeFromDataFlavor()")
-    else
-        sysDataFlavour = oObj.getDataFlavorFromSystemDataType(sysDataType)
-
-        bOK = bOK AND NOT isNULL(sysDataFlavour)
-        bOK = bOK AND NOT isEmpty(sysDataFlavour)
-
-        if (bOK) then
-            Out.Log("Type of DataFlavor is: " &amp; oCoreRefl.getType(sysDataFlavour).Name)
-            bOK = bOK AND oCoreRefl.getType(sysDataFlavour).Name = "com.sun.star.datatransfer.DataFlavor"
-        else
-            Out.Log("Can't get data flavor.")
-        end if
-        Test.MethodTested("getDataFlavorFromSystemDataType()", bOK)
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/script.xlb
deleted file mode 100644
index 40b326cccaea..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/XDataFormatTranslator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_XDataFormatTranslator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_XDataFormatTranslator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/datatransfer_XMimeContentTypeFactory.xba b/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/datatransfer_XMimeContentTypeFactory.xba
deleted file mode 100644
index 84fe82fd69a3..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/datatransfer_XMimeContentTypeFactory.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_XMimeContentTypeFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.XMimeContentTypeFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sMIMEType As String
-    Dim oMIMEType As Object
-
-
-    Test.StartMethod("createMimeContentType()")
-    bOK = true
-    sMIMEType = "text/plain"
-    oMIMEType = oObj.createMimeContentType(sMIMEType)
-    bOK = bOK AND hasUNOInterfaces(oMIMEType, "com.sun.star.datatransfer.XMimeContentType")
-    Test.MethodTested("createMimeContentType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/script.xlb
deleted file mode 100644
index c05f05e37f9c..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/XMimeContentTypeFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_XMimeContentTypeFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_XMimeContentTypeFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/datatransfer_clipboard_XClipboard.xba b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/datatransfer_clipboard_XClipboard.xba
deleted file mode 100644
index 775071a010a2..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/datatransfer_clipboard_XClipboard.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_clipboard_XClipboard" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oOwner As Object
-'       Global trans1 As Object
-'       Global trans2 As Object
-
-'*************************************************************************
-
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.clipboard.XClipboard
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim transDat1 As Variant, transDat2 As Variant, trans As Variant
-    Dim cont As Variant
-
-'    owner = createUnoService("basichelper.ClipboardOwner")
-
-    transDat1 = trans1.getTransferData(NULL_OBJECT)
-    transDat2 = trans2.getTransferData(NULL_OBJECT)
-    
-    Test.StartMethod("setContents()")
-    bOK = true
-    oObj.setContents(trans1, NULL_OBJECT)
-    wait(500)
-    
-    'Out.Log(owner.hasElements())
-    
-'    trans = oOwner.getByName("transferable")
-'    bOK = bOK AND (trans.getTransferData(NULL_OBJECT) = transDat1)
-
-    Test.StartMethod("getContents()")
-    bOK = true
-    trans = oObj.getContents()
-    
-'    msgbox trans.dbg_supportedInterfaces()
-    
-    bOK = bOK AND (trans.getTransferData(NULL_OBJECT) = transDat1)
-    Test.MethodTested("setContents()", bOK)
-    Test.MethodTested("getContents()", bOK)
-
-    Test.StartMethod("getName()")
-    Dim cbName As String
-    
-    bOK = true
-    cbName = oObj.getName()
-    Out.Log("The name of clipboard is '" + cbName + "'")
-    Test.MethodTested("getName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/script.xlb
deleted file mode 100644
index 0652aa0bfc1d..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboard/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_clipboard_XClipboard" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_clipboard_XClipboard"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/datatransfer_clipboard_XClipboardEx.xba b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/datatransfer_clipboard_XClipboardEx.xba
deleted file mode 100644
index 1347630e9271..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/datatransfer_clipboard_XClipboardEx.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_clipboard_XClipboardEx" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.clipboard.XClipboardEx
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iCap As Integer
-
-
-    Test.StartMethod("getRenderingCapabilities()")
-    bOK = true
-    iCap = oObj.getRenderingCapabilities()
-    Out.Log("Returned flag is " &amp; iCap)
-    bOK = bOK AND (((iCap AND com.sun.star.datatransfer.clipboard.RenderingCapabilities.Delayed) &lt;&gt; 0) OR _
-                   ((iCap AND com.sun.star.datatransfer.clipboard.RenderingCapabilities.Persistant)> 0))
-    Test.MethodTested("getRenderingCapabilities()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/script.xlb
deleted file mode 100644
index f0afac5881f2..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardEx/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_clipboard_XClipboardEx" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_clipboard_XClipboardEx"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/datatransfer_clipboard_XClipboardNotifier.xba b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/datatransfer_clipboard_XClipboardNotifier.xba
deleted file mode 100644
index e42fc02691d6..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/datatransfer_clipboard_XClipboardNotifier.xba
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_clipboard_XClipboardNotifier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-Dim iCB1_changedContents As Integer
-Dim iCB2_changedContents As Integer
-Dim bListenerWasCalled As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.clipboard.XClipboardNotifier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-    Dim iTime As Integer
-
-    iCB1_changedContents = 0 : iCB2_changedContents = 0
-
-    oListener1 = createUNOListener("CB1_", "com.sun.star.datatransfer.clipboard.XClipboardListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.datatransfer.clipboard.XClipboardListener")
-
-    Test.StartMethod("addClipboardListener()")
-    bOK = true
-    Out.Log("Adding two listeners...")
-    oObj.addClipboardListener(oListener1)
-    oObj.addClipboardListener(oListener2)
-    if (bPerformInteractiveTests) then
-        bListenerWasCalled = false
-        MsgBox("After closing this window try to copy something into clipboard... You have aprox. 10 sec. for this...")
-        iTime = 0
-        while ((NOT bListenerWasCalled) AND (iTime &lt; 10))
-            wait 1000
-            iTime = iTime + 1
-        wend
-        if (NOT bListenerWasCalled) then
-            Out.Log("No listener was called in 10 sec!")
-            MsgBox("No listener was called in 10 sec!")
-            bOK = false
-        else
-            MsgBox("Listener was called!")
-            bOK = bOK AND (iCB1_changedContents = 1) AND (iCB2_changedContents = 1)
-        end if
-    else
-        Out.Log("This is an interactive test. To test this use parameter PERFORMINTERACTIVETESTS in ini file.")
-    end if
-    Test.MethodTested("addClipboardListener()", bOK)
-
-    Test.StartMethod("removeClipboardListener()")
-    bOK = true
-    iCB1_changedContents = 0 : iCB2_changedContents = 0
-
-    Out.Log("Removing second listener...")
-    oObj.removeClipboardListener(oListener2)
-    if (bPerformInteractiveTests) then
-        bListenerWasCalled = false
-        MsgBox("Repeat again: After closing this window try to copy something into clipboard... You have aprox. 10 sec. for this...")
-        iTime = 0
-        while ((NOT bListenerWasCalled) AND (iTime &lt; 10))
-            wait 1000
-            iTime = iTime + 1
-        wend
-        if (NOT bListenerWasCalled) then
-            Out.Log("No listener was called in 10 sec!")
-            MsgBox("No listener was called in 10 sec!")
-            bOK = false
-        else
-            MsgBox("Listener was called!")
-            bOK = bOK AND (iCB1_changedContents = 1) AND (iCB2_changedContents = 0)
-        end if
-    else
-        Out.Log("This is an interactive test. To test this use parameter PERFORMINTERACTIVETESTS in ini file.")
-    end if
-    Test.MethodTested("removeClipboardListener()", bOK)
-
-    Out.Log("Removing first listener...")
-    oObj.removeClipboardListener(oListener1)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub CB1_changedContents(event As Object)
-    iCB1_changedContents = iCB1_changedContents + 1
-    Out.Log("CB1_changedContents() was called!")
-    bListenerWasCalled = true
-End Sub
-
-Sub CB2_changedContents(event As Object)
-    iCB2_changedContents = iCB2_changedContents + 1
-    Out.Log("CB2_changedContents() was called!")
-    bListenerWasCalled = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/script.xlb
deleted file mode 100644
index 59f680bb9471..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XClipboardNotifier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_clipboard_XClipboardNotifier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_clipboard_XClipboardNotifier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/datatransfer_clipboard_XFlushableClipboard.xba b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/datatransfer_clipboard_XFlushableClipboard.xba
deleted file mode 100644
index 587eda1771c0..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/datatransfer_clipboard_XFlushableClipboard.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="datatransfer_clipboard_XFlushableClipboard" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.datatransfer.clipboard.XFlushableClipboard
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("flushClipboard()")
-    bOK = true
-
-    if ((oObj.getRenderingCapabilities() AND com.sun.star.datatransfer.clipboard.RenderingCapabilities.Persistant) &lt;&gt; 0) then
-        oObj.flushClipboard()
-    else
-        Out.Log("getRenderingCapabilities() doesn't return Persistant. this " &amp; _
-               "interface is only available if the method getRenderingCapabilities " &amp; _
-               "of the interface XClipboardEx returns Persistant")
-    end if
-
-    Test.MethodTested("flushClipboard()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/script.xlb b/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/script.xlb
deleted file mode 100644
index a84b1c6c93b5..000000000000
--- a/qadevOOo/tests/basic/ifc/datatransfer/clipboard/XFlushableClipboard/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="datatransfer_clipboard_XFlushableClipboard" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="datatransfer_clipboard_XFlushableClipboard"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/DocumentInfo/document_DocumentInfo.xba b/qadevOOo/tests/basic/ifc/document/DocumentInfo/document_DocumentInfo.xba
deleted file mode 100644
index 4364dae08e03..000000000000
--- a/qadevOOo/tests/basic/ifc/document/DocumentInfo/document_DocumentInfo.xba
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_DocumentInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.document.DocumentInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim pval As Variant, resVal As Variant
-
-    PropertyTester.TestProperty("Author")
-
-    PropertyTester.TestProperty("BlindCopiesTo")
-
-    PropertyTester.TestProperty("CopyTo")
-
-    testDateTime("CreationDate")
-
-    PropertyTester.TestProperty("Description")
-
-    PropertyTester.TestProperty("InReplyTo")
-
-    PropertyTester.TestProperty("Keywords")
-
-    PropertyTester.TestProperty("MIMEType")
-
-    testDateTime("ModifyDate")
-
-    PropertyTester.TestProperty("ModifiedBy")
-
-    PropertyTester.TestProperty("Newsgroups")
-
-    PropertyTester.TestProperty("Original")
-
-    Test.StartMethod("Priority")
-
-    bOK =true
-    
-    pval = oObj.Priority
-    Out.Log("Was:" + pval)
-    oObj.Priority = pval + 1
-    resVal = oObj.Priority
-    Out.Log("Res:" + resVal)
-    bOK = bOK AND (pval + 1 = resVal)
-
-    Test.MethodTested("Priority", bOK)
-
-    PropertyTester.TestProperty("Recipient")
-
-    PropertyTester.TestProperty("References")
-
-    PropertyTester.TestProperty("ReplyTo")
-
-    PropertyTester.TestProperty("Theme")
-
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("Template")
-
-    testDateTime("TemplateDate")
-
-    PropertyTester.TestProperty("IsEncrypted")
-
-    testDateTime("PrintDate")
-
-    PropertyTester.TestProperty("PrintedBy")
-
-    PropertyTester.TestProperty("AutoloadEnabled")
-
-    PropertyTester.TestProperty("AutoloadURL")
-
-    Test.StartMethod("AutoloadSecs")
-
-    bOK =true
-    
-    pval = oObj.AutoloadSecs
-    Out.Log("Was:" + pval)
-    oObj.AutoloadSecs = pval + 10
-    resVal = oObj.AutoloadSecs
-    Out.Log("Res:" + resval)
-    bOK = bOK AND (pval + 10 = resVal)
-
-    Test.MethodTested("AutoloadSecs", bOK)
-
-    PropertyTester.TestProperty("DefaultTarget")
-
-    PropertyTester.TestProperty("Generator")
-
-    PropertyTester.TestProperty("CreationDate")
-
-    PropertyTester.TestProperty("Subject")
-
-    PropertyTester.TestProperty("Language")
-
-    PropertyTester.TestProperty("ModifyDate")
-
-    PropertyTester.TestProperty("PrintDate")
-
-    PropertyTester.TestProperty("TemplateDate")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub testDateTime(propName As String)
-    Dim oldVal As Variant, resVal As Variant
-    Dim newVal As New com.sun.star.util.DateTime
-    Dim bOK As Boolean
-    bOK = true
-
-    Test.StartMethod(propName)
-
-    oldVal = oObj.getPropertyValue(propName)
-    Out.Log("OldVal :" + dateTime2String(oldVal))
-    if isNull(oldVal) then
-        newVal.Year = 2001
-        newVal.Month = 11
-        newVal.Day = 12
-        newVal.Hours = 16
-        newVal.Minutes = 14
-        newVal.Seconds = 48
-        newVal.HundredthSeconds = 0
-    else
-        newVal.Year = oldVal.Year
-        newVal.Month = oldVal.Month
-        newVal.Day = oldVal.Day
-        newVal.Hours = oldVal.Hours
-        newVal.Minutes = oldVal.Minutes
-        newVal.HundredthSeconds = oldVal.HundredthSeconds
-        newVal.Seconds = oldVal.Seconds + 1
-        if (newVal.Seconds > 59) then newVal.Seconds = 0
-    end if
-
-    Out.Log("NewVal :" + dateTime2String(newVal))
-    oObj.setPropertyValue(propName, newVal)
-    resVal = oObj.getPropertyValue(propName)
-    Out.Log("ResVal :" + dateTime2String(resVal))
-
-    bOK = bOK AND (newVal.Year = resVal.Year)
-    bOK = bOK AND (newVal.Month = resVal.Month)
-    bOK = bOK AND (newVal.Day = resVal.Day)
-    bOK = bOK AND (newVal.Hours = resVal.Hours)
-    bOK = bOK AND (newVal.Minutes = resVal.Minutes)
-    bOK = bOK AND (newVal.Seconds = resVal.Seconds)
-    bOK = bOK AND (newVal.HundredthSeconds = resVal.HundredthSeconds)
-
-' ### The following property was not found in correspond IDL file! ###
-    Test.MethodTested(propName, bOK)
-
-    Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function dateTime2String (dT As Variant) As String
-
-    dateTime2String = "" + dT.Day + "." + dT.Month + "." + dT.Year + _
-        " " + dT.Hours + ":" + dT.Minutes + ":" + dT.Seconds + "." + _
-        dT.HundredthSeconds
-
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/DocumentInfo/script.xlb b/qadevOOo/tests/basic/ifc/document/DocumentInfo/script.xlb
deleted file mode 100644
index ea8a16fe0ef1..000000000000
--- a/qadevOOo/tests/basic/ifc/document/DocumentInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_DocumentInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_DocumentInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/OfficeDocument/document_OfficeDocument.xba b/qadevOOo/tests/basic/ifc/document/OfficeDocument/document_OfficeDocument.xba
deleted file mode 100644
index a0130a98c040..000000000000
--- a/qadevOOo/tests/basic/ifc/document/OfficeDocument/document_OfficeDocument.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_OfficeDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.document.OfficeDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("AutomaticControlFocus")
-    PropertyTester.TestProperty("ApplyFormDesignMode")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/OfficeDocument/script.xlb b/qadevOOo/tests/basic/ifc/document/OfficeDocument/script.xlb
deleted file mode 100644
index 543fca16b872..000000000000
--- a/qadevOOo/tests/basic/ifc/document/OfficeDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_OfficeDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_OfficeDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XActionLockable/document_XActionLockable.xba b/qadevOOo/tests/basic/ifc/document/XActionLockable/document_XActionLockable.xba
deleted file mode 100644
index b395819bb6b5..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XActionLockable/document_XActionLockable.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XActionLockable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XActionLockable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bResetOK As Boolean
-
-    Test.StartMethod("resetActionLocks()")
-    bOK = true
-    oObj.resetActionLocks()
-    bResetOK = bOK
-
-    Test.StartMethod("isActionLocked()")
-    Test.StartMethod("addActionLock()")
-    bOK = true
-    bOK = bOK AND NOT oObj.isActionLocked()
-    oObj.addActionLock()
-    bOK = bOK AND oObj.isActionLocked()
-    Test.MethodTested("addActionLock()", bOK)
-    Test.MethodTested("isActionLocked()", bOK)
-
-    Test.StartMethod("removeActionLock()")
-    bOK = true
-    oObj.removeActionLock()
-    bOK = bOK AND NOT oObj.isActionLocked()
-    Test.MethodTested("removeActionLock()", bOK)
-
-    Test.StartMethod("setActionLocks()")
-    bOK = true
-    oObj.setActionLocks(5)
-    bOK = bOK AND oObj.resetActionLocks() = 5
-    bResetOK = bResetOK AND bOK
-    Test.MethodTested("setActionLocks()", bOK)
-    Test.MethodTested("resetActionLocks()", bResetOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XActionLockable/script.xlb b/qadevOOo/tests/basic/ifc/document/XActionLockable/script.xlb
deleted file mode 100644
index e10e4c90a117..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XActionLockable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XActionLockable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XActionLockable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInfo/document_XDocumentInfo.xba b/qadevOOo/tests/basic/ifc/document/XDocumentInfo/document_XDocumentInfo.xba
deleted file mode 100644
index 42b8f25b0bf3..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInfo/document_XDocumentInfo.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XDocumentInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XDocumentInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim fieldCnt As Variant
-    Dim oldProp As String, newProp As String, resProp As String
-
-    Test.StartMethod("getUserFieldCount()")
-    bOK = true
-    fieldCnt = oObj.getUserFieldCount()
-    bOK = bOK AND (fieldCnt &gt; 0)
-    Test.MethodTested("getUserFieldCount()", bOK)
-
-    Test.StartMethod("getUserFieldName()")
-    bOK = true
-    oldProp = oObj.getUserFieldName(0)
-    bOK = bOK AND NOT isNull(oldProp)
-    Test.MethodTested("getUserFieldName()", bOK)
-
-    Test.StartMethod("setUserFieldName()")
-    bOK = true
-    newProp = "_" + oldProp
-    oObj.setUserFieldName(0, newProp)
-    resProp = oObj.getUserFieldName(0)
-    Out.Log("Was: '" + oldProp + "', New: '" + newProp + "', Get: '" + resProp + "'")
-    bOK = bOK AND (resProp = newProp)
-    Test.MethodTested("setUserFieldName()", bOK)
-
-    Test.StartMethod("getUserFieldValue()")
-    bOK = true
-    oldProp = oObj.getUserFieldValue(0)
-    bOK = bOK AND NOT isNull(oldProp)
-    Test.MethodTested("getUserFieldValue()", bOK)
-
-    Test.StartMethod("setUserFieldValue()")
-    bOK = true
-    newProp = "_" + oldProp
-    oObj.setUserFieldValue(0, newProp)
-    resProp = oObj.getUserFieldValue(0)
-    Out.Log("Was: '" + oldProp + "', New: '" + newProp + "', Get: '" + resProp + "'")
-    bOK = bOK AND (resProp = newProp)
-    Test.MethodTested("setUserFieldValue()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInfo/script.xlb b/qadevOOo/tests/basic/ifc/document/XDocumentInfo/script.xlb
deleted file mode 100644
index 812b5ccb7e7e..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XDocumentInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XDocumentInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/document_XDocumentInfoSupplier.xba b/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/document_XDocumentInfoSupplier.xba
deleted file mode 100644
index 20199ab5d306..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/document_XDocumentInfoSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XDocumentInfoSupplier" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XDocumentInfoSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getDocumentInfo()")
-    bOK = TRUE
-    bOK = bOK AND isObject(oObj.getDocumentInfo())
-    Test.MethodTested("getDocumentInfo()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/script.xlb b/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/script.xlb
deleted file mode 100644
index 3b44c76a9c99..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInfoSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XDocumentInfoSupplier" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="document_XDocumentInfoSupplier"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/document_XDocumentInsertable.xba b/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/document_XDocumentInsertable.xba
deleted file mode 100644
index f2f508bc0f65..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/document_XDocumentInsertable.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XDocumentInsertable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XDocumentInsertable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sURL As String
-
-    Test.StartMethod("insertDocumentFromURL()")
-    bOK = true
-    sURL = utils.Path2URL(cTestDocsDir + "SwXTextSection.sdw")
-    oObj.insertDocumentFromURL(sURL, DimArray())
-    bOK = bOK AND InStr(oDoc.Text.String, "SwXTextSection") &gt; 0
-    Test.MethodTested("insertDocumentFromURL()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/script.xlb b/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/script.xlb
deleted file mode 100644
index 4ad1f6c4b1ae..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XDocumentInsertable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XDocumentInsertable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XDocumentInsertable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/document_XEmbeddedObjectSupplier.xba b/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/document_XEmbeddedObjectSupplier.xba
deleted file mode 100644
index bc962faf4660..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/document_XEmbeddedObjectSupplier.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XEmbeddedObjectSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XEmbeddedObjectSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oEObj As Object
-
-    Test.StartMethod("getEmbeddedObject()")
-    bOK = true
-    oEObj = oObj.getEmbeddedObject()
-    bOK = bOK AND NOT isNULL(oEObj)
-    bOK = bOK AND hasUnoInterfaces(oEObj, "com.sun.star.lang.XComponent")
-    Test.MethodTested("getEmbeddedObject()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/script.xlb b/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/script.xlb
deleted file mode 100644
index 6cb0db4671af..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XEmbeddedObjectSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XEmbeddedObjectSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XEmbeddedObjectSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XEventsSupplier/document_XEventsSupplier.xba b/qadevOOo/tests/basic/ifc/document/XEventsSupplier/document_XEventsSupplier.xba
deleted file mode 100644
index f36518f9debb..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XEventsSupplier/document_XEventsSupplier.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XEventsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XEventsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getEvents()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getEvents(), "com.sun.star.container.XNameReplace")
-    Test.MethodTested("getEvents()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XEventsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/document/XEventsSupplier/script.xlb
deleted file mode 100644
index 9962039c40a8..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XEventsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XEventsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XEventsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XExporter/document_XExporter.xba b/qadevOOo/tests/basic/ifc/document/XExporter/document_XExporter.xba
deleted file mode 100644
index d69d1676cc97..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XExporter/document_XExporter.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oSrcDocument As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("setSourceDocument()")
-    bOK = true
-    oObj.setSourceDocument(oSrcDocument)
-    Test.MethodTested("setSourceDocument()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XExporter/script.xlb b/qadevOOo/tests/basic/ifc/document/XExporter/script.xlb
deleted file mode 100644
index cbf12e52cd18..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XFilter/document_XFilter.xba b/qadevOOo/tests/basic/ifc/document/XFilter/document_XFilter.xba
deleted file mode 100644
index d6eb1e62d281..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XFilter/document_XFilter.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XFilter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oFilterDescriptor As Variant
-'     - Global oDocHandler As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XFilter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iniParam(1) as Variant
-    Dim oFilter as Object
-
-    Test.StartMethod("filter()")
-    bOK = true
-    bOK = bOK AND oObj.filter(oFilterDescriptor)
-    bOK = bOK AND checkFilter()
-
-    Test.MethodTested("filter()", bOK)
-    Test.StartMethod("cancel()")
-    bOK = true
-
-    oFilter = createUnoService("basichelper.Filter")
-
-    iniParam(0) = oObj
-    iniParam(1) = oFilterDescriptor
-    oFilter.initialize(iniParam())
-    oObj.Cancel()
-
-    bOK = bOK AND NOT oFilter.getByName("Result")
-    Test.MethodTested("cancel()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XFilter/script.xlb b/qadevOOo/tests/basic/ifc/document/XFilter/script.xlb
deleted file mode 100644
index 0375a4bdac03..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XFilter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XFilter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XFilter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XImporter/document_XImporter.xba b/qadevOOo/tests/basic/ifc/document/XImporter/document_XImporter.xba
deleted file mode 100644
index 7ee18b8e87b5..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XImporter/document_XImporter.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oSrcDocument As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("setTargetDocument()")
-    bOK = true
-    oObj.setTargetDocument(oSrcDocument)
-    Test.MethodTested("setTargetDocument()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XImporter/script.xlb b/qadevOOo/tests/basic/ifc/document/XImporter/script.xlb
deleted file mode 100644
index cd4492011a8a..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/document_XLinkTargetSupplier.xba b/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/document_XLinkTargetSupplier.xba
deleted file mode 100644
index 5ca9bed047e5..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/document_XLinkTargetSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XLinkTargetSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XLinkTargetSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getLinks()")
-    bOK = true
-    oLinks = oObj.getLinks()
-    bOK = bOK AND isObject(oLinks)
-    bOK = bOK AND hasUnoInterfaces(oLinks, "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getLinks()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/script.xlb b/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/script.xlb
deleted file mode 100644
index bbf245a7347b..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XLinkTargetSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XLinkTargetSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XLinkTargetSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/document_XMimeTypeInfo.xba b/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/document_XMimeTypeInfo.xba
deleted file mode 100644
index e2ba8676a170..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/document_XMimeTypeInfo.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XMimeTypeInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XMimeTypeInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getSupportedMimeTypeNames()")
-    Dim names As Variant
-    names = oObj.getSupportedMimeTypeNames()
-    bOK = ubound(names) > 0
-    out.log("Number of supported mime types: " + ubound(names))
-    Test.MethodTested("getSupportedMimeTypeNames()", bOK)
-
-    Test.StartMethod("supportsMimeType()")
-    bOK = oObj.supportsMimeType(names(0))
-    Test.MethodTested("supportsMimeType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/script.xlb b/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/script.xlb
deleted file mode 100644
index 8257ee12fc6b..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XMimeTypeInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XMimeTypeInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XMimeTypeInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/document_XStandaloneDocumentInfo.xba b/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/document_XStandaloneDocumentInfo.xba
deleted file mode 100644
index 8ccb9db3d012..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/document_XStandaloneDocumentInfo.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XStandaloneDocumentInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global documentURL As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XStandaloneDocumentInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldProp As Variant, newProp As Variant, resProp As Variant
-
-    Test.StartMethod("loadFromURL()")
-    Test.StartMethod("storeIntoURL()")
-
-    bOK = true
-    oObj.loadFromURL(documentURL)
-    oldProp = oObj.Author
-    newProp = oldProp + "_"
-    oObj.Author = newProp
-    oObj.storeIntoURL(documentURL)
-    oObj.loadFromURL(documentURL)
-    resProp = oObj.Author
-    Out.Log("Was: '" + oldProp + "',Set: '" + newProp + "', New: " + resProp + "'")
-    bOK = bOK AND (resProp = newProp)
-
-    Test.MethodTested("loadFromURL()", bOK)
-    Test.MethodTested("storeIntoURL()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/script.xlb b/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/script.xlb
deleted file mode 100644
index 76eb171f19a2..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XStandaloneDocumentInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XStandaloneDocumentInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XStandaloneDocumentInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XTypeDetection/document_XTypeDetection.xba b/qadevOOo/tests/basic/ifc/document/XTypeDetection/document_XTypeDetection.xba
deleted file mode 100644
index f6cb7a6099cc..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XTypeDetection/document_XTypeDetection.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XTypeDetection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XTypeDetection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("queryTypeByURL()")
-    bOK = true
-    Dim docURL As String
-    docURL = Path2URL(cTestDocsDir) + "XTypeDetection.sxw"
-
-    Dim typ As String
-    typ = oObj.queryTypeByURL(docURL)
-    Out.log("queryTypeByURL(" + docURL + "): " + typ)
-    bOK = instr(typ, "writer") > 0
-    Test.MethodTested("queryTypeByURL()", bOK)
-
-    Test.StartMethod("queryTypeByDescriptor()")
-    Dim mediaDescr(0) As new com.sun.star.beans.PropertyValue
-    mediaDescr(0).Name = "URL"
-    mediaDescr(0).Value = docURL
-    typ = oObj.queryTypeByDescriptor(mediaDescr(), false)
-    Out.log("queryTypeByDescriptor(descr, false): " + typ)
-    bOK = instr(typ, "writer") > 0
-    typ = oObj.queryTypeByDescriptor(mediaDescr(), true)
-    Out.log("queryTypeByDescriptor(descr, false): " + typ)
-    bOK = instr(typ, "calc") > 0
-    Test.MethodTested("queryTypeByDescriptor()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XTypeDetection/script.xlb b/qadevOOo/tests/basic/ifc/document/XTypeDetection/script.xlb
deleted file mode 100644
index aa9d1b3da865..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XTypeDetection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XTypeDetection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="document_XTypeDetection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/document_XViewDataSupplier.xba b/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/document_XViewDataSupplier.xba
deleted file mode 100644
index 1142755128a9..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/document_XViewDataSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="document_XViewDataSupplier" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.document.XViewDataSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDat as Object
-
-    Test.StartMethod("getViewData()")
-    bOK = TRUE
-    oDat = oObj.getViewData()
-    bOK = bOK AND hasUnoInterfaces(oDat, "com.sun.star.container.XIndexAccess")
-    Test.MethodTested("getViewData()", bOK)
-
-    Test.StartMethod("setViewData()")
-    bOK = TRUE
-    oObj.setViewData(oDat)
-    Test.MethodTested("setViewData()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/script.xlb b/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/script.xlb
deleted file mode 100644
index e1afb0f1af9f..000000000000
--- a/qadevOOo/tests/basic/ifc/document/XViewDataSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="document_XViewDataSupplier" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="document_XViewDataSupplier"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/drawing_ConnectorProperties.xba b/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/drawing_ConnectorProperties.xba
deleted file mode 100644
index 768064a4c1f4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/drawing_ConnectorProperties.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_ConnectorProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.ConnectorProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("EdgeKind")
-    bOK = true
-
-    oObj.EdgeKind = com.sun.star.drawing.ConnectorType.STANDARD
-    bOK = bOK AND oObj.EdgeKind = com.sun.star.drawing.ConnectorType.STANDARD 
-
-    oObj.EdgeKind = com.sun.star.drawing.ConnectorType.LINES
-    bOK = bOK AND oObj.EdgeKind = com.sun.star.drawing.ConnectorType.LINES
-
-    Test.MethodTested("EdgeKind", bOK)
-
-    PropertyTester.TestProperty("EdgeNode1HorzDist")
-
-    PropertyTester.TestProperty("EdgeNode1VertDist")
-
-    PropertyTester.TestProperty("EdgeNode2HorzDist")
-
-    PropertyTester.TestProperty("EdgeNode2VertDist")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/script.xlb
deleted file mode 100644
index 8486237b69e7..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ConnectorProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_ConnectorProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_ConnectorProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/drawing_ConnectorShape.xba b/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/drawing_ConnectorShape.xba
deleted file mode 100644
index 6109e3548b54..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/drawing_ConnectorShape.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_ConnectorShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.ConnectorShape
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    PropertyTester.TestProperty("StartShape")
-
-    PropertyTester.TestProperty("StartGluePointIndex", Array(0,1))
-
-    PropertyTester.TestProperty("StartPosition")
-
-    PropertyTester.TestProperty("EndShape")
-
-    PropertyTester.TestProperty("EndPosition")
-
-    PropertyTester.TestProperty("EndGluePointIndex",  Array(0,1))
-
-    PropertyTester.TestProperty("EdgeLine1Delta")
-
-    PropertyTester.TestProperty("EdgeLine2Delta")
-
-    PropertyTester.TestProperty("EdgeLine3Delta")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/script.xlb
deleted file mode 100644
index 6043a5acb53b..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ConnectorShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_ConnectorShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_ConnectorShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/drawing_DrawingDocument.xba b/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/drawing_DrawingDocument.xba
deleted file mode 100644
index 658471297968..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/drawing_DrawingDocument.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_DrawingDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.DrawingDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("TabStop")
-
-    PropertyTester.TestProperty("CharLocale")
-    
-    PropertyTester.TestProperty("VisibleArea")
-
-    PropertyTester.TestProperty("ForbiddenCharacters")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/script.xlb b/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/script.xlb
deleted file mode 100644
index 91f58d890555..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/DrawingDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_DrawingDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_DrawingDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/drawing_DrawingDocumentDrawView.xba b/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/drawing_DrawingDocumentDrawView.xba
deleted file mode 100644
index 5a1491b9b715..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/drawing_DrawingDocumentDrawView.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_DrawingDocumentDrawView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.DrawingDocumentDrawView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("IsMasterPageMode")
-
-    PropertyTester.TestProperty("IsLayerMode")
-
-    PropertyTester.TestProperty("CurrentPage")
-
-    PropertyTester.TestProperty("VisibleArea")
-
-    oObj.IsMasterPageMode = false
-    oObj.IsLayerMode = false
-
-    PropertyTester.TestProperty("ZoomType")
-
-    PropertyTester.TestProperty("ZoomValue")
-
-    PropertyTester.TestProperty("ViewOffset")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/script.xlb b/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/script.xlb
deleted file mode 100644
index b10a16611319..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/DrawingDocumentDrawView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_DrawingDocumentDrawView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_DrawingDocumentDrawView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/EllipseShape/drawing_EllipseShape.xba b/qadevOOo/tests/basic/ifc/drawing/EllipseShape/drawing_EllipseShape.xba
deleted file mode 100644
index 9b26d43e597d..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/EllipseShape/drawing_EllipseShape.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_EllipseShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.EllipseShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("CircleKind")
-    bOK = true
-
-    oObj.CircleKind = com.sun.star.drawing.CircleKind.FULL
-    bOK = bOK AND oObj.CircleKind = com.sun.star.drawing.CircleKind.FULL
-
-    oObj.CircleKind = com.sun.star.drawing.CircleKind.SECTION
-    bOK = bOK AND oObj.CircleKind = com.sun.star.drawing.CircleKind.SECTION
-
-    Test.MethodTested("CircleKind", bOK)
-
-    PropertyTester.TestProperty("CircleStartAngle")
-
-    PropertyTester.TestProperty("CircleEndAngle")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/EllipseShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/EllipseShape/script.xlb
deleted file mode 100644
index d0870d674175..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/EllipseShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_EllipseShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_EllipseShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing_FillProperties.xba b/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing_FillProperties.xba
deleted file mode 100644
index c21e4e4e261b..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing_FillProperties.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_FillProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.FillProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("FillStyle")
-    oObj.FillStyle = com.sun.star.drawing.FillStyle.SOLID
-
-    PropertyTester.TestProperty("FillColor")
-
-    PropertyTester.TestProperty("FillTransparence")
-
-    Dim aTranspNames(1) As String
-    aTranspNames(0) = "Transparency 2"
-    aTranspNames(1) = "Transparency 1"
-    PropertyTester.TestProperty("FillTransparenceGradientName", aTranspNames())
-
-    PropertyTester.TestProperty("FillTransparenceGradient")
-
-    Dim aGradientNames(1) As String
-    aGradientNames(0) = "Gradient 2"
-    aGradientNames(1) = "Gradient 1"
-    PropertyTester.TestProperty("FillGradientName", aGradientNames())
-
-    PropertyTester.TestProperty("FillGradient")
-
-    Dim aHatchNames(1) As String
-    aHatchNames(0) = "Black 0 Degrees"
-    aHatchNames(1) = "Black 45 Degrees"
-    PropertyTester.TestProperty("FillHatchName", aHatchNames())
-
-    PropertyTester.TestProperty("FillHatch")
-
-    Dim aBitmapNames(1) As String
-    aBitmapNames(0) = "Sky"
-    aBitmapNames(1) = "Metal"
-    PropertyTester.TestProperty("FillBitmapName", aBitmapNames())
-
-    PropertyTester.TestProperty("FillBitmap")
-
-    Test.StartMethod("FillBitmapURL")
-    Dim sURL1 As String
-    Dim sURL2 As String
-    oObj.setPropertyValue("FillBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "crazy-blue.jpg")
-    sURL1 = oObj.getPropertyValue("FillBitmapURL")
-    oObj.setPropertyValue("FillBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "space-metal.jpg")
-    sURL2 = oObj.getPropertyValue("FillBitmapURL")
-    Test.MethodTested("FillBitmapURL", sURL1 &lt;&gt; sURL2)
-
-    Dim aOffsets(1) As Integer
-    aOffsets(0) = 10
-    aOffsets(1) = -10
-    PropertyTester.TestProperty("FillBitmapOffsetX", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapOffsetY", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapPositionOffsetX", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapPositionOffsetY", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapRectanglePoint")
-
-    PropertyTester.TestProperty("FillBitmapLogicalSize")
-
-    PropertyTester.TestProperty("FillBitmapSizeX")
-
-    PropertyTester.TestProperty("FillBitmapSizeY")
-
-    PropertyTester.TestProperty("FillBitmapMode")
-
-    PropertyTester.TestProperty("FillBackground")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing__FillProperties.xba b/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing__FillProperties.xba
deleted file mode 100644
index 153acfcb9ae3..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/FillProperties/drawing__FillProperties.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing__FillProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.FillProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("FillStyle")
-    oObj.FillStyle = com.sun.star.drawing.FillStyle.SOLID
-
-    PropertyTester.TestProperty("FillColor")
-
-    PropertyTester.TestProperty("FillTransparence")
-
-    Dim aTranspNames(1) As String
-    aTranspNames(0) = "Transparency 2"
-    aTranspNames(1) = "Transparency 1"
-    PropertyTester.TestProperty("FillTransparenceGradientName", aTranspNames())
-
-    PropertyTester.TestProperty("FillTransparenceGradient")
-
-    Dim aGradientNames(1) As String
-    aGradientNames(0) = "Gradient 2"
-    aGradientNames(1) = "Gradient 1"
-    PropertyTester.TestProperty("FillGradientName", aGradientNames())
-
-    PropertyTester.TestProperty("FillGradient")
-
-    Dim aHatchNames(1) As String
-    aHatchNames(0) = "Black 0 Degrees"
-    aHatchNames(1) = "Black 45 Degrees"
-    PropertyTester.TestProperty("FillHatchName", aHatchNames())
-
-    PropertyTester.TestProperty("FillHatch")
-
-    Dim aBitmapNames(1) As String
-    aBitmapNames(0) = "Sky"
-    aBitmapNames(1) = "Metal"
-    PropertyTester.TestProperty("FillBitmapName", aBitmapNames())
-
-    PropertyTester.TestProperty("FillBitmap")
-
-    Test.StartMethod("FillBitmapURL")
-    Dim sURL1 As String
-    Dim sURL2 As String
-    oObj.setPropertyValue("FillBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "crazy-blue.jpg")
-    sURL1 = oObj.getPropertyValue("FillBitmapURL")
-    oObj.setPropertyValue("FillBitmapURL", utils.Path2URL(cTestDocsDir) &amp; "space-metal.jpg")
-    sURL2 = oObj.getPropertyValue("FillBitmapURL")
-    Test.MethodTested("FillBitmapURL", sURL1 &lt;&gt; sURL2)
-
-    Dim aOffsets(1) As Integer
-    aOffsets(0) = 10
-    aOffsets(1) = -10
-    PropertyTester.TestProperty("FillBitmapOffsetX", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapOffsetY", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapPositionOffsetX", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapPositionOffsetY", aOffsets())
-
-    PropertyTester.TestProperty("FillBitmapRectanglePoint")
-
-    PropertyTester.TestProperty("FillBitmapLogicalSize")
-
-    PropertyTester.TestProperty("FillBitmapSizeX")
-
-    PropertyTester.TestProperty("FillBitmapSizeY")
-
-    PropertyTester.TestProperty("FillBitmapMode")
-
-    PropertyTester.TestProperty("FillBackground")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/FillProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/FillProperties/script.xlb
deleted file mode 100644
index 5f614032af7f..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/FillProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing__FillProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing__FillProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/drawing_GenericDrawPage.xba b/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/drawing_GenericDrawPage.xba
deleted file mode 100644
index 5fd135250122..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/drawing_GenericDrawPage.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_GenericDrawPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.GenericDrawPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("BorderBottom")
-
-    PropertyTester.TestProperty("BorderLeft")
-
-    PropertyTester.TestProperty("BorderRight")
-
-    PropertyTester.TestProperty("BorderTop")
-
-    PropertyTester.TestProperty("Height")
-
-    PropertyTester.TestProperty("Width")
-
-    PropertyTester.TestProperty("Number")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("UserDefinedAttributes")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/script.xlb b/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/script.xlb
deleted file mode 100644
index d8c0d476a667..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/GenericDrawPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_GenericDrawPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_GenericDrawPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/drawing_GraphicObjectShape.xba b/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/drawing_GraphicObjectShape.xba
deleted file mode 100644
index 2c2d98de63a8..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/drawing_GraphicObjectShape.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_GraphicObjectShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.GraphicObjectShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim bitmapURL As Variant
-    bitmapURL = Array(Path2URL(cTestDocsDir + "space-metal.jpg"))  
-    PropertyTester.TestProperty("GraphicURL", bitmapURL)
-
-    PropertyTester.TestProperty("GraphicStreamURL", bitmapURL)
-
-    PropertyTester.TestProperty("GraphicObjectFillBitmap")
-
-    PropertyTester.TestProperty("AdjustLuminance")
-
-    PropertyTester.TestProperty("AdjustContrast")
-
-    PropertyTester.TestProperty("AdjustRed")
-
-    PropertyTester.TestProperty("AdjustGreen")
-
-    PropertyTester.TestProperty("AdjustBlue")
-
-    PropertyTester.TestProperty("Gamma")
-
-    PropertyTester.TestProperty("Transparency")
-
-    PropertyTester.TestProperty("GraphicColorMode")
-
-    PropertyTester.TestProperty("ImageMap")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/script.xlb
deleted file mode 100644
index 9d98198fb73a..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/GraphicObjectShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_GraphicObjectShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_GraphicObjectShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/Layer/drawing_Layer.xba b/qadevOOo/tests/basic/ifc/drawing/Layer/drawing_Layer.xba
deleted file mode 100644
index 5f51a9ba1370..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/Layer/drawing_Layer.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_Layer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.Layer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("IsVisible")
-
-    PropertyTester.TestProperty("IsPrintable")
-
-    PropertyTester.TestProperty("IsLocked")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/Layer/script.xlb b/qadevOOo/tests/basic/ifc/drawing/Layer/script.xlb
deleted file mode 100644
index 0d4e2808bfae..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/Layer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_Layer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_Layer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/LineProperties/drawing_LineProperties.xba b/qadevOOo/tests/basic/ifc/drawing/LineProperties/drawing_LineProperties.xba
deleted file mode 100644
index 753424d0d24d..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/LineProperties/drawing_LineProperties.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_LineProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.LineProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim dash As Variant 
-
-    PropertyTester.TestProperty("LineStyle")
-
-    dash = oObj.LineDash
-    dash.Style = com.sun.star.drawing.DashStyle.RECT
-    dash.Dots = dash.Dots + 1
-    PropertyTester.TestProperty("LineDash", Array(dash))
-
-    PropertyTester.TestProperty("LineColor")
-
-    PropertyTester.TestProperty("LineTransparence")
-
-    Dim aLineWidth(1) As Integer
-    aLineWidth(0) = 12
-    aLineWidth(1) = 7
-    PropertyTester.TestProperty("LineWidth", aLineWidth())
-
-    PropertyTester.TestProperty("LineJoint")
-
-    Dim LineName(0 to 1) As String
-    LineName(0) = "Arrow"
-    LineName(1) = "Square"
-    PropertyTester.TestProperty("LineStartName",LineName())
-
-    PropertyTester.TestProperty("LineStart")
-
-    PropertyTester.TestProperty("LineEnd")
-
-    PropertyTester.TestProperty("LineStartCenter")
-
-    PropertyTester.TestProperty("LineStartWidth")
-
-    PropertyTester.TestProperty("LineEndCenter")
-
-    PropertyTester.TestProperty("LineEndWidth")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/LineProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/LineProperties/script.xlb
deleted file mode 100644
index 92aa636c37b4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/LineProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_LineProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_LineProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/drawing_MeasureProperties.xba b/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/drawing_MeasureProperties.xba
deleted file mode 100644
index 70f7a945d2b4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/drawing_MeasureProperties.xba
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_MeasureProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.MeasureProperties
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("MeasureBelowReferenceEdge")
-
-    PropertyTester.TestProperty("MeasureHelpLine1Length")
-
-    PropertyTester.TestProperty("MeasureHelpLine2Length")
-
-    PropertyTester.TestProperty("MeasureHelpLineDistance")
-
-    PropertyTester.TestProperty("MeasureHelpLineOverhang")
-
-    Test.StartMethod("MeasureKind")
-    bOK = true
-
-    oObj.MeasureKind = com.sun.star.drawing.MeasureKind.STANDARD
-    bOK = bOK AND oObj.MeasureKind = com.sun.star.drawing.MeasureKind.STANDARD
-
-    oObj.MeasureKind = com.sun.star.drawing.MeasureKind.RADIUS
-    bOK = bOK AND oObj.MeasureKind = com.sun.star.drawing.MeasureKind.RADIUS
-
-    Test.MethodTested("MeasureKind", bOK)
-
-    PropertyTester.TestProperty("MeasureLineDistance")
-
-    PropertyTester.TestProperty("MeasureOverhang")
-
-    PropertyTester.TestProperty("MeasureShowUnit")
-
-    PropertyTester.TestProperty("MeasureTextAutoAngle")
-
-    PropertyTester.TestProperty("MeasureTextAutoAngleView")
-
-    PropertyTester.TestProperty("MeasureTextFixedAngle")
-
-    Test.StartMethod("MeasureTextHorizontalPosition")
-    bOK = true
-
-    oObj.MeasureTextHorizontalPosition = com.sun.star.drawing.MeasureTextHorzPos.AUTO
-    bOK = bOK AND oObj.MeasureTextHorizontalPosition = com.sun.star.drawing.MeasureTextHorzPos.AUTO
-
-    oObj.MeasureTextHorizontalPosition = com.sun.star.drawing.MeasureTextHorzPos.LEFTOUTSIDE
-    bOK = bOK AND oObj.MeasureTextHorizontalPosition = com.sun.star.drawing.MeasureTextHorzPos.LEFTOUTSIDE
-
-    Test.MethodTested("MeasureTextHorizontalPosition", bOK)
-
-    Test.StartMethod("MeasureTextVerticalPosition")
-    bOK = true
-
-    oObj.MeasureTextVerticalPosition = com.sun.star.drawing.MeasureTextVertPos.AUTO
-    bOK = bOK AND oObj.MeasureTextVerticalPosition = com.sun.star.drawing.MeasureTextVertPos.AUTO
-
-    oObj.MeasureTextVerticalPosition = com.sun.star.drawing.MeasureTextVertPos.EAST
-    bOK = bOK AND oObj.MeasureTextVerticalPosition = com.sun.star.drawing.MeasureTextVertPos.EAST
-
-    Test.MethodTested("MeasureTextVerticalPosition", bOK)
-
-    PropertyTester.TestProperty("MeasureTextIsFixedAngle")
-
-    PropertyTester.TestProperty("MeasureTextRotate90")
-
-    PropertyTester.TestProperty("MeasureTextUpsideDown")
-
-    PropertyTester.TestProperty("MeasureDecimalPlaces")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/script.xlb
deleted file mode 100644
index 5be031e60bb7..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/MeasureProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_MeasureProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_MeasureProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/MeasureShape/drawing_MeasureShape.xba b/qadevOOo/tests/basic/ifc/drawing/MeasureShape/drawing_MeasureShape.xba
deleted file mode 100644
index 9157106d7201..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/MeasureShape/drawing_MeasureShape.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_MeasureShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.MeasureShape
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("StartPosition")
-
-    PropertyTester.TestProperty("EndPosition")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/MeasureShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/MeasureShape/script.xlb
deleted file mode 100644
index 6e5ca92a8d58..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/MeasureShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_MeasureShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_MeasureShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/drawing_PolyPolygonBezierDescriptor.xba b/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/drawing_PolyPolygonBezierDescriptor.xba
deleted file mode 100644
index bf855ddd6ddb..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/drawing_PolyPolygonBezierDescriptor.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_PolyPolygonBezierDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.PolyPolygonBezierDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("PolygonKind")
-
-    PropertyTester.TestProperty("PolyPolygonBezier")
-
-    PropertyTester.TestProperty("Geometry")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/script.xlb
deleted file mode 100644
index 6533bbbf6b56..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonBezierDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_PolyPolygonBezierDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_PolyPolygonBezierDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/drawing_PolyPolygonDescriptor.xba b/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/drawing_PolyPolygonDescriptor.xba
deleted file mode 100644
index f98b2c204bb3..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/drawing_PolyPolygonDescriptor.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_PolyPolygonDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.PolyPolygonDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("PolygonKind")
-
-    PropertyTester.TestProperty("PolyPolygon")
-
-    PropertyTester.TestProperty("Geometry")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/script.xlb
deleted file mode 100644
index 78c42a61d5ca..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/PolyPolygonDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_PolyPolygonDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_PolyPolygonDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/drawing_RotationDescriptor.xba b/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/drawing_RotationDescriptor.xba
deleted file mode 100644
index 018b938f8883..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/drawing_RotationDescriptor.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_RotationDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.RotationDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim newRot As Variant
-    newRot = Array( oObj.RotateAngle + 200 )
-    PropertyTester.TestProperty("RotateAngle", newRot)
-
-    Dim newShAn As Variant
-    newShAn = Array( oObj.ShearAngle + 200 )
-    PropertyTester.TestProperty("ShearAngle", newShAn)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/script.xlb
deleted file mode 100644
index f6f8b90e5734..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/RotationDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_RotationDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_RotationDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/drawing_ShadowProperties.xba b/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/drawing_ShadowProperties.xba
deleted file mode 100644
index c69dc78d7615..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/drawing_ShadowProperties.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_ShadowProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.ShadowProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Shadow")
-
-    PropertyTester.TestProperty("ShadowColor")
-
-    PropertyTester.TestProperty("ShadowTransparence")
-
-    PropertyTester.TestProperty("ShadowXDistance")
-
-    PropertyTester.TestProperty("ShadowYDistance")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/script.xlb
deleted file mode 100644
index 8ab2fdc4f855..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/ShadowProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_ShadowProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_ShadowProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/Shape/drawing_Shape.xba b/qadevOOo/tests/basic/ifc/drawing/Shape/drawing_Shape.xba
deleted file mode 100644
index 5662f10cd1a4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/Shape/drawing_Shape.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_Shape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.Shape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim ZOrderArr As Variant
-    ZOrderArr = Array(1, 0)
-    PropertyTester.TestProperty("ZOrder",ZOrderArr)
-
-    PropertyTester.TestProperty("LayerID", ZOrderArr)
-
-    Dim aLayersNames As Variant
-    If oObj.LayerName = "layout" Then
-        aLayersNames = Array("controls")
-    Else If oObj.LayerName = "Hell" Then
-        aLayersNames = Array("Heaven")
-    Else
-        aLayersNames = Array("layout")
-    End If
-    End If
-
-    PropertyTester.TestProperty("LayerName", aLayersNames)
-
-    PropertyTester.TestProperty("Printable")
-
-    PropertyTester.TestProperty("MoveProtect")
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("SizeProtect")
-
-    PropertyTester.TestProperty("Style")
-
-    If cObjectName = "svx.SvxShapeConnector" Then
-        Test.StartMethod("Transformation")
-        Test.MethodTested("Transformation", True)
-    Else
-        PropertyTester.TestProperty("Transformation")
-    End If
-
-    PropertyTester.TestProperty("ShapeUserDefinedAttributes")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/Shape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/Shape/script.xlb
deleted file mode 100644
index 7978b2c1b73c..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/Shape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_Shape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_Shape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/TextProperties/drawing_TextProperties.xba b/qadevOOo/tests/basic/ifc/drawing/TextProperties/drawing_TextProperties.xba
deleted file mode 100644
index f86a3bc1bdc9..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/TextProperties/drawing_TextProperties.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_TextProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.TextProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("IsNumbering")
-
-    PropertyTester.TestProperty("NumberingRules")
-
-    PropertyTester.TestProperty("TextContourFrame")
-
-    PropertyTester.TestProperty("TextAutoGrowHeight")
-
-    PropertyTester.TestProperty("TextAutoGrowWidth")
-
-    PropertyTester.TestProperty("TextFitToSize")
-    
-    PropertyTester.TestProperty("TextHorizontalAdjust")
-
-    PropertyTester.TestProperty("TextVerticalAdjust")
-
-    PropertyTester.TestProperty("TextLeftDistance")
-
-    PropertyTester.TestProperty("TextRightDistance")
-
-    PropertyTester.TestProperty("TextUpperDistance")
-
-    PropertyTester.TestProperty("TextLowerDistance")
-
-    PropertyTester.TestProperty("TextMaximumFrameHeight")
-
-    PropertyTester.TestProperty("TextMaximumFrameWidth")
-
-    PropertyTester.TestProperty("TextMinimumFrameHeight")
-
-    PropertyTester.TestProperty("TextMinimumFrameWidth")
-
-    PropertyTester.TestProperty("TextAnimationAmount")
-
-    PropertyTester.TestProperty("TextAnimationCount")
-
-    PropertyTester.TestProperty("TextAnimationDelay")
-
-    PropertyTester.TestProperty("TextAnimationDirection")
-
-    PropertyTester.TestProperty("TextAnimationKind")
-
-    PropertyTester.TestProperty("TextAnimationStartInside")
-
-    PropertyTester.TestProperty("TextAnimationStopInside")
-
-    PropertyTester.TestProperty("TextWritingMode")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/TextProperties/script.xlb b/qadevOOo/tests/basic/ifc/drawing/TextProperties/script.xlb
deleted file mode 100644
index edd89b72ce37..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/TextProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_TextProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_TextProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/TextShape/drawing_TextShape.xba b/qadevOOo/tests/basic/ifc/drawing/TextShape/drawing_TextShape.xba
deleted file mode 100644
index 29dfba17ec86..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/TextShape/drawing_TextShape.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_TextShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.drawing.TextShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("CornerRadius")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/TextShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/TextShape/script.xlb
deleted file mode 100644
index 4a03ef26f435..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/TextShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_TextShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_TextShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XControlShape/drawing_XControlShape.xba b/qadevOOo/tests/basic/ifc/drawing/XControlShape/drawing_XControlShape.xba
deleted file mode 100644
index 194dbef71636..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XControlShape/drawing_XControlShape.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XControlShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oControlToSet As Object
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XControlShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getControl()")
-    bOK = true
-    oControl = oObj.getControl()
-    bOK = bOK AND NOT isNULL(oControl)
-    bOK = bOK AND hasUnoInterfaces(oControl, "com.sun.star.awt.XControlModel")
-
-    Test.MethodTested("getControl()", bOK)
-
-    Test.StartMethod("setControl()")
-    bOK = true
-    if NOT hasUnoInterfaces(oControlToSet, "com.sun.star.awt.XControlModel") then
-        Out.Log("oControlToSet wasn't correctly set while object creation ... ")
-        bOK = false
-    else
-        oObj.setControl(oControlToSet)
-        bOK = bOK AND oControlToSet.implementationName = oObj.getControl().implementationName
-    end if
-
-    Test.MethodTested("setControl()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XControlShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XControlShape/script.xlb
deleted file mode 100644
index 97e313291ee0..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XControlShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XControlShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XControlShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/drawing_XDrawPageDuplicator.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/drawing_XDrawPageDuplicator.xba
deleted file mode 100644
index a1eb32c56bce..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/drawing_XDrawPageDuplicator.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPageDuplicator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oCollection As Object = oDoc.DrawPages(0)
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPageDuplicator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCopy As Object
-
-    Test.StartMethod("duplicate()")
-    bOK = true
-    oCopy = oObj.duplicate(oCollection)
-    if NOT isNull(oCopy) Then
-        bOK = bOK AND (oCollection.dbg_properties = oCopy.dbg_properties)
-    else
-        bOK = false
-    end if
-    Test.MethodTested("duplicate()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/script.xlb
deleted file mode 100644
index 8670b4bbe277..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageDuplicator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPageDuplicator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawPageDuplicator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/drawing_XDrawPageExpander.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/drawing_XDrawPageExpander.xba
deleted file mode 100644
index 8628c720cf6c..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/drawing_XDrawPageExpander.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPageExpander" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPageExpander
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("expand()")
-    bOK = true
-    Dim Pages As Object
-
-    Pages = oObj.Expand(oObj(0))
-    bOK = bOK AND NOT isNULL(Pages)
-    bOK = bOK AND hasUnoInterfaces(Pages, "com.sun.star.drawing.XDrawPages")
-    Test.MethodTested("expand()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/script.xlb
deleted file mode 100644
index 4eb58e1452d7..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageExpander/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPageExpander" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawPageExpander"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/drawing_XDrawPageSummarizer.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/drawing_XDrawPageSummarizer.xba
deleted file mode 100644
index 0b40602ee4e4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/drawing_XDrawPageSummarizer.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPageSummarizer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPageSummarizer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSummary As Object
-
-
-    Test.StartMethod("summarize()")
-    bOK = true
-    oSummary = oObj.Summarize(oObj)
-    bOK = NOT isNULL(oSummary)
-    bOK = bOK AND hasUnoInterfaces(oSummary, "com.sun.star.drawing.XDrawPage")
-    Test.MethodTested("summarize()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/script.xlb
deleted file mode 100644
index a3d8a8fd5a86..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSummarizer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPageSummarizer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawPageSummarizer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/drawing_XDrawPageSupplier.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/drawing_XDrawPageSupplier.xba
deleted file mode 100644
index 6e3366aef41f..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/drawing_XDrawPageSupplier.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPageSupplier" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPageSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDrawPage as Object
-
-    Test.startMethod("getDrawPage()"
-    bOK = TRUE
-    oDrawPage = oObj.getDrawPage()
-    bOK = bOK AND hasUnoInterfaces(oDrawPage, "com.sun.star.drawing.XDrawPage")
-    Test.MethodTested("getDrawPage()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/script.xlb
deleted file mode 100644
index 0c7dd82c381d..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPageSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPageSupplier" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="drawing_XDrawPageSupplier"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPages/drawing_XDrawPages.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPages/drawing_XDrawPages.xba
deleted file mode 100644
index 680eb2d778d3..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPages/drawing_XDrawPages.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPages" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPages
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCount As Integer
-    Dim oPage As Object
-
-    Test.StartMethod("insertNewByIndex()")
-    bOK = true
-    nCount = oObj.Count
-    oPage = oObj.insertNewByIndex(nCount)
-    bOK = bOK AND nCount &lt;&gt; oObj.Count()
-    Test.MethodTested("insertNewByIndex()", bOK)
-
-    Test.StartMethod("remove()")
-    bOK = true
-    oObj.remove(oPage)
-    bOK = bOK AND nCount = oObj.Count
-    Test.MethodTested("remove()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPages/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPages/script.xlb
deleted file mode 100644
index 13a057bea7ad..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPages/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPages" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawPages"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/drawing_XDrawPagesSupplier.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/drawing_XDrawPagesSupplier.xba
deleted file mode 100644
index df376a73bea7..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/drawing_XDrawPagesSupplier.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawPagesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawPagesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getDrawPages()")
-    bOK = true
-    oDrawPages = oObj.getDrawPages()
-    bOK = bOK AND NOT isNull(oDrawPages)
-    bOK = bOK AND hasUnoInterfaces(oDrawPages, "com.sun.star.drawing.XDrawPages")
-    Test.MethodTested("getDrawPages()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/script.xlb
deleted file mode 100644
index 2f038f684eb3..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawPagesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawPagesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawPagesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawView/drawing_XDrawView.xba b/qadevOOo/tests/basic/ifc/drawing/XDrawView/drawing_XDrawView.xba
deleted file mode 100644
index a68a5bd32bcd..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawView/drawing_XDrawView.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XDrawView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oPages As Object Collection of pages
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XDrawView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCurrPage As Object
-    Dim oOldCurPage As Object
-    Dim newPage As Object
-
-    Test.StartMethod("setCurrentPage()")
-    bOK = true
-    oPages.insertNewByIndex(0)
-    newPage = oPages(0)
-    oOldCurPage = oObj.getCurrentPage()
-    oObj.setCurrentPage(newPage)
-    bOK = bOK AND newPage.dbg_methods = oObj.getCurrentPage().dbg_methods
-    Test.MethodTested("setCurrentPage()", bOK)
-
-    Test.StartMethod("getCurrentPage()")
-    bOK = true
-    oCurrPage = oObj.getCurrentPage()
-    bOK = bOK AND NOT isNULL(oCurrPage)
-    bOK = bOK AND hasUnoInterfaces(oCurrPage, "com.sun.star.drawing.XDrawPage")
-    Test.MethodTested("getCurrentPage()", bOK)
-
-    'back to the old current page
-    oObj.setCurrentPage(oOldCurPage)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XDrawView/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XDrawView/script.xlb
deleted file mode 100644
index a0ce1b7caeca..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XDrawView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XDrawView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XDrawView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/drawing_XGluePointsSupplier.xba b/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/drawing_XGluePointsSupplier.xba
deleted file mode 100644
index 5c7ed5e74505..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/drawing_XGluePointsSupplier.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XGluePointsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XGluePointsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aPoints As Variant
-
-    Test.StartMethod("getGluePoints()")
-    bOK = true
-    aPoints = oObj.getGluePoints()
-    Out.Log("getGluePoints() returned " &amp; aPoints.getCount())
-    if (aPoints.getCount() &gt; 0) then
-        bOK = bOK AND isUNOStruct(aPoints.getByIndex(0))
-        if (bOK) then
-            Out.Log("First point is: " &amp; aPoints.getByIndex(0).Position.X &amp; ", " &amp; aPoints.getByIndex(0).Position.Y)
-        end if
-    end if
-    Test.MethodTested("getGluePoints()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/script.xlb
deleted file mode 100644
index 60b81fd1245f..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XGluePointsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XGluePointsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XGluePointsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XLayerManager/drawing_XLayerManager.xba b/qadevOOo/tests/basic/ifc/drawing/XLayerManager/drawing_XLayerManager.xba
deleted file mode 100644
index 0ac672ca4362..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XLayerManager/drawing_XLayerManager.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XLayerManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XLayerManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oShape As Variant
-    Dim oLayer As Variant
-    Dim nCount As Integer
-    Dim oDrawPage As Object
-    Dim oGetLayer As Object
-
-
-    bOK = true
-    'create a new Shape and add to drawpage
-    oShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oDrawPage = oDoc.DrawPages.getByIndex(0)
-    oDrawPage.add(oShape)
-    'get Layer from LayerManager
-    oLayer = oObj.getByIndex(0)
-    oLayer.Name = cIfcShortName
-
-    Test.StartMethod("attachShapeToLayer()")
-    oObj.attachShapeToLayer(oShape, oLayer)
-    oGetLayer = oObj.getLayerForShape(oShape)
-    bOK = bOK AND (oLayer.Name = oGetLayer.Name)
-    Test.MethodTested("attachShapeToLayer()", bOK)
-
-    Test.StartMethod("getLayerForShape()")
-    bOK = bOK AND (oLayer.Name = oGetLayer.Name)
-    Test.MethodTested("getLayerForShape()", bOK)
-
-    Test.StartMethod("insertNewByIndex()")
-    bOK = true
-    nCount = oObj.Count
-    oObj.insertNewByIndex(nCount)
-    bOK = bOk AND (nCount &lt;&gt; oObj.Count)
-    Test.MethodTested("insertNewByIndex()", bOK)
-
-    Test.StartMethod("remove()")
-    bOK = true
-    nCount = oObj.Count
-    oObj.remove(oLayer)
-    bOK = bOK AND (nCount &lt;&gt; oObj.Count)
-    Test.MethodTested("remove()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XLayerManager/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XLayerManager/script.xlb
deleted file mode 100644
index 553799d022ea..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XLayerManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XLayerManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XLayerManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/drawing_XLayerSupplier.xba b/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/drawing_XLayerSupplier.xba
deleted file mode 100644
index 2ebe1ebfbfcc..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/drawing_XLayerSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XLayerSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XLayerSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getLayerManager()")
-    bOK = true
-    oLayer = oObj.getLayerManager()
-    bOK = bOK AND NOT isNull(oLayer)
-    bOK = bOK AND hasUnoInterfaces(oLayer, "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getLayerManager()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/script.xlb
deleted file mode 100644
index 1f6cb3a085f5..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XLayerSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XLayerSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XLayerSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/drawing_XMasterPageTarget.xba b/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/drawing_XMasterPageTarget.xba
deleted file mode 100644
index 73b167ef4094..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/drawing_XMasterPageTarget.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XMasterPageTarget" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XMasterPageTarget
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oGetMaster As Object
-    Dim oNewMaster As Object
-    Dim oMaster As Object
-
-
-    Test.StartMethod("getMasterPage()")
-    bOK = true
-    oMaster = oDoc.getMasterPages()
-    oNewMaster = oMaster.insertNewByIndex(oMaster.getCount())
-    oNewMaster.Name = "NewMaster"
-    bOK = bOK AND NOT isNull(oObj.getMasterPage())
-    Test.MethodTested("getMasterPage()", bOK)
-
-
-    Test.StartMethod("setMasterPage()")
-    bOK = true
-    oObj.setMasterPage(oNewMaster)
-    oGetMaster = oObj.getMasterPage()
-    bOK = bOK AND (oGetMaster.Name = oNewMaster.Name)
-    Test.MethodTested("setMasterPage()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/script.xlb
deleted file mode 100644
index e0a12d52bc14..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XMasterPageTarget/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XMasterPageTarget" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XMasterPageTarget"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/drawing_XMasterPagesSupplier.xba b/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/drawing_XMasterPagesSupplier.xba
deleted file mode 100644
index fe02677e8c00..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/drawing_XMasterPagesSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XMasterPagesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XMasterPagesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oMaster As Object
-
-    Test.StartMethod("getMasterPages()")
-    bOK = true
-    oMaster = oObj.getMasterPages()
-    bOK = bOK AND NOT isNull(oMaster)
-    bOK = bOK AND hasUnoInterfaces(oMaster, "com.sun.star.drawing.XDrawPages")
-    Test.MethodTested("getMasterPages()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/script.xlb
deleted file mode 100644
index 02cac0d66758..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XMasterPagesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XMasterPagesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XMasterPagesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShape/drawing_XShape.xba b/qadevOOo/tests/basic/ifc/drawing/XShape/drawing_XShape.xba
deleted file mode 100644
index cced868bb1aa..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShape/drawing_XShape.xba
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oPosition As Object
-    Dim oSetPos As New com.sun.star.awt.Point
-    Dim objPosition As Object
-
-    Dim oSize As Object
-    Dim oSetSize As New com.sun.star.awt.Size
-    Dim objSize As Object
-    Dim bRO As Boolean
-
-
-    Test.StartMethod("setPosition()")
-    Test.StartMethod("getPosition()")
-
-    bOK = true
-
-    if (cObjectName = "sw.SwXTextEmbeddedObject") OR _
-       (cObjectName = "sw.SwXTextGraphicObject") OR _
-       (cObjectName = "sw.SwXTextFrame") OR _
-       (cObjectName = "svx.SvxShapeConnector") then
-        Out.Log("Methods get/setPosition doesn't work with this object.")
-    else      
-        oPosition = oObj.getPosition()
-        Out.Log("Current object's position (" + oPosition.X + ", " + oPosition.Y + ")")
-
-        oSetPos.X = 1234
-        oSetPos.Y = 4321
-
-        Out.Log("Trying to set object's position to (" + oSetPos.X + ", " + oSetPos.Y + ")")
-        oObj.setPosition(oSetPos)
-
-        objPosition = oObj.getPosition()
-        Out.Log("Actual position is (" + objPosition.X + ", " + objPosition.Y + ")")
-
-
-        bOK = bOK AND ((abs(objPosition.X - oSetPos.X) &lt;= 1) AND (abs(objPosition.Y - oSetPos.Y) &lt;= 1))
-
-        Out.Log("Return previous position...")
-        oObj.setPosition(oPosition)
-    end if
-
-    Test.MethodTested("getPosition()", bOK)
-    Test.MethodTested("setPosition()", bOK)
-
-
-    Test.StartMethod("setSize()")
-    Test.StartMethod("getSize()")
-    bOK = true
-
-    bRO = (cObjectName = "sch.ChartLegend") OR _
-          (cObjectName = "sch.ChartTitle") OR _
-          (cObjectName = "svx.SvxShapeConnector") 
-    if (bRO) then
-        Out.Log("Size cannot be changed for this object.")
-    end if
-
-    oSize = oObj.getSize()
-    Out.Log("Current object's size (" + oSize.Width + " x " + oSize.Height + ")")
-
-    oSetSize.Width = 1235
-    oSetSize.Height = 4322
-
-    Out.Log("Trying to set object's size to (" + oSetSize.Width + " x " + oSetSize.Height + ")")
-    oObj.setSize(oSetSize)
-    objSize = oObj.getSize()
-    Out.Log("Actual size is (" + objSize.Width + " x " + objSize.Height + ")")
-
-    if (bRO) then
-        bOK = bOK AND ((abs(objSize.Width - oSize.Width) &lt;= 1) AND (abs(objSize.Height - oSize.Height) &lt;= 1))
-    else
-        bOK = bOK AND ((abs(objSize.Width - oSetSize.Width) &lt;= 1) AND (abs(objSize.Height - oSetSize.Height) &lt;= 1))
-    end if
-
-    Out.Log("Return previous size...")
-    oObj.setSize(oSize)
-
-    Test.MethodTested("getSize()", bOK)
-    Test.MethodTested("setSize()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShape/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShape/script.xlb
deleted file mode 100644
index 44d5e67ace32..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/drawing_XShapeBinder.xba b/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/drawing_XShapeBinder.xba
deleted file mode 100644
index 39eeb51dab39..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/drawing_XShapeBinder.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapeBinder" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oBinderCollection As Object
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapeBinder
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    ReCreateObj()
-
-    Test.StartMethod("bind()")
-    bOK = true
-    if hasUnoInterfaces(oObj, "com.sun.star.container.XIndexAccess") then
-        nCount = oObj.getCount()
-        Out.Log("" &amp; nCount &amp; " elements in collection")
-        oBind = oObj.bind(oBinderCollection)
-        if (isNULL(oBind)) then Out.Log("bind() returned NULL.")
-        Out.Log("" &amp; oObj.getCount &amp; " elements in collection")
-        bOK = bOK AND (NOT isNull(oBind)) AND (nCount &lt;&gt; oObj.getCount)
-    else
-        oBind = oObj.bind(oBinderCollection)
-        if (isNULL(oBind)) then Out.Log("bind() returned NULL.")
-        bOK = bOK AND NOT isNull(oBind)
-    end if
-    Test.MethodTested("bind()", bOK)
-
-    Test.StartMethod("unbind()")
-    if (NOT bOK) then
-        Out.Log("Can't test unbind() without bind()")
-    else
-        if hasUnoInterfaces( oObj, "com.sun.star.container.XIndexAccess" ) then
-            oObj.unbind(oBind)
-            Out.Log("" &amp; oObj.count &amp; " elements in collection")
-            bOK = bOK AND (nCount &lt;= oObj.getCount)
-            Test.MethodTested("unbind()", bOK)
-        else
-            oObj.unbind(oBind)
-        end if
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/script.xlb
deleted file mode 100644
index 7cfc992216a4..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeBinder/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapeBinder" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapeBinder"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/drawing_XShapeCombiner.xba b/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/drawing_XShapeCombiner.xba
deleted file mode 100644
index ed74a532fe79..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/drawing_XShapeCombiner.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapeCombiner" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oCombinerCollection As Object
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapeCombiner
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCombine As Object
-    Dim nCount As Integer
-
-    ReCreateObj()
-
-    Test.StartMethod("combine()")
-    bOK = true
-    nCount = oObj.count
-    Out.Log("" &amp; nCount &amp; " elements in collection")
-    oCombine = oObj.combine(oCombinerCollection)
-    if (isNULL(oCombine)) then Out.Log("combine() returned NULL")
-    bOK = bOK AND (nCount &lt;&gt; oObj.count) AND NOT isNull(oCombine)
-    bOK = bOK AND hasUnoInterfaces(oCombine, "com.sun.star.drawing.XShape")
-    Test.MethodTested("combine()", bOK)
-
-    Test.StartMethod("split()")
-    if (NOT bOK) then
-        Out.Log("Can't test split() without combine()")
-    else
-        oObj.split(oCombine)
-        Out.Log("" &amp; oObj.count &amp; " elements in collection")
-        bOK = bOK AND (nCount = oObj.count)
-        Test.MethodTested("split()", bOK)
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/script.xlb
deleted file mode 100644
index 2eb08b47a4f5..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeCombiner/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapeCombiner" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapeCombiner"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/drawing_XShapeDescriptor.xba b/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/drawing_XShapeDescriptor.xba
deleted file mode 100644
index 26becd8ce2a3..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/drawing_XShapeDescriptor.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapeDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cShapeType As String optional
-'       expected shape type
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapeDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sType As Variant
-
-    Test.StartMethod("getShapeType()")
-    bOK = true
-    
-    sType = oObj.getShapeType()
-    bOK = bOK AND (VarType(sType = 8 ))
-    if bOK then
-        On Error Goto NocShapeType
-        if VarType(cShapeType) = 8 then
-            Out.Log("Comparing expected shape type (" + cShapeType + ")")
-            Out.Log("with obtained (" + sType + ")")
-            bOK = bOK AND sType = cShapeType
-        else
-            Out.Log("!!! No expected value for shape '" + sType + "'")
-        endif
-    endif
-    
-EndTest:
-    Test.MethodTested("getShapeType()", bOK)
-
-Exit Sub
-NocShapeType:
-    Out.Log("!!! No expected value for shape '" + sType + "'")
-    goto EndTest
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/script.xlb
deleted file mode 100644
index d6a8efbc2599..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapeDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapeDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/drawing_XShapeGroup.xba b/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/drawing_XShapeGroup.xba
deleted file mode 100644
index 6f89f6086ad8..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/drawing_XShapeGroup.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapeGroup" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapeGroup
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("enterGroup()")
-    bOK = true
-    oObj.enterGroup()
-    Test.MethodTested("enterGroup()", bOK)
-
-    Test.StartMethod("leaveGroup()")
-    bOK = true
-    oObj.leaveGroup()
-    Test.MethodTested("leaveGroup()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/script.xlb
deleted file mode 100644
index b61ec7de14e8..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeGroup/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapeGroup" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapeGroup"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/drawing_XShapeGrouper.xba b/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/drawing_XShapeGrouper.xba
deleted file mode 100644
index 6ca918774d38..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/drawing_XShapeGrouper.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapeGrouper" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oGrouperCollection As Object groupable objects
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapeGrouper
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oGroup As Object
-    Dim nCount As Integer
-
-    Test.StartMethod("group()")
-    bOK = true
-    oGroup = oObj.group(oGrouperCollection)
-    bOK = bOK AND NOT isNull(oGroup)
-    bOK = bOK AND hasUnoInterfaces(oGroup, "com.sun.star.drawing.XShapeGroup")
-    Test.MethodTested("group()", bOK)
-
-    Test.StartMethod("ungroup()")
-    bOK = true
-    nCount = oObj.Count
-    oObj.ungroup(oGroup)
-    bOK = bOK AND nCount &lt;&gt; oObj.Count
-    Test.MethodTested("ungroup()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/script.xlb
deleted file mode 100644
index 0f605aed8da9..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapeGrouper/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapeGrouper" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapeGrouper"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapes/drawing_XShapes.xba b/qadevOOo/tests/basic/ifc/drawing/XShapes/drawing_XShapes.xba
deleted file mode 100644
index 000e7cf2d010..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapes/drawing_XShapes.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="drawing_XShapes" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oXShapeInstance As Object to add/remove
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.drawing.XShapes
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCount As Integer
-
-    Test.StartMethod("add()")
-    bOK = true
-    nCount = oObj.Count
-
-    oObj.add(oXShapeInstance)
-    bOK = bOK AND (nCount &lt;&gt; oObj.Count)
-    Test.MethodTested("add()", bOK)
-
-    Test.StartMethod("remove()")
-    bOK = true
-    oObj.remove(oXShapeInstance)
-    bOK = bOK AND (nCount = oObj.Count)
-    Test.MethodTested("remove()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/drawing/XShapes/script.xlb b/qadevOOo/tests/basic/ifc/drawing/XShapes/script.xlb
deleted file mode 100644
index 87feea7ea29a..000000000000
--- a/qadevOOo/tests/basic/ifc/drawing/XShapes/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="drawing_XShapes" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="drawing_XShapes"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/form_DataAwareControlModel.xba b/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/form_DataAwareControlModel.xba
deleted file mode 100644
index 0c9db8458419..000000000000
--- a/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/form_DataAwareControlModel.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_DataAwareControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.DataAwareControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("DataField")
-
-    PropertyTester.TestProperty("BoundField")
-
-    PropertyTester.TestProperty("LabelControl")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/script.xlb b/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/script.xlb
deleted file mode 100644
index cbe78d65b476..000000000000
--- a/qadevOOo/tests/basic/ifc/form/DataAwareControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_DataAwareControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_DataAwareControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/FormComponent/form_FormComponent.xba b/qadevOOo/tests/basic/ifc/form/FormComponent/form_FormComponent.xba
deleted file mode 100644
index f11a8be4f78d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/FormComponent/form_FormComponent.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_FormComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.FormComponent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Name")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/FormComponent/script.xlb b/qadevOOo/tests/basic/ifc/form/FormComponent/script.xlb
deleted file mode 100644
index f999080e1a7b..000000000000
--- a/qadevOOo/tests/basic/ifc/form/FormComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_FormComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_FormComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/FormControlModel/form_FormControlModel.xba b/qadevOOo/tests/basic/ifc/form/FormControlModel/form_FormControlModel.xba
deleted file mode 100644
index 53bedcab043b..000000000000
--- a/qadevOOo/tests/basic/ifc/form/FormControlModel/form_FormControlModel.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_FormControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.FormControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ClassId")
-
-    PropertyTester.TestProperty("TabIndex")
-
-    PropertyTester.TestProperty("Tag")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/FormControlModel/script.xlb b/qadevOOo/tests/basic/ifc/form/FormControlModel/script.xlb
deleted file mode 100644
index a6243bd9efbe..000000000000
--- a/qadevOOo/tests/basic/ifc/form/FormControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_FormControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_FormControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/form_XApproveActionBroadcaster.xba b/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/form_XApproveActionBroadcaster.xba
deleted file mode 100644
index 0ef5c09973a3..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/form_XApproveActionBroadcaster.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XApproveActionBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Dim L1called as Boolean
-Dim L2called as Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XApproveActionBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim list1 As Object, list2 As Object
-
-    Test.StartMethod("addApproveActionListener()")
-    bOK = true
-
-    list1 = createUnoListener("L1_", "com.sun.star.form.XApproveActionListener")
-    list2 = createUnoListener("L2_", "com.sun.star.form.XApproveActionListener")
-
-    oObj.addApproveActionListener(list1)
-    oObj.addApproveActionListener(list2)
-
-    Test.StartMethod("removeApproveActionListener()")
-
-    oObj.removeApproveActionListener(list1)
-
-    L1called = false
-    L2called = false
-    
-    Out.Log("The action for listener calling must be perfomed interactively")
-    bOK = bOK AND L2called
-    Test.MethodTested("addApproveActionListener()", TRUE)
-
-    bOK = bOK AND NOT L1called
-    Test.MethodTested("removeApproveActionListener()", TRUE)
-
-    oObj.removeApproveActionListener(list2)
-
-    Out.Log("Skipping all XApproveActionBroadcaster methods, since they need user interaction")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-
-Function L1_approveAction() As Boolean
-    L1called = true
-    Out.Log("Listener 1 is called")
-    L1_approveAction = true
-End Function
-
-Function L2_approveAction() As Boolean
-    L2called = true
-    Out.Log("Listener 2 is called")
-    L2_approveAction = true
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/script.xlb
deleted file mode 100644
index 5d5f874e601f..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XApproveActionBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XApproveActionBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XApproveActionBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XBoundComponent/form_XBoundComponent.xba b/qadevOOo/tests/basic/ifc/form/XBoundComponent/form_XBoundComponent.xba
deleted file mode 100644
index 905a7717374e..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XBoundComponent/form_XBoundComponent.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XBoundComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Sub prepareCommit() 
-'       Function checkCommit() As Boolean
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XBoundComponent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("commit()")
-    bOK = true
-    
-    prepareCommit()
-    
-    bOK = bOK AND oObj.commit()
-    
-    bOK = bOK AND checkCommit()
-    Test.MethodTested("commit()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XBoundComponent/script.xlb b/qadevOOo/tests/basic/ifc/form/XBoundComponent/script.xlb
deleted file mode 100644
index 8923e06adb1b..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XBoundComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XBoundComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XBoundComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XBoundControl/form_XBoundControl.xba b/qadevOOo/tests/basic/ifc/form/XBoundControl/form_XBoundControl.xba
deleted file mode 100644
index 8e422769893d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XBoundControl/form_XBoundControl.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XBoundControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XBoundControl
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim old As Boolean, res As Boolean
-
-
-    Test.StartMethod("getLock()")
-    bOK = true
-    old = oObj.getLock()
-    Test.MethodTested("getLock()", bOK)
-
-    Test.StartMethod("setLock()")
-    bOK = true
-    oObj.setLock(NOT old)
-    res = oObj.getLock()
-    bOK = bOK AND (NOT old = res)
-    Test.MethodTested("setLock()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XBoundControl/script.xlb b/qadevOOo/tests/basic/ifc/form/XBoundControl/script.xlb
deleted file mode 100644
index 51aa56875df6..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XBoundControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XBoundControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XBoundControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/form_XChangeBroadcaster.xba b/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/form_XChangeBroadcaster.xba
deleted file mode 100644
index ea8649cafa1f..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/form_XChangeBroadcaster.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XChangeBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XChangeBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim list1 As Object, list2 As Object
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("addChangeListener()")
-    bOK = true
-
-
-    list1 = createUnoListener("L1_", "com.sun.star.form.XChangeListener")
-    list2 = createUnoListener("L2_", "com.sun.star.form.XChangeListener")
-
-    oObj.addChangeListener(list1)
-    oObj.addChangeListener(list2)
-
-    Test.StartMethod("removeChangeListener()")
-
-    oObj.removeChangeListener(list1)
-
-    L1called = false
-    L2called = false
-
-    Out.Log("The action for listener calling must be perfomed interactively")
-
-    bOK = bOK AND L2called
-    Test.MethodTested("addChangeListener()", bOK)
-
-    bOK = bOK AND NOT L1called
-    Test.MethodTested("removeChangeListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim L1called as Boolean
-Dim L2called as Boolean
-
-Sub L1_disposing()
-End Sub
-
-Sub L2_disposing()
-End Sub
-
-Sub L1_changed()
-    L1called = true
-
-End Sub
-
-Sub L2_changed()
-    L2called = true
-
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/script.xlb
deleted file mode 100644
index 0d0a0564d411..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XChangeBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XChangeBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XChangeBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XFormController/form_XFormController.xba b/qadevOOo/tests/basic/ifc/form/XFormController/form_XFormController.xba
deleted file mode 100644
index d36eb98b1bb6..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XFormController/form_XFormController.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XFormController" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global otherWin As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XFormController
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cntrl As Object
-    Dim list1 As Object, list2 As Object
-
-    Test.StartMethod("getCurrentControl()")
-    bOK = true
-    cntrl = oObj.getCurrentControl()
-    bOK = bOK AND NOT isNull(cntrl)
-    Test.MethodTested("getCurrentControl()", bOK)
-
-    Test.StartMethod("addActivateListener()")
-    bOK = true
-    list1 = createUnoListener("L1_", "com.sun.star.form.XFormControllerListener")
-    list2 = createUnoListener("L2_", "com.sun.star.form.XFormControllerListener")
-    oObj.addActivateListener(list1)
-    oObj.addActivateListener(list2)
-
-    Test.StartMethod("removeActivateListener()")
-    oObj.removeActivateListener(list1)
-
-    if NOT hasUnoInterfaces(cntrl, "com.sun.star.awt.XWindow") then
-        Out.Log("The oObj.getCurrentControl() return object doesn't support")
-        Out.Log("com.sun.star.awt.XWindow interface required for testing !!!")
-        Out.Log("Interface test must be redesigned thus !!!")
-    else
-        cntrl.setFocus()
-        wait(500)
-        otherWin.setFocus()
-        wait(500)
-    end if
-
-    Test.MethodTested("addActivateListener()", L2called)
-    Test.MethodTested("removeActivateListener()", _
-        L2called AND NOT L1called)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim L1called As Boolean
-Dim L2called As Boolean
-
-Sub L1_formActivated(ev As Object)
-    L1called = true
-    Out.Log("L1 activated Called !!!!!!!!!")
-end Sub
-
-Sub L1_formDeactivated(ev As Object)
-    L1called = true
-    Out.Log("L1 deactivated Called !!!!!!!!!")
-end Sub
-
-Sub L2_formActivated()
-    L2called = true
-    Out.Log("L2 activated Called !!!!!!!!!")
-end Sub
-
-Sub L2_formDeactivated()
-    L2called = true
-    Out.Log("L2 deactivated Called !!!!!!!!!")
-end Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XFormController/script.xlb b/qadevOOo/tests/basic/ifc/form/XFormController/script.xlb
deleted file mode 100644
index e917316626d8..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XFormController/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XFormController" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XFormController"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XFormsSupplier/form_XFormsSupplier.xba b/qadevOOo/tests/basic/ifc/form/XFormsSupplier/form_XFormsSupplier.xba
deleted file mode 100644
index 7331731b5827..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XFormsSupplier/form_XFormsSupplier.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XFormsSupplier" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XFormsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oForms as Object
-'
-    Test.StartMethod("getForms()")
-    bOK = TRUE
-    oForms = oObj.getForms()
-    bOK = bOK AND hasUnoInterfaces(oForms, "com.sun.star.container.XNameContainer")
-    Test.MethodTested("getForms()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XFormsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/form/XFormsSupplier/script.xlb
deleted file mode 100644
index 40d6cbcd2aa6..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XFormsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XFormsSupplier" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="form_XFormsSupplier"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XGrid/form_XGrid.xba b/qadevOOo/tests/basic/ifc/form/XGrid/form_XGrid.xba
deleted file mode 100644
index 05bf75dda434..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGrid/form_XGrid.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XGrid" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XGrid
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldPos As Long, newPos as Long, getPos as Long
-
-    Test.StartMethod("getCurrentColumnPosition()")
-    Test.StartMethod("setCurrentColumnPosition()")
-
-    bOK = true
-    oldPos = oObj.getCurrentColumnPosition()
-    if oldPos = 0 then newPos = 1 else newPos = 0
-    oObj.setCurrentColumnPosition(newPos)
-    getPos = oObj.getCurrentColumnPosition()
-
-    bOK = bOK AND (newPos = getPos)
-    Out.Log("Position was " + oldPos + ", set to " + newPos + _
-           ", get " + getPos) 
-
-    Test.MethodTested("getCurrentColumnPosition()", bOK)
-    Test.MethodTested("setCurrentColumnPosition()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XGrid/script.xlb b/qadevOOo/tests/basic/ifc/form/XGrid/script.xlb
deleted file mode 100644
index 6cd1f0fe06df..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGrid/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XGrid" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XGrid"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/form_XGridColumnFactory.xba b/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/form_XGridColumnFactory.xba
deleted file mode 100644
index d5a0ee2539b4..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/form_XGridColumnFactory.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XGridColumnFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XGridColumnFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aTypes As Variant
-    Dim nCount As Integer
-
-    Test.StartMethod("createColumn()")
-    bOK = true
-    bOk = bOK AND isObject(oObj.createColumn("CheckBox"))
-    Test.MethodTested("createColumn()", bOK)
-
-    Test.StartMethod("getColumnTypes()")
-    bOK = true
-    bOK = bOK AND (uBound(oObj.getColumnTypes()) &gt;= 1)
-    Test.MethodTested("getColumnTypes()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/script.xlb b/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/script.xlb
deleted file mode 100644
index 601f0fd987d8..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGridColumnFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XGridColumnFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XGridColumnFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/form_XGridFieldDataSupplier.xba b/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/form_XGridFieldDataSupplier.xba
deleted file mode 100644
index 92f9a21b2006..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/form_XGridFieldDataSupplier.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XGridFieldDataSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XGridFieldDataSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim types As Variant
-    Dim data As Variant
-    Dim tmp as String
-    Dim i as Integer
-    Dim fieldCount as Integer
-    Dim row As Long
-    Dim dat As Variant
-
-    Test.StartMethod("queryFieldDataType()")
-    bOK = true
-    types = oObj.queryFieldDataType(oCoreRefl.forName("string"))
-
-    tmp = ""
-    fieldCount = 0
-    for i = lbound(types()) to ubound(types())
-        tmp = tmp + " " + types(i)
-        if types(i) then fieldCount = fieldCount + 1 
-    next i
-    Out.Log("array returned : (" + tmp + ")")
-    bOK = bOK AND (ubound(types()) > 0)
-
-    Test.MethodTested("queryFieldDataType()", bOK)
-
-    Test.StartMethod("queryFieldData()")
-    bOK = true
-    row = 1
-    dat = oObj.queryFieldData(row, oCoreRefl.forName("string"))
-    if isNull(dat) OR isEmpty(dat) then
-        Out.Log("NULL value returned.")
-        bOK = false
-    else
-        Out.Log("The length of array returned :" + (ubound(data()) + 1)
-        bOK = bOK AND ((ubound(data()) + 1) = fieldCount)
-    end if
-    Test.MethodTested("queryFieldData()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/script.xlb b/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/script.xlb
deleted file mode 100644
index 1d5d8440227a..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XGridFieldDataSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XGridFieldDataSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XGridFieldDataSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/form_XImageProducerSupplier.xba b/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/form_XImageProducerSupplier.xba
deleted file mode 100644
index 5bbab625e604..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/form_XImageProducerSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XImageProducerSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XImageProducerSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oProducer As Object
-
-    Test.StartMethod("getImageProducer()")
-    bOK = true
-    oProducer = oObj.getImageProducer()
-    bOK = bOK AND NOT isNull(oProducer)
-    bOK = bOK AND hasUnoInterfaces(oProducer, "com.sun.star.awt.XImageProducer")
-    Test.MethodTested("getImageProducer()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/script.xlb b/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/script.xlb
deleted file mode 100644
index fe2be29da26d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XImageProducerSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XImageProducerSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XImageProducerSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XLoadListener/form_XLoadListener.xba b/qadevOOo/tests/basic/ifc/form/XLoadListener/form_XLoadListener.xba
deleted file mode 100644
index 1e94cd458653..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XLoadListener/form_XLoadListener.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XLoadListener" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XLoadListener
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("loaded()")
-    bOK = true
-    Out.Log("nothing to test here")
-    Test.MethodTested("loaded()", bOK)
-
-    Test.StartMethod("unloading()")
-    bOK = true
-    Out.Log("nothing to test here")
-    Test.MethodTested("unloading()", bOK)
-
-    Test.StartMethod("unloaded()")
-    bOK = true
-    Out.Log("nothing to test here")
-    Test.MethodTested("unloaded()", bOK)
-
-    Test.StartMethod("reloading()")
-    bOK = true
-    Out.Log("nothing to test here")
-    Test.MethodTested("reloading()", bOK)
-
-    Test.StartMethod("reloaded()")
-    bOK = true
-    Out.Log("nothing to test here")
-    Test.MethodTested("reloaded()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XLoadListener/script.xlb b/qadevOOo/tests/basic/ifc/form/XLoadListener/script.xlb
deleted file mode 100644
index 5848d5f258f7..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XLoadListener/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XLoadListener" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XLoadListener"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XLoadable/form_XLoadable.xba b/qadevOOo/tests/basic/ifc/form/XLoadable/form_XLoadable.xba
deleted file mode 100644
index d1d9e77f8f28..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XLoadable/form_XLoadable.xba
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XLoadable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XLoadable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bLoaded As Boolean
-    Dim list As Object
-
-    list = createUnoListener("L_", "com.sun.star.form.XLoadListener")
-    initListener()
-
-    Test.StartMethod("isLoaded()")
-    bOK = true
-    bLoaded = oObj.isLoaded()
-    if bLoaded then  oObj.unload()
-    bLoaded = oObj.isLoaded()
-    bOK = bOK AND NOT bLoaded
-    Test.MethodTested("isLoaded()", bOK)
-
-    Test.StartMethod("addLoadListener()")
-    oObj.addLoadListener(list)
-
-    Test.StartMethod("load()")
-    bOK = true
-    oObj.load()
-    bOK = bOK AND oObj.isLoaded() 
-    bOK = bOK AND loaded
-    Test.MethodTested("load()", bOK)
-
-    Test.StartMethod("reload()")
-    bOK = true
-    oObj.reload()
-    bOK = bOK AND oObj.isLoaded()
-    bOK = bOK AND reloaded
-    Test.MethodTested("reload()", bOK)
-
-    Test.StartMethod("unload()")
-    bOK = true
-    oObj.unload()
-    bOK = bOK AND NOT oObj.isLoaded()
-    bOK = bOK AND unloaded
-    Test.MethodTested("unload()", bOK)
-
-    bOK = loaded AND reloaded AND reloading AND unloaded AND unloading
-    Test.MethodTested("addLoadListener()", bOK)
-
-    Test.StartMethod("removeLoadListener()")
-    bOK = true
-    oObj.removeLoadListener(list)
-    initListener()
-    oObj.load()
-    bOK = bOK AND NOT loaded
-    Test.MethodTested("removeLoadListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub initListener()
-    loaded = false
-    reloaded = false
-    reloading = false
-    unloaded = false
-    unloading = false
-End Sub
-
-Dim loaded As Boolean
-Dim reloaded As Boolean
-Dim reloading As Boolean
-Dim unloaded As Boolean
-Dim unloading As Boolean
-
-Sub L_loaded()
-   Out.Log("Listener: loaded")
-   loaded = true
-End Sub
-Sub L_reloaded()
-   Out.Log("Listener: reloaded")
-   reloaded = true
-End Sub
-Sub L_reloading()
-   Out.Log("Listener: reloading")
-   reloading = true
-End Sub
-Sub L_unloaded()
-   Out.Log("Listener: unloaded")
-   unloaded = true
-End Sub
-Sub L_unloading()
-   Out.Log("Listener: unloading")
-   unloading = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XLoadable/script.xlb b/qadevOOo/tests/basic/ifc/form/XLoadable/script.xlb
deleted file mode 100644
index ca0a5811fed2..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XLoadable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XLoadable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XLoadable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XReset/form_XReset.xba b/qadevOOo/tests/basic/ifc/form/XReset/form_XReset.xba
deleted file mode 100644
index dddd3f2bdc1d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XReset/form_XReset.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XReset" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-Dim nCB1Val as Integer, nCB2Val As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XReset
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1 as Object, oListener2 As Object
-    Dim nCount As Integer
-
-    bOK = true
-    nCount = 0  'oCollection.count
-    nCB1Val = 0
-    nCB2Val = 0
-
-    Out.Log("create two listeners...")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.form.XResetListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.form.XResetListener")
-
-    ' add listeners to objectif initialized
-    if NOT (isNull(oListener1)) then
-        oObj.addResetListener(oListener1)
-    end if
-    if NOT (isNull(oListener2)) then
-        oObj.addResetListener(oListener2)
-    end if
-
-
-    Test.StartMethod("addResetListener()")
-    oObj.reset()
-    wait(1000)
-    bOK = bOK AND (nCB1Val = 1) AND (nCB2Val = 1)
-    Test.MethodTested("addResetListener()", bOK)
-
-    Test.StartMethod("removeResetListener()")
-    Out.Log("removing Listener 2")
-    oObj.removeResetListener(oListener2)
-    oObj.reset()
-    wait(1000)
-    bOK = bOK AND (nCB1Val = 2) AND (nCB2Val = 1)
-    Test.MethodTested("removeResetListener()", bOK)
-
-    Test.StartMethod("reset()")
-    bOK = bOK AND (nCB1Val = 2) AND (nCB2Val = 1)
-    Test.MethodTested("reset()", bOK)
-
-    Out.Log("removing Listener 1")
-    oObj.removeResetListener(oListener1)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-' callback routine called resetting for listener1
-Sub CB1_resetted
-    Out.Log("Callback CB1 resetted")
-    nCB1Val = nCB1Val + 1
-End Sub' callback routine called resetting for listener2
-
-Sub CB2_resetted
-    Out.Log("Callback CB2 resetted")
-    nCB2Val = nCB2Val + 1
-End Sub
-
-' callback routine is invoked before resetting a component.
-Function CB1_approveReset() as Boolean
-    Out.Log("Callback CB1 approve Reset")
-    CB1_approveReset = true
-end Function
-
-Function CB2_approveReset() as Boolean
-    Out.Log("Callback CB2 approve Reset")
-    CB2_approveReset = true
-end Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XReset/script.xlb b/qadevOOo/tests/basic/ifc/form/XReset/script.xlb
deleted file mode 100644
index a50d97e7218d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XReset/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XReset" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XReset"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XSubmit/form_XSubmit.xba b/qadevOOo/tests/basic/ifc/form/XSubmit/form_XSubmit.xba
deleted file mode 100644
index 596faa3e214e..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XSubmit/form_XSubmit.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XSubmit" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XSubmit
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim list1 As Object, list2 As Object
-    Dim event As new com.sun.star.awt.MouseEvent
-
-    Test.StartMethod("addSubmitListener()")
-    
-    l1Called = 0 : l2Called = 0 
-
-    bOK = true
-    list1 = createUnoListener("L1_", "com.sun.star.form.XSubmitListener")
-    list2 = createUnoListener("L2_", "com.sun.star.form.XSubmitListener")
-
-    Out.Log("add two listeners")
-    oObj.addSubmitListener(list1)
-    oObj.addSubmitListener(list2)
-
-    Test.StartMethod("removeSubmitListener()")
-    Out.Log("remove listener 1")
-    oObj.removeSubmitListener(list1)
-
-    Test.StartMethod("submit()")
-
-    l1Called = false
-    l2Called = false
-    
-    oObj.TargetURL = "someserver"
-    oObj.submit(NULL_OBJECT, event)
-    
-    wait(500)
-    
-    Out.Log("Listener1 was called " + l1Called + " times."
-    Out.Log("Listener2 was called " + l2Called + " times."
-
-    Test.MethodTested("addSubmitListener()", l2Called = 1)
-    Test.MethodTested("submit()", l2Called > 0)
-    Test.MethodTested("removeSubmitListener()", l1Called = 0)
-
-    Out.Log("remove listener 2")
-    oObj.removeSubmitListener(list2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim l1Called As Integer
-Dim l2Called As Integer
-
-Function L1_approveSubmit() As Boolean
-    l1Called = l1Called + 1
-    L1_approveSubmit = true
-End Function
-
-Function L2_approveSubmit() As Boolean
-    l2Called = l2Called + 1
-    L2_approveSubmit = true
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XSubmit/script.xlb b/qadevOOo/tests/basic/ifc/form/XSubmit/script.xlb
deleted file mode 100644
index 6950c8f3fac2..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XSubmit/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XSubmit" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XSubmit"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/form_XUpdateBroadcaster.xba b/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/form_XUpdateBroadcaster.xba
deleted file mode 100644
index 818646f50657..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/form_XUpdateBroadcaster.xba
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_XUpdateBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global bCustomUpdate As Boolean
-'       properties are not changed to call listener
-'       Sub UpdateComponent()
-
-'*************************************************************************
-
-
-
-
-Const BOUND = 2
-Const CONSTRAINED = 4
-Const MAYBENULL = 8
-Const READONLY = 16
-
-Dim oListener1 As Object
-Dim oListener2 As Object
-Dim nCB1appVal As Boolean
-Dim nCB2appVal As Boolean
-Dim nCB1updVal As Boolean
-Dim nCB2updVal As Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XUpdateBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bAllOK As Boolean
-
-    Out.Log("Creating Listeners...")
-    oListener1 = createUNOListener("CB1_","com.sun.star.form.XUpdateListener")
-    oListener2 = createUNOListener("CB2_","com.sun.star.form.XUpdateListener")
-    bOK = NOT isNULL(oListener1) AND NOT isNULL(oListener2)
-
-    CountersReset()
-
-    bAllOK = bOK
-
-    Test.StartMethod("addUpdateListener()")
-    bOK = true
-    oObj.addUpdateListener(oListener1)
-    oObj.addUpdateListener(oListener2)
-
-    if bCustomUpdate then 
-		Out.Log("Object specific update function was called.")
-        UpdateComponent()
-    else
-		Out.Log("Interfacetest update function was called.")
-        TryToUpdate()
-    end if
-	wait(1000)
-	
-    bOK = bOK AND nCB1appVal AND nCB2appVal AND nCB1updVal AND nCB2updVal 
-
-    Test.MethodTested("addUpdateListener()", bOK)
-
-    Test.StartMethod("removeUpdateListener()")
-    bOK = true
-    Out.Log("Removing Listener 1")
-    oObj.removeUpdateListener(oListener1)
-    countersReset()
-
-    if bCustomUpdate then 
-		Out.Log("Object specific update function was called.")
-        UpdateComponent()
-    else
-		Out.Log("Interfacetest update function was called.")
-        TryToUpdate()
-    end if
-	wait(1000)
-
-    bOK = bOK AND NOT nCB1appVal AND nCB2appVal AND NOT nCB1updVal AND nCB2updVal 
-    Test.MethodTested("removeUpdateListener()", bOK)
-
-    Out.Log("Removing Listener 2")
-    oObj.removeUpdateListener(oListener2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function CB1_approveUpdate As Boolean
-    Out.Log("CallBack for Listener1 approveUpdate was called.")
-    nCB1appVal = TRUE
-    CB1_approveUpdate = TRUE
-End Function
-
-Function CB2_approveUpdate As Boolean
-    Out.Log("CallBack for Listener2 approveUpdate was called.")
-    nCB2appVal = TRUE
-    CB2_approveUpdate = TRUE
-End Function
-
-Sub CB1_Updated
-    Out.Log("CallBack for Listener1 Updated was called.")
-    nCB1updVal = TRUE
-End Sub
-
-Sub CB2_Updated
-    Out.Log("CallBack for Listener2 Updated was called.")
-    nCB2updVal = TRUE
-End Sub
-
-Sub TryToUpdate()
-    Dim i as Integer
-    Dim props as Variant, attr As Variant
-
-    if hasUnoInterfaces(oObj, "com.sun.star.beans.XPropertySet") then
-        props() = oObj.getPropertySetInfo().getProperties()
-        
-        for i = lbound(props()) to ubound(props())
-            PropertyTester.TestProperty(props(i).Name)
-        next i
-    else
-        Out.Log("XPropertySet isn't supported.")
-    end if
-End Sub
-
-Sub countersReset()
-    nCB1updVal = FALSE
-    nCB2updVal = FALSE
-    nCB1appVal = FALSE
-    nCB2appVal = FALSE
-End sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/script.xlb
deleted file mode 100644
index d0484c6b2661..000000000000
--- a/qadevOOo/tests/basic/ifc/form/XUpdateBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_XUpdateBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_XUpdateBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CheckBox/form_component_CheckBox.xba b/qadevOOo/tests/basic/ifc/form/component/CheckBox/form_component_CheckBox.xba
deleted file mode 100644
index 9ef151888d79..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CheckBox/form_component_CheckBox.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_CheckBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.CheckBox
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultState")
-
-    PropertyTester.TestProperty("RefValue")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CheckBox/script.xlb b/qadevOOo/tests/basic/ifc/form/component/CheckBox/script.xlb
deleted file mode 100644
index e67dd95c1988..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CheckBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_CheckBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_CheckBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ComboBox/form_component_ComboBox.xba b/qadevOOo/tests/basic/ifc/form/component/ComboBox/form_component_ComboBox.xba
deleted file mode 100644
index fd80cd4913f9..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ComboBox/form_component_ComboBox.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_ComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.ComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultText")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ComboBox/script.xlb b/qadevOOo/tests/basic/ifc/form/component/ComboBox/script.xlb
deleted file mode 100644
index 9add91431d91..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_ComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_ComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CommandButton/form_component_CommandButton.xba b/qadevOOo/tests/basic/ifc/form/component/CommandButton/form_component_CommandButton.xba
deleted file mode 100644
index 937c8010fe17..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CommandButton/form_component_CommandButton.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_CommandButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.CommandButton
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim n as Integer
-
-    Test.StartMethod("ButtonType")
-    bOK = true
-    Dim ButtonTypes(4) as Variant
-    ButtonTypes(0) = com.sun.star.form.FormButtonType.PUSH
-    ButtonTypes(1) = com.sun.star.form.FormButtonType.SUBMIT
-    ButtonTypes(2) = com.sun.star.form.FormButtonType.URL
-    ButtonTypes(3) = com.sun.star.form.FormButtonType.RESET
-    
-    for n = 0 to ubound(ButtonTypes())-1
-        oObj.setPropertyValue("ButtonType", _
-                                        createUnoValue("byte", ButtonTypes(n)))
-        bOK = bOK AND (oObj.getPropertyValue("ButtonType") = ButtonTypes(n))
-    next
-
-    Test.MethodTested("ButtonType", bOK)
-    
-    PropertyTester.TestProperty("TargetFrame")
-
-    PropertyTester.TestProperty("TargetURL")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CommandButton/script.xlb b/qadevOOo/tests/basic/ifc/form/component/CommandButton/script.xlb
deleted file mode 100644
index 461782f0c8b5..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CommandButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_CommandButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_CommandButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CurrencyField/form_component_CurrencyField.xba b/qadevOOo/tests/basic/ifc/form/component/CurrencyField/form_component_CurrencyField.xba
deleted file mode 100644
index d728c99eb801..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CurrencyField/form_component_CurrencyField.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_CurrencyField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.CurrencyField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Double
-
-    bOK = true
-    oldVal = oObj.DefaultValue
-    Test.StartMethod("DefaultValue")
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 30) then 
-        oObj.DefaultValue = 30
-    else
-        oObj.DefaultValue = 35
-    endif
-    newVal = oObj.DefaultValue
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("DefaultValue", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/CurrencyField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/CurrencyField/script.xlb
deleted file mode 100644
index ed12a18c8d2f..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/CurrencyField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_CurrencyField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_CurrencyField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DataForm/form_component_DataForm.xba b/qadevOOo/tests/basic/ifc/form/component/DataForm/form_component_DataForm.xba
deleted file mode 100644
index 40d43ad36c84..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DataForm/form_component_DataForm.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DataForm" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DataForm
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("MasterFields")
-
-    PropertyTester.TestProperty("DetailFields")
-
-    Test.StartMethod("Cycle")
-    bOK = true
-
-    oObj.Cycle = com.sun.star.form.TabulatorCycle.RECORDS
-    bOK = bOK AND oObj.Cycle = com.sun.star.form.TabulatorCycle.RECORDS
-
-    oObj.Cycle = com.sun.star.form.TabulatorCycle.CURRENT
-    bOK = bOK AND oObj.Cycle = com.sun.star.form.TabulatorCycle.CURRENT
-
-    Test.MethodTested("Cycle", bOK)
-
-    Test.StartMethod("NavigationBarMode")
-    bOK = true
-
-    oObj.NavigationBarMode = com.sun.star.form.NavigationBarMode.NONE
-    bOK = bOK AND oObj.NavigationBarMode = com.sun.star.form.NavigationBarMode.NONE
-
-    oObj.NavigationBarMode = com.sun.star.form.NavigationBarMode.CURRENT
-    bOK = bOK AND oObj.NavigationBarMode = com.sun.star.form.NavigationBarMode.CURRENT
-
-    Test.MethodTested("NavigationBarMode", bOK)
-
-    PropertyTester.TestProperty("AllowInserts")
-
-    PropertyTester.TestProperty("AllowUpdates")
-
-    PropertyTester.TestProperty("AllowDeletes")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DataForm/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DataForm/script.xlb
deleted file mode 100644
index 664644c5a8e7..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DataForm/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DataForm" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DataForm"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/form_component_DatabaseComboBox.xba b/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/form_component_DatabaseComboBox.xba
deleted file mode 100644
index 2e7fea0b24ac..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/form_component_DatabaseComboBox.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabaseComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabaseComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ConvertEmptyToNull")
-
-    PropertyTester.TestProperty("ListSource")
-
-    PropertyTester.TestProperty("ListSourceType")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/script.xlb
deleted file mode 100644
index 9a13df9ecbaf..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabaseComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabaseComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/form_component_DatabaseFormattedField.xba b/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/form_component_DatabaseFormattedField.xba
deleted file mode 100644
index 04d2e1c889c4..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/form_component_DatabaseFormattedField.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabaseFormattedField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabaseFormattedField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ConvertEmptyToNull")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/script.xlb
deleted file mode 100644
index d7a0d5757768..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseFormattedField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabaseFormattedField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabaseFormattedField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/form_component_DatabaseImageControl.xba b/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/form_component_DatabaseImageControl.xba
deleted file mode 100644
index 728949a09f2f..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/form_component_DatabaseImageControl.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabaseImageControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabaseImageControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ReadOnly")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/script.xlb
deleted file mode 100644
index a83e10101fba..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseImageControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabaseImageControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabaseImageControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/form_component_DatabaseListBox.xba b/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/form_component_DatabaseListBox.xba
deleted file mode 100644
index de6ec59f2c4a..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/form_component_DatabaseListBox.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabaseListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabaseListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Variant
-
-    bOK = true
-    oldVal = oObj.BoundColumn
-    Test.StartMethod("BoundColumn")
-    Out.Log("value before: "+oldVal)
-    
-    if (oldVal &lt;&gt; 30) then 
-        oObj.BoundColumn = 30
-    else
-        oObj.BoundColumn = 35
-    endif
-    
-    newVal = oObj.BoundColumn
-    Out.Log("value after: "+newVal)
-    
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("BoundColumn", bOK)
-    
-    PropertyTester.TestProperty("ListSourceType")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/script.xlb
deleted file mode 100644
index 7f028d823990..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabaseListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabaseListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/form_component_DatabasePatternField.xba b/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/form_component_DatabasePatternField.xba
deleted file mode 100644
index c8293ba62987..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/form_component_DatabasePatternField.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabasePatternField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabasePatternField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ConvertEmptyToNull")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/script.xlb
deleted file mode 100644
index 143700c9c972..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabasePatternField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabasePatternField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabasePatternField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/form_component_DatabaseTextField.xba b/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/form_component_DatabaseTextField.xba
deleted file mode 100644
index 8881952ded1d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/form_component_DatabaseTextField.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DatabaseTextField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DatabaseTextField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ConvertEmptyToNull")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/script.xlb
deleted file mode 100644
index 7b30d30e1de3..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DatabaseTextField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DatabaseTextField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DatabaseTextField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DateField/form_component_DateField.xba b/qadevOOo/tests/basic/ifc/form/component/DateField/form_component_DateField.xba
deleted file mode 100644
index 2f8be6b80641..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DateField/form_component_DateField.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_DateField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.DateField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Long
-
-    Test.StartMethod("DefaultDate")
-    bOK = true
-    oldVal = oObj.DefaultDate
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 111111) then 
-        oObj.DefaultDate = 111111
-    else
-        oObj.DefaultDate = 222222
-    endif
-    newVal = oObj.DefaultDate
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("DefaultDate", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/DateField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/DateField/script.xlb
deleted file mode 100644
index 4d8344ba21c9..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/DateField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_DateField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_DateField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/FileControl/form_component_FileControl.xba b/qadevOOo/tests/basic/ifc/form/component/FileControl/form_component_FileControl.xba
deleted file mode 100644
index 002b38e433b0..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/FileControl/form_component_FileControl.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_FileControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.FileControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultText")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/FileControl/script.xlb b/qadevOOo/tests/basic/ifc/form/component/FileControl/script.xlb
deleted file mode 100644
index 642acb13e896..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/FileControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_FileControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_FileControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/GridControl/form_component_GridControl.xba b/qadevOOo/tests/basic/ifc/form/component/GridControl/form_component_GridControl.xba
deleted file mode 100644
index e35443864828..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/GridControl/form_component_GridControl.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_GridControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.GridControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("Border")
-
-    PropertyTester.TestProperty("Enabled")
-
-    PropertyTester.TestProperty("FontDescriptor")
-
-    PropertyTester.TestProperty("RowHeight")
-
-    PropertyTester.TestProperty("Tabstop")
-
-    PropertyTester.TestProperty("TextColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/GridControl/script.xlb b/qadevOOo/tests/basic/ifc/form/component/GridControl/script.xlb
deleted file mode 100644
index f1a7c5df658f..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/GridControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_GridControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_GridControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/HTMLForm/form_component_HTMLForm.xba b/qadevOOo/tests/basic/ifc/form/component/HTMLForm/form_component_HTMLForm.xba
deleted file mode 100644
index e6f3b9711297..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/HTMLForm/form_component_HTMLForm.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_HTMLForm" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.HTMLForm
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("TargetFrame")
-
-    PropertyTester.TestProperty("TargetURL")
-
-    Test.StartMethod("SubmitMethod")
-    bOK = true
-
-    oObj.SubmitMethod = com.sun.star.form.FormSubmitMethod.GET
-    bOK = bOK AND oObj.SubmitMethod = com.sun.star.form.FormSubmitMethod.GET
-
-    oObj.SubmitMethod = com.sun.star.form.FormSubmitMethod.POST
-    bOK = bOK AND oObj.SubmitMethod = com.sun.star.form.FormSubmitMethod.POST
-
-    Test.MethodTested("SubmitMethod", bOK)
-
-    Test.StartMethod("SubmitEncoding")
-    bOK = true
-
-    oObj.SubmitEncoding = com.sun.star.form.FormSubmitEncoding.URL
-    bOK = bOK AND oObj.SubmitEncoding = com.sun.star.form.FormSubmitEncoding.URL
-
-    oObj.SubmitEncoding = com.sun.star.form.FormSubmitEncoding.MULTIPART
-    bOK = bOK AND oObj.SubmitEncoding = com.sun.star.form.FormSubmitEncoding.MULTIPART
-
-    Test.MethodTested("SubmitEncoding", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/HTMLForm/script.xlb b/qadevOOo/tests/basic/ifc/form/component/HTMLForm/script.xlb
deleted file mode 100644
index 002789e0051e..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/HTMLForm/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_HTMLForm" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_HTMLForm"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/HiddenControl/form_component_HiddenControl.xba b/qadevOOo/tests/basic/ifc/form/component/HiddenControl/form_component_HiddenControl.xba
deleted file mode 100644
index 58e460bc3651..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/HiddenControl/form_component_HiddenControl.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_HiddenControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.HiddenControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("HiddenValue")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/HiddenControl/script.xlb b/qadevOOo/tests/basic/ifc/form/component/HiddenControl/script.xlb
deleted file mode 100644
index 4a6708a28552..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/HiddenControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_HiddenControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_HiddenControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ImageButton/form_component_ImageButton.xba b/qadevOOo/tests/basic/ifc/form/component/ImageButton/form_component_ImageButton.xba
deleted file mode 100644
index 217989a6c0be..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ImageButton/form_component_ImageButton.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_ImageButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.ImageButton
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    Test.StartMethod("ButtonType")
-    bOK = true
-
-    oObj.ButtonType = com.sun.star.form.FormButtonType.PUSH
-    bOK = bOK AND oObj.ButtonType = com.sun.star.form.FormButtonType.PUSH
-
-    oObj.ButtonType = com.sun.star.form.FormButtonType.SUBMIT
-    bOK = bOK AND oObj.ButtonType = com.sun.star.form.FormButtonType.SUBMIT
-
-    Test.MethodTested("ButtonType", bOK)
-
-    PropertyTester.TestProperty("TargetFrame")
-
-    PropertyTester.TestProperty("TargetURL")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ImageButton/script.xlb b/qadevOOo/tests/basic/ifc/form/component/ImageButton/script.xlb
deleted file mode 100644
index 3a543d2069ad..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ImageButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_ImageButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_ImageButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ListBox/form_component_ListBox.xba b/qadevOOo/tests/basic/ifc/form/component/ListBox/form_component_ListBox.xba
deleted file mode 100644
index dd3859fd789d..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ListBox/form_component_ListBox.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_ListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.ListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Variant
-
-    bOK = true
-    Test.StartMethod("DefaultSelection")
-
-    oldVal = oObj.DefaultSelection(0)
-    Out.Log("value before: "+oldVal)
-    
-    if (oldVal &lt;&gt; 3) then 
-        Out.Log("setting to 3")
-        oObj.DefaultSelection = Array(3)
-    else
-        Out.Log("setting to 5")
-        oObj.DefaultSelection = Array(5)
-    endif
-    
-    newVal = oObj.DefaultSelection(0)
-    Out.Log("value after: "+newVal)
-    
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("DefaultSelection", bOK)
-
-    
-    PropertyTester.TestProperty("ListSource")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/ListBox/script.xlb b/qadevOOo/tests/basic/ifc/form/component/ListBox/script.xlb
deleted file mode 100644
index 10420c2c5b72..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/ListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_ListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_ListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/NumericField/form_component_NumericField.xba b/qadevOOo/tests/basic/ifc/form/component/NumericField/form_component_NumericField.xba
deleted file mode 100644
index 3346a612858b..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/NumericField/form_component_NumericField.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_NumericField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.NumericField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Variant
-
-    bOK = true
-    Test.StartMethod("DefaultValue")
-    oldVal = oObj.DefaultValue
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 3) then 
-        Out.Log("setting to 3")
-        oObj.DefaultValue = 3
-    else
-        Out.Log("setting to 5")
-        oObj.DefaultValue = 5
-    endif
-    newVal = oObj.DefaultValue
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("DefaultValue", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/NumericField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/NumericField/script.xlb
deleted file mode 100644
index 078c55194b6a..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/NumericField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_NumericField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_NumericField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/PatternField/form_component_PatternField.xba b/qadevOOo/tests/basic/ifc/form/component/PatternField/form_component_PatternField.xba
deleted file mode 100644
index 154b73b09bae..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/PatternField/form_component_PatternField.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_PatternField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.PatternField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultText")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/PatternField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/PatternField/script.xlb
deleted file mode 100644
index 6c5bdae42648..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/PatternField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_PatternField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_PatternField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/RadioButton/form_component_RadioButton.xba b/qadevOOo/tests/basic/ifc/form/component/RadioButton/form_component_RadioButton.xba
deleted file mode 100644
index 7f3f60369f5e..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/RadioButton/form_component_RadioButton.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_RadioButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.RadioButton
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultState")
-
-    PropertyTester.TestProperty("RefValue")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/RadioButton/script.xlb b/qadevOOo/tests/basic/ifc/form/component/RadioButton/script.xlb
deleted file mode 100644
index f51b6fb36ba2..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/RadioButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_RadioButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_RadioButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/TextField/form_component_TextField.xba b/qadevOOo/tests/basic/ifc/form/component/TextField/form_component_TextField.xba
deleted file mode 100644
index 03f0215bbe96..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/TextField/form_component_TextField.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_TextField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.TextField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DefaultText")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/TextField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/TextField/script.xlb
deleted file mode 100644
index c6725494a9ee..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/TextField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_TextField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_TextField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/form/component/TimeField/form_component_TimeField.xba b/qadevOOo/tests/basic/ifc/form/component/TimeField/form_component_TimeField.xba
deleted file mode 100644
index 35ad56c293ae..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/TimeField/form_component_TimeField.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="form_component_TimeField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.form.component.TimeField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newVal, oldVal As Long
-
-    bOK = true
-    oldVal = oObj.DefaultTime
-    Test.StartMethod("DefaultTime")
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 4322) then 
-        oObj.DefaultTime = 4321
-    else
-        oObj.DefaultTime = 4322
-    endif
-    newVal = oObj.DefaultTime
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("DefaultTime", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/form/component/TimeField/script.xlb b/qadevOOo/tests/basic/ifc/form/component/TimeField/script.xlb
deleted file mode 100644
index 8ad20ef90241..000000000000
--- a/qadevOOo/tests/basic/ifc/form/component/TimeField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="form_component_TimeField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="form_component_TimeField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/formula/FormulaProperties/formula_FormulaProperties.xba b/qadevOOo/tests/basic/ifc/formula/FormulaProperties/formula_FormulaProperties.xba
deleted file mode 100644
index 73a22a3c7991..000000000000
--- a/qadevOOo/tests/basic/ifc/formula/FormulaProperties/formula_FormulaProperties.xba
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="formula_FormulaProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.formula.FormulaProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim align(1) As Integer
-
-    align(0) = 1
-    align(1) = 0
-    
-    PropertyTester.TestProperty("Alignment",align())
-
-    PropertyTester.TestProperty("BaseFontHeight")
-
-    PropertyTester.TestProperty("CustomFontNameFixed")
-
-    PropertyTester.TestProperty("FontFixedIsItalic")
-
-    PropertyTester.TestProperty("FontFixedIsBold")
-
-    PropertyTester.TestProperty("CustomFontNameSans")
-
-    PropertyTester.TestProperty("FontSansIsItalic")
-
-    PropertyTester.TestProperty("FontSansIsBold")
-
-    PropertyTester.TestProperty("CustomFontNameSerif")
-
-    PropertyTester.TestProperty("FontSerifIsItalic")
-
-    PropertyTester.TestProperty("FontSerifIsBold")
-
-    PropertyTester.TestProperty("FontNameFunctions")
-
-    PropertyTester.TestProperty("FontFunctionsIsItalic")
-
-    PropertyTester.TestProperty("FontFunctionsIsBold")
-
-    PropertyTester.TestProperty("FontNameNumbers")
-
-    PropertyTester.TestProperty("FontNumbersIsItalic")
-
-    PropertyTester.TestProperty("FontNumbersIsBold")
-
-    PropertyTester.TestProperty("FontNameText")
-
-    PropertyTester.TestProperty("FontTextIsItalic")
-
-    PropertyTester.TestProperty("FontTextIsBold")
-
-    PropertyTester.TestProperty("FontNameVariables")
-
-    PropertyTester.TestProperty("FontVariablesIsItalic")
-
-    PropertyTester.TestProperty("FontVariablesIsBold")
-
-    PropertyTester.TestProperty("Formula")
-
-    PropertyTester.TestProperty("IsScaleAllBrackets")
-
-    PropertyTester.TestProperty("IsTextMode")
-
-    PropertyTester.TestProperty("RelativeFontHeightFunctions")
-
-    PropertyTester.TestProperty("RelativeFontHeightIndices")
-
-    PropertyTester.TestProperty("RelativeFontHeightLimits")
-
-    PropertyTester.TestProperty("RelativeFontHeightOperators")
-
-    PropertyTester.TestProperty("RelativeFontHeightText")
-
-    PropertyTester.TestProperty("RelativeBracketDistance")
-
-    PropertyTester.TestProperty("RelativeBracketExcessSize")
-
-    PropertyTester.TestProperty("RelativeFractionBarExcessLength")
-
-    PropertyTester.TestProperty("RelativeFractionBarLineWeight")
-
-    PropertyTester.TestProperty("RelativeFractionDenominatorDepth")
-
-    PropertyTester.TestProperty("RelativeFractionNumeratorHeight")
-
-    PropertyTester.TestProperty("RelativeIndexSubscript")
-
-    PropertyTester.TestProperty("RelativeIndexSuperscript")
-
-    PropertyTester.TestProperty("RelativeLineSpacing")
-
-    PropertyTester.TestProperty("RelativeLowerLimitDistance")
-
-    PropertyTester.TestProperty("RelativeMatrixColumnSpacing")
-
-    PropertyTester.TestProperty("RelativeMatrixLineSpacing")
-
-    PropertyTester.TestProperty("RelativeOperatorExcessSize")
-
-    PropertyTester.TestProperty("RelativeOperatorSpacing")
-
-    PropertyTester.TestProperty("RelativeRootSpacing")
-
-    PropertyTester.TestProperty("RelativeScaleBracketExcessSize")
-
-    PropertyTester.TestProperty("RelativeSpacing")
-
-    PropertyTester.TestProperty("RelativeSymbolMinimumHeight")
-
-    PropertyTester.TestProperty("RelativeSymbolPrimaryHeight")
-
-    PropertyTester.TestProperty("RelativeUpperLimitDistance")
-
-    PropertyTester.TestProperty("TopMargin")
-
-    PropertyTester.TestProperty("BottomMargin")
-
-    PropertyTester.TestProperty("LeftMargin")
-
-    PropertyTester.TestProperty("RightMargin")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/formula/FormulaProperties/script.xlb b/qadevOOo/tests/basic/ifc/formula/FormulaProperties/script.xlb
deleted file mode 100644
index 5046056bdcd1..000000000000
--- a/qadevOOo/tests/basic/ifc/formula/FormulaProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="formula_FormulaProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="formula_FormulaProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/Frame/frame_Frame.xba b/qadevOOo/tests/basic/ifc/frame/Frame/frame_Frame.xba
deleted file mode 100644
index 8c7a29c93f72..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/Frame/frame_Frame.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_Frame" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.Frame
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-'
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("RecorderSupplier")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/Frame/script.xlb b/qadevOOo/tests/basic/ifc/frame/Frame/script.xlb
deleted file mode 100644
index cdac70151a1c..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/Frame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_Frame" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="frame_Frame"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XComponentLoader/frame_XComponentLoader.xba b/qadevOOo/tests/basic/ifc/frame/XComponentLoader/frame_XComponentLoader.xba
deleted file mode 100644
index d731c3e1a766..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XComponentLoader/frame_XComponentLoader.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XComponentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XComponentLoader
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim frameName As String
-    Dim doc As Object
-
-    Test.StartMethod("loadComponentFromURL()")
-    bOK = true
-    frameName = "_blank"
-
-    Dim szArgs(0) As new com.sun.star.beans.PropertyValue
-    szArgs(0).Name = "OpenFlags"
-    szArgs(0).Value = "S"
-    szArgs(0).Handle = -1
-    szArgs(0).State = com.sun.star.beans.PropertyState.DEFAULT_VALUE
-
-    Out.log("load a blank impress doc")
-    doc = oObj.loadComponentFromURL("private:factory/simpress", frameName, 0, szArgs())
-    bOK = Not isNull(doc)
-    Out.log("disposing impress doc")
-    doc.dispose()
-
-    Dim szEmptyArgs()
-
-    Out.log("load a blank writer doc")
-    doc = oObj.loadComponentFromURL("private:factory/swriter", frameName, 0, szEmptyArgs())
-    bOK = bOK and Not isNull(doc)
-    Out.log("disposing writer doc")
-    doc.dispose()
-
-    Out.log("load a blank calc doc")
-    doc = oObj.loadComponentFromURL("private:factory/scalc", frameName, 0, szEmptyArgs())
-    bOK = bOK and Not isNull(doc)
-    Out.log("disposing calc doc")
-    doc.dispose()
-
-    Out.log("load a blank draw doc")
-    doc = oObj.loadComponentFromURL("private:factory/sdraw", frameName, 0, szEmptyArgs())
-    bOK = bOK and Not isNull(doc)
-    Out.log("disposing draw doc")
-    doc.dispose()
-
-    Out.log("load a blank math doc")
-    oDoc = oObj.loadComponentFromURL("private:factory/smath", frameName, 0, szEmptyArgs())
-    bOK = bOK and Not isNull(doc)
-    Out.log("disposing math doc")
-    doc.dispose()
-
-    Out.log("load a blank  chart doc")
-    oDoc = oObj.loadComponentFromURL("private:factory/schart", frameName, 0, szEmptyArgs())
-    bOK = bOK and Not isNull(doc)
-    Out.log("disposing schart doc")
-    doc.dispose()
-
-    Test.MethodTested("loadComponentFromURL()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XComponentLoader/script.xlb b/qadevOOo/tests/basic/ifc/frame/XComponentLoader/script.xlb
deleted file mode 100644
index 47e576eca7ca..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XComponentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XComponentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XComponentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XController/frame_XController.xba b/qadevOOo/tests/basic/ifc/frame/XController/frame_XController.xba
deleted file mode 100644
index 31c2e434ca73..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XController/frame_XController.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XController" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oFrameToAttach As Object
-'     - Global oModelToAttach As Object
-'     - Global bHasNoViewData As Boolean
-'     - Global oObjToSuspend As Object
-'     - Global bHasNoModel As Boolean
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XController
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getViewData()")
-    bOK = true
-    if (bHasNoViewData) then
-    	Out.Log("This object has no ViewData - nothing to test")
-    else
-    	oViewData = oObj.getViewData()
-    	bOK = bOK AND NOT isNULL(oViewData)
-    end if
-    Test.MethodTested("getViewData()", bOK)
-
-    Test.StartMethod("restoreViewData()")
-    bOK = true
-    if (bHasNoViewData) then
-    	Out.Log("This object has no ViewData - nothing to test")
-    else
-	    oObj.restoreViewData(oViewData)
-    end if
-    Test.MethodTested("restoreViewData()", bOK)
-
-    Test.StartMethod("getFrame()")
-    bOK = true
-    oFrame = oObj.getFrame()
-    bOK = bOK AND hasUnoInterfaces(oFrame, "com.sun.star.frame.XFrame")
-    Test.MethodTested("getFrame()", bOK)
-
-    Test.StartMethod("getModel()")
-    bOK = true
-    oModel = oObj.getModel()
-    if (bHasNoModel) then
-        bOK = bOK AND isNull(oModel)
-        Out.Log("The object has no Model. Retunrned value must be NULL") 
-    else
-        bOK = bOK AND NOT isNull(oModel) AND hasUnoInterfaces(oModel, "com.sun.star.frame.XModel")
-    end if
-    Test.MethodTested("getModel()", bOK)
-
-    Test.StartMethod("attachFrame()")
-    bOK = true
-    Dim attachedFrame As Object
-    attachedFrame = oObj.getFrame()
-    oFrameToAttach.Name = "XController"
-    oObj.attachFrame(oFrameToAttach)
-    bOK = bOK AND oObj.getFrame.Name = oFrameToAttach.Name
-    ' return previous frame.
-    oObj.attachFrame(attachedFrame)
-    Test.MethodTested("attachFrame()", bOK)
-
-    Test.StartMethod("attachModel()")
-    bOK = true
-    if bHasNoModel then
-        Out.Log("The object has no Model. Nothing to test.") 
-    else    
-        oObj.attachModel(oModelToAttach)
-        if isNull(oObj.getModel()) then
-           Out.Log("The model is NULL after setModel() call")
-           bOK = false
-        else
-            bOK = bOK AND oModelToAttach.location = oObj.getModel.location
-        end if
-    end if
-    Test.MethodTested("attachModel()", bOK)
-
-    Test.StartMethod("suspend()")
-    bOK = true
-    bOK = bOK AND oObjToSuspend.suspend(true)
-    Test.MethodTested("suspend()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XController/script.xlb b/qadevOOo/tests/basic/ifc/frame/XController/script.xlb
deleted file mode 100644
index 3f34e466dd72..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XController/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XController" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XController"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDesktop/frame_XDesktop.xba b/qadevOOo/tests/basic/ifc/frame/XDesktop/frame_XDesktop.xba
deleted file mode 100644
index 35e5201add01..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDesktop/frame_XDesktop.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDesktop" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDesktop
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Test.StartMethod("getComponents()")
-    bOK = true
-    Dim components As Object
-    components = oObj.getComponents()
-    if (Not isNull(components)) then
-        Dim enum As Object
-        enum = components.createEnumeration()
-        while(enum.hasMoreElements())
-            enum.nextElement()
-        wend
-        bOK = true
-    else
-        bOK = false
-    end if
-    Test.MethodTested("getComponents()", bOK)
-
-    Test.StartMethod("terminate()")
-    bOK = true
-    Test.MethodTested("terminate()", bOK)
-
-    Test.StartMethod("addTerminateListener()")
-    bOK = true
-    Test.MethodTested("addTerminateListener()", bOK)
-
-    Test.StartMethod("removeTerminateListener()")
-    bOK = true
-    Test.MethodTested("removeTerminateListener()", bOK)
-
-    Test.StartMethod("getCurrentComponent()")
-    bOK = true
-    Dim curComp As Object
-    curComp = oObj.getCurrentComponent()
-    bOK = Not isNull(curComp)
-    Test.MethodTested("getCurrentComponent()", bOK)
-
-    Test.StartMethod("getCurrentFrame()")
-    bOK = true
-    Dim curFrame As Object
-    curFrame = oObj.getCurrentFrame()
-    bOK = Not isNull(curFrame)
-    Test.MethodTested("getCurrentFrame()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDesktop/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDesktop/script.xlb
deleted file mode 100644
index 8fc67d07830b..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDesktop/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDesktop" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDesktop"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatch/frame_XDispatch.xba b/qadevOOo/tests/basic/ifc/frame/XDispatch/frame_XDispatch.xba
deleted file mode 100644
index d373311716b8..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatch/frame_XDispatch.xba
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDispatch" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global dispatchURL As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDispatch
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim listener1 As Object, listener2 As Object
-    Dim URL As New com.sun.star.util.URL
-    
-    URL.Complete = dispatchURL
-
-    Out.Log("Dispatch URL is '" + dispatchURL + "'")
-    if isNull(oObj) then Out.Log("Component is NULL !!!!")
-
-    Test.StartMethod("addStatusListener()")
-    listener1 = createUnoListener("SL1_", "com.sun.star.frame.XStatusListener")
-    listener2 = createUnoListener("SL2_", "com.sun.star.frame.XStatusListener")
-
-    if NOT(isNull(listener1) OR isNull(listener2)) then 
-        Out.Log("Listeners were created")
-    else
-        Out.Log("Listeners were NOT created !!!")
-    EndIf
-
-    oObj.addStatusListener(listener1, URL)
-    oObj.addStatusListener(listener2, URL)
-    Out.Log("Listeners were added")
-
-    Test.StartMethod("removeStatusListener()")
-    oObj.removeStatusListener(listener1, URL)
-
-    Test.StartMethod("dispatch()")
-
-    SL1Called = false
-    SL2Called = false
-
-    Out.Log("Dispatching ...")
-    oObj.dispatch(URL, DimArray())
-    wait(500)
-    Out.Log("Dispatched.")
-    Test.MethodTested("dispatch()", true)
-
-    bOK = SL2Called
-    Test.MethodTested("addStatusListener()", bOK)
-    bOK = bOK AND NOT SL1Called
-    Test.MethodTested("removeStatusListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim SL1Called As Boolean
-Dim SL2Called As Boolean
-
-Sub SL1_StatusChanged(ev As Variant)
-    SL1Called = true
-    Out.Log("SL1_StatusChanged() called.")
-End Sub
-
-Sub SL2_StatusChanged(ev As Variant)
-    SL2Called = true
-    Out.Log("SL2_StatusChanged() called.")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatch/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDispatch/script.xlb
deleted file mode 100644
index ef87a042701b..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatch/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDispatch" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDispatch"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/frame_XDispatchProvider.xba b/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/frame_XDispatchProvider.xba
deleted file mode 100644
index 75cdafc27a6d..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/frame_XDispatchProvider.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDispatchProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global dispatchUrl As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDispatchProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim url As new com.sun.star.util.URL
-    Dim dispatcher As Object
-    Dim descriptors(1) As new com.sun.star.frame.DispatchDescriptor
-    Dim dispatchers As Variant
-
-    Out.Log("Using Url for dispatch : " + dispatchUrl)
-
-    url.Complete = dispatchUrl
-
-    Dim oURLTransformer As Object
-    oURLTransformer = createUnoService("com.sun.star.util.URLTransformer")
-    Dim aUrl As Variant
-    aUrl = Array(url)
-    oURLTransformer.parseStrict(aUrl)
-
-    Test.StartMethod("queryDispatch()")
-    dispatcher = oObj.queryDispatch(aUrl(0), "frame", _
-        com.sun.star.frame.FrameSearchFlag.ALL)
-    bOK = NOT isNull(dispatcher)
-    Out.Log("Dispatch is null : " + isNull(dispatcher))
-    bOK = bOK AND hasUnoInterfaces(dispatcher, "com.sun.star.frame.XDispatch")
-    Test.MethodTested("queryDispatch()", bOK)
-
-    Test.StartMethod("queryDispatches()")
-    bOK = true
-    descriptors(0).FeatureURL = url
-    descriptors(0).FrameName = "Frame1"
-    descriptors(0).SearchFlags = com.sun.star.frame.FrameSearchFlag.ALL
-    descriptors(1).FeatureURL = url
-    descriptors(1).FrameName = "Frame2"
-    descriptors(1).SearchFlags = com.sun.star.frame.FrameSearchFlag.ALL
-    dispatchers = oObj.queryDispatches(descriptors())
-    if isArray(dispatchers) then
-       if ubound(descriptors()) &lt;&gt; ubound(dispatchers()) then
-          bOK = false
-          Out.Log("Number of returned dispatchers : " + _
-              ubound(dispatchers()) + " - FAILED")
-       endIf
-    else
-       bOK = false
-       Out.Log("Returned value is not Array")
-    EndIf
-
-    Test.MethodTested("queryDispatches()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/script.xlb
deleted file mode 100644
index a9c846861c62..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDispatchProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDispatchProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/frame_XDispatchProviderInterception.xba b/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/frame_XDispatchProviderInterception.xba
deleted file mode 100644
index cd394226a759..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/frame_XDispatchProviderInterception.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDispatchProviderInterception" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDispatchProviderInterception
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ceptor As Object
-
-
-    Test.StartMethod("registerDispatchProviderInterceptor()")
-    bOK = true
-    ceptor = createUnoService("basichelper.DispatchProviderInterceptor")
-    oObj.registerDispatchProviderInterceptor(ceptor)
-    bOK = bOK AND NOT isNull(ceptor.getMasterDispatchProvider())
-    Test.MethodTested("registerDispatchProviderInterceptor()", bOK)
-
-    Test.StartMethod("releaseDispatchProviderInterceptor()")
-    bOK = true
-    oObj.releaseDispatchProviderInterceptor(ceptor)
-    bOK = bOK AND isNull(ceptor.getMasterDispatchProvider())
-    Test.MethodTested("releaseDispatchProviderInterceptor()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/script.xlb
deleted file mode 100644
index 7a88a6895533..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchProviderInterception/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDispatchProviderInterception" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDispatchProviderInterception"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/frame_XDispatchRecorder.xba b/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/frame_XDispatchRecorder.xba
deleted file mode 100644
index 4839ec766dae..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/frame_XDispatchRecorder.xba
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDispatchRecorder" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' - Global dispRecFrame As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDispatchRecorder
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("startRecording()")
-    bOK = true
-    oObj.startRecording(dispRecFrame)
-    Test.MethodTested("startRecording()", bOK)
-
-    Test.StartMethod("endRecording()")
-    bOK = true
-    Dim dispURL As com.sun.star.util.URL
-    dispURL = parseURL(".uno:InsertText")
-    Dim dispArgs(0) As new com.sun.star.beans.PropertyValue
-    dispArgs(0).Name = "Text"
-    dispArgs(0).Value = "XDispatchRecorder.endRecording()"
-    Out.log("Dispatching event for frame ...")
-    Dim disp As Object
-    disp = dispRecFrame.queryDispatch(dispURL, "", 0)
-    disp.dispatch(dispURL, dispArgs())
-    wait(2000)
-    Out.log("Ending record ...")
-    oObj.endRecording()
-    Out.log("Getting macro ... :")
-    Dim macro As String
-    macro = oObj.getRecordedMacro()
-    Out.log("'" + macro + "'")
-    if (len(macro) &lt;&gt; 0) then
-        bOK = instr(macro, dispURL.Complete) &gt; -1 and _
-              instr(macro, dispArgs(0).Value) &gt; -1
-        if (Not bOK) then
-            Out.log("Dispatch URL '" + dispURL.Complete _
-            + "' or its argument '" + dispArgs(0).Value _
-            + "' was not found in macro returned - FAILED")
-        end if
-    else
-        bOK = false
-    end if
-    Test.MethodTested("endRecording()", bOK)
-
-    Test.StartMethod("recordDispatch()")
-    bOK = true
-    Out.log("Recording dispatch ...")
-    oObj.recordDispatch(dispURL, dispArgs())
-    Out.log("Getting macro ... :")
-    macro = oObj.getRecordedMacro()
-    Out.log("'" + macro + "'")
-    if (len(macro) &lt;&gt; 0) then
-        bOK = instr(macro, dispURL.Complete) &gt; -1 and _
-              instr(macro, dispArgs(0).Value) &gt; -1
-        if (Not bOK) then
-            Out.log("Dispatch URL '" + dispURL.Complete _
-            + "' or its argument '" + dispArgs(0).Value _
-            + "' was not found in macro returned - FAILED")
-        end if
-    else
-        bOK = false
-    end if
-    Test.MethodTested("recordDispatch()", bOK)
-
-    Test.StartMethod("recordDispatchAsComment()")
-    bOK = true
-    Out.log("Recording dispatch ...")
-    oObj.recordDispatchAsComment(dispURL, dispArgs())
-    Out.log("Getting macro ... :")
-    macro = oObj.getRecordedMacro()
-    Out.log("'" + macro + "'")
-    if (len(macro) &lt;&gt; 0) then
-        bOK = instr(macro, dispURL.Complete) &gt; -1 and _
-              instr(macro, dispArgs(0).Value) &gt; -1
-        if (Not bOK) then
-            Out.log("Dispatch URL '" + dispURL.Complete _
-            + "' or its argument '" + dispArgs(0).Value _
-            + "' was not found in macro returned - FAILED")
-        end if
-    else
-        bOK = false
-    end if
-    Test.MethodTested("recordDispatchAsComment()", bOK)
-
-    Test.StartMethod("getRecordedMacro()")
-    bOK = true
-    Test.MethodTested("getRecordedMacro()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function parseURL(complURL As String) As com.sun.star.util.URL
-    Dim url As new com.sun.star.util.URL
-    url.Complete = complURL
-    Dim urlTrans As Object
-    urlTrans = createUnoService("com.sun.star.util.URLTransformer")
-    urlTrans.parseStrict(url)
-    parseURL = url
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/script.xlb
deleted file mode 100644
index e88e65a85b50..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorder/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDispatchRecorder" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDispatchRecorder"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/frame_XDispatchRecorderSupplier.xba b/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/frame_XDispatchRecorderSupplier.xba
deleted file mode 100644
index e41cd4b49018..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/frame_XDispatchRecorderSupplier.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDispatchRecorderSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDispatchRecorderSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldRecorder As Object
-
-    Test.StartMethod("getDispatchRecorder()")
-    oldRecorder = oObj.getDispatchRecorder()
-
-    Test.StartMethod("setDispatchRecorder()")
-    Dim newRecorder As Object
-    newRecorder = createUnoService("com.sun.star.comp.framework.DispatchRecorder")
-    oObj.setDispatchRecorder(newRecorder)
-
-    Test.StartMethod("dispatchAndRecord()")
-    bOK = true
-    oDoc = createDocument("swriter", cObjectName)
-    Dim desktop As Object
-    desktop = createUnoService("com.sun.star.frame.Desktop")
-    Dim curFrame As Object
-    curFrame = desktop.getCurrentFrame()
-    Dim dispURL As com.sun.star.util.URL
-    dispURL = parseURL(".uno:InsertText")
-    Dim disp As Object
-    disp = curFrame.queryDispatch(dispURL, "", 0)
-    Dim dispArgs(0) As new com.sun.star.beans.PropertyValue
-    dispArgs(0).Name = "Text"
-    dispArgs(0).Value = "XDispatchRecorderSupplier"
-    Out.log("Dispatching and recording ...")
-    oObj.dispatchAndRecord(dispURL, dispArgs(), disp)
-
-    Dim macro As String
-    macro = newRecorder.getRecordedMacro()
-    Out.log("Recorder macro :" + chr(10) + macro)
-    if (len(macro) &lt;&gt; 0) then
-        bOK = instr(macro, dispURL.Complete) &gt; -1 and _
-              instr(macro, dispArgs(0).Value) &gt; -1
-    end if
-    Test.MethodTested("dispatchAndRecord()", bOK)
-
-    bOK = true
-    if (isNull(oldRecorder)) then
-        bOK = true
-    else
-        Dim oldMacro As String
-        oldMacro = oldRecorder.getRecordedMacro()
-        Out.log("RecordedMacro of previous dispatch recorder: " + chr(10) + oldMacro)
-        bOK = oldMacro = macro
-    endif
-    Test.MethodTested("getDispatchRecorder()", bOK)
-    Test.MethodTested("setDispatchRecorder()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function parseURL(complURL As String) As com.sun.star.util.URL
-    Dim url As new com.sun.star.util.URL
-    url.Complete = complURL
-    Dim urlTrans As Object
-    urlTrans = createUnoService("com.sun.star.util.URLTransformer")
-    urlTrans.parseStrict(url)
-    parseURL = url
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/script.xlb
deleted file mode 100644
index a50e5693014c..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDispatchRecorderSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDispatchRecorderSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDispatchRecorderSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/frame_XDocumentTemplates.xba b/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/frame_XDocumentTemplates.xba
deleted file mode 100644
index 639af5868d02..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/frame_XDocumentTemplates.xba
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XDocumentTemplates" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oStore As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XDocumentTemplates
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim content As Object, groupContent As Object
-    Dim result as Object, statRes As Object
-    Dim res As Boolean
-
-    Test.StartMethod("getContent()")
-    bOK = true
-    content = oObj.getContent()
-    Out.Log("Content list :")
-    Out.Log(getContentList(content))
-
-    bOK = bOK AND NOT isNull(content)
-    Test.MethodTested("getContent()", bOK)
-
-    Test.StartMethod("addGroup()")
-    bOK = true
-    res = oObj.addGroup("XDocumentTemplatesTemp")
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND NOT isNull(getSubContent(content, "XDocumentTemplatesTemp"))
-    Test.MethodTested("addGroup()", bOK)
-
-    Test.StartMethod("renameGroup()")
-    bOK = true
-    res = oObj.renameGroup("XDocumentTemplatesTemp", "XDocumentTemplates")
-    Out.Log("Method returned: " + res)
-    groupContent = getSubContent(content, "XDocumentTemplates")
-    bOK = bOK AND res AND isNull(getSubContent(content, "XDocumentTemplatesTemp")) _
-        AND NOT isNull(groupContent)
-    Test.MethodTested("renameGroup()", bOK)
-
-    Test.StartMethod("addTemplate()")
-    Dim testDoc As String 
-    testDoc = utils.Path2URL(cTestDocsDir) + "report.stw"
-    Out.Log("Adding template from " + testDoc
-
-    bOK = true
-    res = oObj.addTemplate("XDocumentTemplates", "ANewTemplateTemp", testDoc)
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND NOT isNull(getSubContent(groupContent, "ANewTemplateTemp"))
-    Test.MethodTested("addTemplate()", bOK)
-
-    Test.StartMethod("renameTemplate()")
-    bOK = true
-    res = oObj.renameTemplate("XDocumentTemplates", "ANewTemplateTemp", "ANewTemplate")
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND isNull(getSubContent(groupContent, "ANewTemplateTemp")) _
-        AND NOT isNull(getSubContent(groupContent, "ANewTemplate"))
-    Test.MethodTested("renameTemplate()", bOK)
-
-    Test.StartMethod("storeTemplate()")
-    bOK = true
-    res = oObj.storeTemplate("XDocumentTemplates", "NewStoreTemplate", oStore)
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND NOT isNull(getSubContent(groupContent, "NewStoreTemplate"))
-    Test.MethodTested("storeTemplate()", bOK)
-
-    Test.StartMethod("removeTemplate()")
-    bOK = true
-    res = oObj.removeTemplate("XDocumentTemplates", "ANewTemplate")
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND isNull(getSubContent(groupContent, "ANewTemplate")
-    Test.MethodTested("removeTemplate()", bOK)
-
-    Test.StartMethod("removeGroup()")
-    bOK = true
-    res = oObj.removeGroup("XDocumentTemplates")
-    Out.Log("Method returned: " + res)
-    bOK = bOK AND res AND isNull(getSubContent(content, "XDocumentTemplatesTemp")
-    Test.MethodTested("removeGroup()", bOK)
-
-    Test.StartMethod("update()")
-    bOK = true
-    oObj.update()
-    Test.MethodTested("update()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function getDynaResultSet(content As Object) As Object
-    Dim command as new com.sun.star.ucb.Command
-    Dim comArg as new com.sun.star.ucb.OpenCommandArgument2
-    Dim comProps(0) as new com.sun.star.beans.Property
-    Dim result as Object, statRes As Object
-
-    comArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    comProps(0).Name = "Title"
-    comArg.Properties = comProps()
-
-    command.Name = "open"
-    command.Handle = -1
-    command.Argument = comArg
-
-    getDynaResultSet = content.execute(command, 0, NULL_OBJECT)
-End Function
-
-Function getStatResultSet(content As Object) As Object
-    getStatResultSet = getDynaResultSet(content).getStaticResultSet()
-End Function
-
-Function getContentList(content As Object) As String
-    Dim statRes As Object
-    Dim ret As String
-
-    statRes = getStatResultSet(content)
-    statRes.first()
-    ret = ""
-    while NOT statRes.isAfterLast()
-         ret = ret + "   " + statRes.getString(1) + chr(13)
-         statRes.next()
-    wend
-    getContentList = ret
-End Function
-
-Function getSubContent(content As Object, subName As String) As Object
-    Dim statRes As Object
-    Dim ret As Object
-
-    statRes = getStatResultSet(content)
-    statRes.first()
-    while NOT statRes.isAfterLast()
-         if subName = statRes.getString(1) then
-            ret = statRes.queryContent()
-         endif
-         statRes.next()
-    wend
-    
-    getSubContent = ret
-End Function 
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/script.xlb b/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/script.xlb
deleted file mode 100644
index fde55a9f49ec..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XDocumentTemplates/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XDocumentTemplates" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XDocumentTemplates"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFrame/frame_XFrame.xba b/qadevOOo/tests/basic/ifc/frame/XFrame/frame_XFrame.xba
deleted file mode 100644
index 2b6f01fccdef..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFrame/frame_XFrame.xba
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XFrame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' - Global XFrame As Object optional
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XFrame
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getName()")
-    bOK = true
-    Dim oldName As String
-    oldName = oObj.getName()
-    Out.log("getName(): " + oldName)
-    bOK = Not isNull(oldName)
-    Test.MethodTested("getName()", bOK)
-
-    Test.StartMethod("setName()")
-    bOK = true
-    Dim sName As String, gName As String
-    sName = "XFrame"
-    oObj.setName(sName)
-    gName = oObj.getName()
-    bOK = gName = sName
-    Out.log("setName('" + sName + "'), getName() return '" + gName + "'")
-    oObj.setName(oldName)
-    Test.MethodTested("setName()", bOK)
-
-    Test.StartMethod("activate()")
-    bOK = true
-    oObj.activate()
-    Test.MethodTested("activate()", bOK)
-
-    Test.StartMethod("deactivate()")
-    bOK = true
-    oObj.deactivate()
-    Test.MethodTested("deactivate()", bOK)
-
-    Test.StartMethod("isActive()")
-    bOK = true
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop is always active")
-        bOK = oObj.isActive()
-    else
-        oObj.activate()
-        bOK = oObj.isActive()
-        if (Not bOK) then
-            Out.log("after activate() method call, isActive() returned false")
-        end if
-        oObj.deactivate()
-        bOK = Not oObj.isActive()
-        if (oObj.isActive()) then
-            Out.log("after deactivate() method call, isActive() returned true")
-        end if
-    end if
-    Test.MethodTested("isActive()", bOK)
-
-    Test.StartMethod("getCreator()")
-    bOK = true
-    Dim creator As Object
-    creator = oObj.getCreator()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop has no creator")
-    else
-        bOK = Not isNull(creator)
-    end if
-    Test.MethodTested("getCreator()", bOK)
-
-    Test.StartMethod("getComponentWindow()")
-    bOK = true
-    Dim compWin As Object
-    compWin = oObj.getComponentWindow()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop has no component window")
-    else
-        bOK = Not isNull(compWin)
-    end if
-    Test.MethodTested("getComponentWindow()", bOK)
-
-    Test.StartMethod("getContainerWindow()")
-    bOK = true
-    Dim contWin As Object
-    contWin = oObj.getContainerWindow()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop has no container window")
-    else
-        bOK = Not isNull(contWin)
-    end if
-    Test.MethodTested("getContainerWindow()", bOK)
-
-    Test.StartMethod("getController()")
-    bOK = true
-    Dim controller As Object
-    controller = oObj.getController()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop has no controller")
-    else
-        if (isNull(controller)) then
-            Out.log("getController() returns null")
-            bOK = false
-        else
-            Dim frm As Object
-            frm = controller.getFrame()
-            if (frm.getName() &lt;&gt; oObj.getName()) then
-                Out.log("Frame returned by controller not " + _
-                        "equals to frame testing")
-                bOK = false
-            end if
-        end if
-    end if
-    Test.MethodTested("getController()", bOK)
-
-    Test.StartMethod("isTop()")
-    bOK = true
-    Out.log("isTop() = " + oObj.isTop())
-    Test.MethodTested("isTop()", bOK)
-
-    Test.StartMethod("findFrame()")
-    bOK = true
-    if (Not isNull(XFrame)) then
-        Out.log("Trying to find a frame with name 'XFrame' ...")
-        Dim aFrame As Object
-        aFrame = oObj.findFrame("XFrame", com.sun.star.frame.FrameSearchFlag.GLOBAL)
-        if (isNull(aFrame)) then
-            Out.log("findFrame('XFrame',com.sun.star.frame.FrameSearchFlag.GLOBAL) returns null")
-            bOK = false
-        elseif (XFrame.getName() &lt;&gt; aFrame.getName()) then
-            Out.log("findFrame('XFrame',com.sun.star.frame.FrameSearchFlag.GLOBAL)" _
-                    + " returns frame which is not equal to passed in relation")
-            bOK = false
-        end if
-    end if
-    Out.log("Trying to find a frame with name '_self' ...")
-    Dim frame As Object
-    frame = oObj.findFrame("_self", com.sun.star.frame.FrameSearchFlag.AUTO)
-    if (isNull(frame)) then
-        Out.log("findFrame('_self') returns null")
-        bOK = false
-    elseif (frame.getName() &lt;&gt; oObj.getName()) then
-        Out.log("findFrame('_self') returns frame which is not equal to tested")
-        bOK = false
-    end if
-    Test.MethodTested("findFrame()", bOK)
-
-    Test.StartMethod("setCreator()")
-    bOK = true
-    oObj.setCreator(NULL_OBJECT)
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop has no creator")
-    else
-        bOK = isNull(oObj.getCreator())
-        oObj.setCreator(creator)
-    end if
-    Test.MethodTested("setCreator()", bOK)
-
-    Test.StartMethod("setComponent()")
-    bOK = true
-    Dim res As Boolean
-    res = oObj.setComponent(NULL_OBJECT, NULL_OBJECT)
-    if (res) then
-        ' component must be changed
-        bOK = isNull(oObj.getComponentWindow())
-        bOK = bOK and isNull(oObj.getController())
-        if (Not bOK) then
-            Out.log("setComponent() returns true, but component is not changed.")
-        end if
-    else
-        Out.log("frame is not allowed to change component")
-    end if
-    oObj.setComponent(compWin, controller)
-    Test.MethodTested("setComponent()", bOK)
-
-    Test.StartMethod("initialize()")
-    bOK = true
-    oObj.initialize(contWin)
-    Test.MethodTested("initialize()", bOK)
-
-    Test.StartMethod("addFrameActionListener()")
-    bOK = true
-    Dim listener1 As Object, listener2 As Object
-    listener1 = createUnoListener("FA1_", "com.sun.star.frame.XFrameActionListener")
-    listener2 = createUnoListener("FA2_", "com.sun.star.frame.XFrameActionListener")
-    initListeners()
-    oObj.activate()
-    oObj.deactivate()
-    oObj.activate()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("No actions supported by Desktop")
-    else
-        wait(1000)
-        if (Not listener1Called) then
-            bOK = false
-            Out.log("Listener1 wasn't called")
-        end if
-        if (Not listener2Called) then
-            bOK = false
-            Out.log("Listener2 wasn't called")
-        end if
-        if (Not activatedCalled1 or Not activatedCalled2) then
-            bOK = false
-            Out.log("Listener was called, FRAME_ACTIVATED was not")
-        endif
-        if (Not deactivatedCalled1 or Not deactivatedCalled2) then
-            bOK = false
-            Out.log("Listener was called, FRAME_DEACTIVATED was not")
-        endif
-    end if
-    Test.MethodTested("addFrameActionListener()", bOK)
-
-    Test.StartMethod("removeFrameActionListener()")
-    bOK = true
-    Out.log("removes listener2")
-    oObj.removeFrameActionListener(listener2)
-    initListeners()
-    oObj.activate()
-    oObj.deactivate()
-    oObj.activate()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("No actions supported by Desktop")
-    else
-        wait(1000)
-        if (Not listener1Called) then
-            bOK = false
-            Out.log("Listener1 wasn't called")
-        end if
-        if (listener2Called) then
-            bOK = false
-            Out.log("Listener2 was called, but it was removed")
-        end if
-    end if
-    Test.MethodTested("removeFrameActionListener()", bOK)
-
-    Test.StartMethod("contextChanged()")
-    bOK = true
-    oObj.addFrameActionListener(listener1)
-    initListeners()
-    oObj.contextChanged()
-    if (instr(cObjectName,"Desktop") &gt; -1) then
-        Out.log("Desktop cann't change context")
-    elseif(contextChanged1) then
-        bOK = true
-    elseif(listener1Called) then
-        bOK = false
-        Out.log("listener was called, but Action != CONTEXT_CHANGED")
-    else
-        bOK = false
-        Out.log("listener was not called on contextChanged() call")
-    end if
-    Test.MethodTested("contextChanged()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim listener1Called As Boolean
-Dim listener2Called As Boolean
-Dim activatedCalled1 As Boolean
-Dim deactivatedCalled1 As Boolean
-Dim contextChanged1 As Boolean
-Dim activatedCalled2 As Boolean
-Dim deactivatedCalled2 As Boolean
-
-Sub initListeners()
-    listener1Called = false
-    listener2Called = false
-    contextChanged1 = false
-    activatedCalled1 = false
-    deactivatedCalled1 = false
-    activatedCalled2 = false
-    deactivatedCalled2 = false
-End Sub
-
-Sub FA1_frameAction(event As Object)
-    listener1Called = true
-    Out.Log("Listener1: frameAction: " + event.Action)
-    if (event.Action = com.sun.star.frame.FrameAction.FRAME_ACTIVATED) then
-        activatedCalled1 = true
-    elseif (event.Action = com.sun.star.frame.FrameAction.FRAME_DEACTIVATING) then
-        deactivatedCalled1 = true
-    elseif (event.Action = com.sun.star.frame.FrameAction.CONTEXT_CHANGED) then
-        contextChanged1 = true
-    endif
-End Sub
-
-Sub FA2_frameAction(event As Object)
-    listener2Called = true
-    Out.Log("Listener2: frameAction: " + event.Action)
-    if (event.Action = com.sun.star.frame.FrameAction.FRAME_ACTIVATED) then
-        activatedCalled2 = true
-    elseif (event.Action = com.sun.star.frame.FrameAction.FRAME_DEACTIVATING) then
-        deactivatedCalled2 = true
-    endif
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFrame/script.xlb b/qadevOOo/tests/basic/ifc/frame/XFrame/script.xlb
deleted file mode 100644
index 6d254d7d6afd..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFrame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XFrame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XFrame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFrameLoader/frame_XFrameLoader.xba b/qadevOOo/tests/basic/ifc/frame/XFrameLoader/frame_XFrameLoader.xba
deleted file mode 100644
index 713cbbf827dd..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFrameLoader/frame_XFrameLoader.xba
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XFrameLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' Global FrameLoaderURL As String
-'Global FrameLoaderFrame As Object ' optional
-'Global FrameLoaderArgs As Variant ' optional
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.form.XFrameLoader
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim frame As Object
-    Dim args As Variant
-    Dim listener As Object
-
-    if IsNULL(FrameLoaderFrame) then
-        Out.log("Frame is NULL")
-        Dim oDsk As Object
-        oDsk = createUnoService("com.sun.star.frame.Desktop")
-        frame = oDsk.getCurrentFrame()
-    else
-        frame = FrameLoaderFrame
-    endif
-
-    if IsArray(FrameLoaderArgs) then
-        Out.log("Args isn't array")
-        Dim emptyAr As Variant
-        args = emptyAr
-    else
-        args = FrameLoaderArgs
-    endif
-
-    listener = createUnoListener("L_", "com.sun.star.frame.XLoadEventListener")
-    initListener()
-
-    Test.StartMethod("cancel()")
-
-    oObj.load(frame, FrameLoaderURL, args, listener)
-    oObj.cancel()
-    wait(200)
-
-    bOK = loadCancelled OR loadFinished
-
-    Test.MethodTested("cancel()", bOK)
-
-    Test.StartMethod("load()")
-
-    initListener()
-    oObj.load(frame, FrameLoaderURL, args, listener)
-    wait(200)
-    bOK = loadFinished AND Not loadCancelled
-
-    Test.MethodTested("load()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub initListener()
-    loadFinished = false
-    loadCancelled = false
-End Sub
-
-Dim loadFinished As Boolean
-Dim loadCancelled As Boolean
-
-Sub L_loadFinished()
-   Out.Log("Listener: loadFinished")
-   loadFinished = true
-End Sub
-
-Sub L_loadCancelled()
-   Out.Log("Listener: loadCancelled")
-   loadCancelled = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFrameLoader/script.xlb b/qadevOOo/tests/basic/ifc/frame/XFrameLoader/script.xlb
deleted file mode 100644
index ec903f42eeed..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFrameLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XFrameLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XFrameLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/frame_XFramesSupplier.xba b/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/frame_XFramesSupplier.xba
deleted file mode 100644
index b3217b33fdd4..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/frame_XFramesSupplier.xba
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XFramesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XFramesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getFrames()")
-    bOK = true
-    Dim frames As Object
-    frames = oObj.getFrames()
-    Dim cnt As Integer
-    if (Not isNull(frames) ) then
-        cnt = frames.getCount()
-        bOK = cnt &lt;&gt; 0
-        Out.log("There are " + cnt + " frames.")
-    else
-        Out.log("getFrames() returned null !!!")
-        bOK = false
-    end if
-    Dim i As Integer
-    for i = 0 to (cnt - 1)
-        Dim fr As Object
-        fr = frames.getByIndex(i)
-        if (isNull(fr)) then
-            Out.log("Frame(" + i + ") == null")
-            bOK = false
-        end if
-    next i
-    Test.MethodTested("getFrames()", bOK)
-
-    Test.StartMethod("getActiveFrame()")
-    bOK = true
-    Dim active As Object
-    active = oObj.getActiveFrame()
-    active.setName("ActiveFrame")
-    Dim hasActiveFrame As Boolean
-    Dim activeIndex As Integer
-    if (isNull(active)) then
-        bOK = false
-        Out.log("getActiveFrame() returned null")
-    else
-        hasActiveFrame = false
-        for i = 0 to (cnt - 1)
-            fr = frames.getByIndex(i)
-            if (fr.getName() = "ActiveFrame") then
-                hasActiveFrame = true
-                activeIndex = i
-            end if
-        next i
-        if (Not hasActiveFrame) then
-            Out.log("getActiveFrame() isn't contained in getFrames() collection")
-            bOK = false
-        end if
-    end if
-    Test.MethodTested("getActiveFrame()", bOK)
-
-    Test.StartMethod("setActiveFrame()")
-    bOK = true
-    Dim sFrame As Object
-    if (cnt &gt; 1) then
-        if (activeIndex &lt;&gt; 0) then
-            sFrame = frames.getByIndex(0)
-        else
-            sFrame = frame.getByIndex(1)
-        end if
-    else
-        sFrame = active
-    end if
-    sFrame.setName("Frame for set")
-    oObj.setActiveFrame(sFrame)
-    Dim gFrame As Object
-    gFrame = oObj.getActiveFrame()
-    if (gFrame.getName() &lt;&gt; "Frame for set") then
-        bOK = false
-        Out.log("Active frame set is not equal frame get: FAILED")
-    end if
-    Test.MethodTested("setActiveFrame()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/script.xlb
deleted file mode 100644
index 296097706b89..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XFramesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XFramesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XFramesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XModel/frame_XModel.xba b/qadevOOo/tests/basic/ifc/frame/XModel/frame_XModel.xba
deleted file mode 100644
index 0c13d0c3d710..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XModel/frame_XModel.xba
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oXModelController as Object
-'     - Global oXModelSel as Object
-'     - Global oXModelToSel as Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oController As Object
-    Dim oSelection As Object
-    Dim aArgs(0 to 0) As Variant
-    Dim oCursor As Object
-    Dim cURL As String
-    Dim i As Integer
-	Dim args1(0) As New com.sun.star.beans.PropertyValue
-
-    Test.StartMethod("attachResource()")
-    args1(0).Name = "XModel"
-    bOK = oObj.attachResource(".component:DB/DataSourceBrowser", args1())
-    Test.MethodTested("attachResource()", bOK)
-
-    Test.StartMethod("getURL()")
-    bOK = true
-    cURL = oObj.getURL()
-    bOK = bOK AND (cURL = ".component:DB/DataSourceBrowser")
-    Test.MethodTested("getURL()", bOK)
-
-    Test.StartMethod("getArgs()")
-    bOK = true
-    aArgs() = oObj.Args
-    bOK = bOK AND NOT isNull(aArgs()) '(0).Name = "XModel"
-    Test.MethodTested("getArgs()", bOK)
-
-    Test.StartMethod("getCurrentController()")
-    bOK = true
-    Dim oCurrCtrl As Object
-    oCurrCtrl = oObj.getCurrentController()
-    bOK = bOK AND isObject(oCurrCtrl)
-    bOK = bOK AND hasUnoInterfaces(oCurrCtrl, "com.sun.star.frame.XController")
-    Test.MethodTested("getCurrentController()", bOK)
-
-    Test.StartMethod("getCurrentSelection()")
-    bOK = true
-    Dim oCurrSelection As Object
-    oXModelSel.select(oXModelToSel)
-    oCurrSelection = oObj.getCurrentSelection()
-    bOK = bOK AND hasUnoInterfaces(oCurrSelection, "com.sun.star.uno.XInterface")
-    Test.MethodTested("getCurrentSelection()", bOK)
-
-    Test.StartMethod("hasControllersLocked()")
-    bOK = true
-    ' there should no controllers be locked
-    bOK = bOK AND NOT oObj.hasControllersLocked()
-    Test.MethodTested("hasControllersLocked()", bOK)
-
-    ' now lock controllers
-    Test.StartMethod("lockControllers()")
-    bOK = true
-    oObj.lockControllers()
-    ' controllers should be locked
-    bOK = bOK AND oObj.hasControllersLocked()
-    Test.MethodTested("lockControllers()", bOK)
-
-    ' unlock controllers and check success
-    Test.StartMethod("unlockControllers()")
-    bOK = true
-    oObj.unlockControllers()
-    bOK = bOK AND NOT oObj.hasControllersLocked()
-    Test.MethodTested("unlockControllers()", bOK)
-
-    Test.StartMethod("connectController()")
-    oObj.connectController(oXModelController)
-    Test.MethodTested("connectController()", bOK)
-
-    Test.StartMethod("disconnectController()")
-    oObj.disconnectController(oXModelController)
-    oObj.connectController(oCurrCtrl)
-    Test.MethodTested("disconnectController()", bOK)
-
-    Test.StartMethod("setCurrentController()")
-    oObj.setCurrentController(oCurrCtrl)
-    Test.MethodTested("setCurrentController()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XModel/script.xlb b/qadevOOo/tests/basic/ifc/frame/XModel/script.xlb
deleted file mode 100644
index 079f98424e95..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XStorable/frame_XStorable.xba b/qadevOOo/tests/basic/ifc/frame/XStorable/frame_XStorable.xba
deleted file mode 100644
index eb16431b0f7b..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XStorable/frame_XStorable.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XStorable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XStorable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cLocation, cLocation1 As String
-    Dim i As Integer
-    Dim oDoc1 As Object
-
-    bOK = true
-    cLocation = utils.getTempFileURL(cObjectName &amp; "." &amp; "XStorable.tmp")
-    if (FileExists(cLocation)) then
-        Kill(cLocation)
-    end if
-
-    if (FileExists(cLocation &amp; ".bak")) then
-        Kill(cLocation &amp; ".bak")
-    end if
-
-    Out.Log("cLocation: "+cLocation)
-
-    Test.StartMethod("storeAsURL()")
-    bOK = true
-    oObj.storeAsURL(cLocation, DimArray())
-    bOK = bOK AND oObj.hasLocation()
-    Test.MethodTested("storeAsURL()", bOK)
-
-    Test.StartMethod("hasLocation()")
-    bOK = true
-    bOK = bOK AND oObj.hasLocation()
-    Test.MethodTested("hasLocation()", bOK)
-
-    Test.StartMethod("isReadonly()")
-    bOK = true
-    bOK = bOK AND NOT oObj.isReadOnly()
-    Test.MethodTested("isReadonly()", bOK)
-
-    Test.StartMethod("getLocation()")
-    bOK = true
-    bOK = bOK AND (oObj.getLocation = cLocation)
-    Out.Log("Location is: " &amp; oObj.getLocation &amp; " It should be: " &amp; cLocation)
-    Test.MethodTested("getLocation()", bOK)
-
-    Test.StartMethod("storeToURL()")
-    bOK = true
-    cLocation1 = cLocation + ".bak"
-    Out.Log("New Location: " + cLocation1)
-    oDoc.getDocumentInfo().setPropertyValue("Title", "frame_XStorable")
-    oObj.storeToURL(cLocation1, DimArray())
-    oDoc1 = StarDesktop.loadComponentFromUrl(cLocation1, "sc.ScModelObj.XStorable.tmp.bak", 40, DimArray() )
-    bOK = bOK AND (oDoc1.getDocumentInfo().getPropertyValue("Title") = "frame_XStorable")
-    if bOK then Out.Log("Document titles are equal")
-    oDoc1.dispose()
-    Test.MethodTested("storeToURL()", bOK)
-
-    Test.StartMethod("store()")
-    bOK = true
-    oObj.storeAsURL(cLocation1, DimArray())
-    oDoc.getDocumentInfo().setPropertyValue("Title", "frame_XStorable12345")
-    oObj.store()
-    oDoc1 = StarDesktop.loadComponentFromUrl(cLocation1, "sc.ScModelObj.XStorable.tmp.bak", 40, DimArray() )
-    bOK = bOK AND (oDoc1.getDocumentInfo().getPropertyValue("Title") = "frame_XStorable12345")
-    if bOK then Out.Log("Document titles are equal")
-    oDoc1.dispose()
-    Test.MethodTested("store()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XStorable/script.xlb b/qadevOOo/tests/basic/ifc/frame/XStorable/script.xlb
deleted file mode 100644
index f52674f15c6a..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XStorable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XStorable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XStorable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/frame_XSynchronousFrameLoader.xba b/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/frame_XSynchronousFrameLoader.xba
deleted file mode 100644
index 918fafd7d6e9..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/frame_XSynchronousFrameLoader.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="frame_XSynchronousFrameLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oFrame As Object
-'       Global sURL As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.frame.XSynchronousFrameLoader
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("load()")
-
-    Dim url As new com.sun.star.util.URL
-    url.Complete = sURL
-    Dim prop(0) As new com.sun.star.beans.PropertyValue
-    prop(0).Name = "URL"
-    prop(0).Value = url
-       
-    out.log("Load document with URL: " + sURL)
-    bOK = oObj.load(prop(), oFrame)
-
-    Test.MethodTested("load()", bOK)
-
-    Test.StartMethod("cancel()")
-    oObj.cancel()
-    bOK = True
-    Test.MethodTested("cancel()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/script.xlb b/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/script.xlb
deleted file mode 100644
index 14ff69fcef13..000000000000
--- a/qadevOOo/tests/basic/ifc/frame/XSynchronousFrameLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="frame_XSynchronousFrameLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="frame_XSynchronousFrameLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/i18n_XBreakIterator.xba b/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/i18n_XBreakIterator.xba
deleted file mode 100644
index caea03d8e837..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/i18n_XBreakIterator.xba
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XBreakIterator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oLocale As Object
-'     - Global UnicodeString As String
-'     - Global ScriptType(2, 1) As Integer
-
-'*************************************************************************
-
-
-
-
-
-const arrSize = 300
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XBreakIterator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-    Dim nCharacterIteratorMode As Integer
-    Dim lDone As Long
-    Dim lRes As Long
-    Dim wordType As Integer
-    Dim Boundary As Variant
-    Dim BoundsToTest(arrSize) As new com.sun.star.i18n.Boundary
-    Dim Types(arrSize) As Integer
-    Dim nBoundsToTest As Integer
-    Dim iPos As Integer
-    Dim iType As Integer
-    Dim bFound As Boolean
-    Dim j As Integer
-    Dim NextCharacters(2, 3) As Integer
-    Dim PreviousCharacters(2, 3) As Integer
-
-    Test.StartMethod("nextCharacters()")
-    bOK = true
-    nCharacterIteratorMode = com.sun.star.i18n.CharacterIteratorMode.SKIPCHARACTER
-
-    'Start from position     : Travel ... chars         : Actual position after    : How many chars traveled
-    NextCharacters(0, 0) =  1 : NextCharacters(0, 1) =  5000 : NextCharacters(0, 2) = len(UnicodeString) : NextCharacters(0, 3) = len(UnicodeString) - 1
-    NextCharacters(1, 0) =  5 : NextCharacters(1, 1) = -5000 : NextCharacters(1, 2) =  0 : NextCharacters(1, 3) = -5
-    NextCharacters(2, 0) = 10 : NextCharacters(2, 1) =     6 : NextCharacters(2, 2) = 16 : NextCharacters(2, 3) = 6
-
-    for i = 0 to 2
-        lRes = oObj.nextCharacters(UnicodeString, NextCharacters(i, 0), _
-                oLocale, nCharacterIteratorMode, NextCharacters(i, 1), lDone)
-        Out.Log("Expected result is: lRes = " + NextCharacters(i, 2) + _
-                                 "; lDone = " + NextCharacters(i, 3))
-        Out.Log("Actual result is: lRes = " + lRes + "; lDone = " + lDone)
-
-        bOK = bOK AND lRes = NextCharacters(i, 2)
-        bOK = bOK AND lDone = NextCharacters(i, 3)
-    next i
-
-    Test.MethodTested("nextCharacters()", bOK)
-
-    Test.StartMethod("previousCharacters()")
-    bOK = true
-    nCharacterIteratorMode = com.sun.star.i18n.CharacterIteratorMode.SKIPCHARACTER
-
-    'Start from position     : Travel ... chars         : Actual position after    : How many chars traveled
-    PreviousCharacters(0, 0) = 10 : PreviousCharacters(0, 1) = -5000 : PreviousCharacters(0, 2) = len(UnicodeString) : PreviousCharacters(0, 3) = len(UnicodeString) - 10
-    PreviousCharacters(1, 0) =  5 : PreviousCharacters(1, 1) =  5000 : PreviousCharacters(1, 2) = 0 : PreviousCharacters(1, 3) = 5
-    PreviousCharacters(2, 0) = 10 : PreviousCharacters(2, 1) =     6 : PreviousCharacters(2, 2) = 4 : PreviousCharacters(2, 3) = 6
-
-    for i = 0 to 2
-        lRes = oObj.previousCharacters(UnicodeString, PreviousCharacters(i, 0), _
-                oLocale, nCharacterIteratorMode, PreviousCharacters(i, 1), lDone)
-        Out.Log("Expected result is: lRes = " + PreviousCharacters(i, 2) + _
-                                 "; lDone = " + PreviousCharacters(i, 3))
-        Out.Log("Actual result is: lRes = " + lRes + "; lDone = " + lDone)
-
-        bOK = bOK AND lRes = PreviousCharacters(i, 2)
-        bOK = bOK AND lDone = PreviousCharacters(i, 3)
-    next i
-
-    Test.MethodTested("previousCharacters()", bOK)
-
-
-    Test.StartMethod("nextWord()")
-    Test.StartMethod("previousWord()")
-    bOK = true
-    wordType = com.sun.star.i18n.WordType.ANYWORD_IGNOREWHITESPACES
-    Dim wordCount1 As Integer
-    Dim wordCount2 As Integer
-    wordCount1 = 0
-    wordCount2 = 0
-    i = 0
-    nBoundsToTest = 0
-
-    while i &lt; len(UnicodeString) - 1
-        Boundary = oObj.nextWord(UnicodeString, i, oLocale, wordType)
-        i = Boundary.endPos - 1
-        wordCount1 = wordCount1 + 1
-        if ((nBoundsToTest &lt; arrSize) AND (Boundary.endPos - Boundary.startPos &gt; 3)) then
-            BoundsToTest(nBoundsToTest).startPos = Boundary.startPos
-            BoundsToTest(nBoundsToTest).endPos = Boundary.endPos  ' Here we find out some words and
-            nBoundsToTest = nBoundsToTest + 1       ' get their bounds to test in future
-        end if
-        Out.Log("Word " + wordCount1 + "(" + Boundary.startPos + "," + Boundary.endPos + "): '" +  _
-            mid(UnicodeString, Boundary.startPos + 1, Boundary.endPos - Boundary.startPos) + "'")
-    wend
-    Out.Log("In text there are " + wordCount1 + " words, if count from left to right")
-
-    while i &gt; 0
-        Boundary = oObj.previousWord(UnicodeString, i, oLocale, wordType)
-        i = Boundary.startPos
-        wordCount2 = wordCount2 + 1
-        Out.Log("Word " + wordCount2 + "(" + Boundary.startPos + "," + Boundary.endPos + "): '" + _
-            mid(UnicodeString,  Boundary.startPos + 1, Boundary.endPos - Boundary.startPos) + "'")
-    wend
-    Out.Log("In text there are " + wordCount2 + " words, if count from right to left")
-
-    bOK = bOK AND wordCount1 = wordCount2
-    Test.MethodTested("previousWord()", bOK)
-    Test.MethodTested("nextWord()", bOK)
-
-    Test.StartMethod("getWordBoundary()")
-    bOK = true
-    if (nBoundsToTest = 0) then
-        Out.Log("Couldn't find words longer than 3 letters.")
-        bOK = false
-    end if
-
-    for i = 0 to nBoundsToTest - 1
-        iPos = (BoundsToTest(i).endPos - BoundsToTest(i).startPos) / 2 + BoundsToTest(i).startPos ' calculate middle of the word
-        Boundary = oObj.getWordBoundary(UnicodeString, iPos, oLocale, wordType, true)
-        Out.Log("Expected result is: startPos = " + BoundsToTest(i).startPos + _
-                                 "; endPos = " + BoundsToTest(i).endPos)
-        Out.Log("Actual result is: startPos = " + Boundary.startPos + "; endPos = " + Boundary.endPos + _
-               " Word is: '" + mid(UnicodeString, Boundary.startPos + 1, Boundary.endPos - Boundary.startPos) + "'")
-
-        bOK = bOK AND BoundsToTest(i).startPos = Boundary.startPos
-        bOK = bOK AND BoundsToTest(i).endPos = Boundary.endPos
-    next i
-
-    Test.MethodTested("getWordBoundary()", bOK)
-
-    Test.StartMethod("getWordType()")
-    bOK = true
-    for i = 0 to nBoundsToTest - 1
-        iPos = (BoundsToTest(i).endPos - BoundsToTest(i).startPos) / 2 + BoundsToTest(i).startPos ' calculate middle of the word
-        wordType = oObj.getWordType(UnicodeString, iPos, oLocale)
-        bOK = bOK AND wordType &gt;= 0 AND wordType &lt;= 2
-    next i
-    Test.MethodTested("getWordType()", bOK)
-
-    Test.StartMethod("isBeginWord()")
-    bOK = true
-    if (nBoundsToTest = 0) then
-        Out.Log("Couldn't find words longer than 3 letters.")
-        bOK = false
-    end if
-
-    for i = 0 to nBoundsToTest - 1
-        bOK = bOK AND oObj.isBeginWord(UnicodeString, BoundsToTest(i).startPos, oLocale, com.sun.star.i18n.WordType.ANY_WORD)
-        bOK = bOK AND NOT oObj.isBeginWord(UnicodeString, BoundsToTest(i).startPos + 1, oLocale, com.sun.star.i18n.WordType.ANY_WORD)
-    next i
-    Test.MethodTested("isBeginWord()", bOK)
-
-    Test.StartMethod("isEndWord()")
-    bOK = true
-    if (nBoundsToTest = 0) then
-        Out.Log("Couldn't find words longer than 3 letters.")
-        bOK = false
-    end if
-
-    for i = 0 to nBoundsToTest - 1
-        bOK = bOK AND oObj.isEndWord(UnicodeString, BoundsToTest(i).endPos, oLocale, com.sun.star.i18n.WordType.ANY_WORD)
-        bOK = bOK AND NOT oObj.isEndWord(UnicodeString, BoundsToTest(i).endPos - 1, oLocale, com.sun.star.i18n.WordType.ANY_WORD)
-    next i
-    Test.MethodTested("isEndWord()", bOK)
-
-    Test.StartMethod("beginOfSentence()")
-    Test.StartMethod("endOfSentence()")
-    Dim sStart As Integer
-    Dim sEnd As Integer
-
-    bOK = true
-    iPos = 0
-    while (iPos &lt;= len(UnicodeString))' AND bOK)
-        sStart = oObj.beginOfSentence(UnicodeString, iPos, oLocale)
-        sEnd = oObj.endOfSentence(UnicodeString, iPos, oLocale)
-        if (iPos &lt; sStart OR iPos &gt; sEnd) then
-            bOK = false
-            Out.Log("From position " + iPos + " sentence range is [" + sStart + ", " + sEnd + "]")
-            Out.Log("'" + mid(UnicodeString, sStart + 1, sEnd - sStart) + "'")
-        end if
-        iPos = iPos + 1
-    wend
-
-    if (bOK) then
-        bOK = oObj.beginOfSentence(UnicodeString, -10, oLocale) = -1
-        bOK = oObj.endOfSentence(UnicodeString, -10, oLocale) = -1
-        bOK = oObj.beginOfSentence(UnicodeString, len(UnicodeString) + 1, oLocale) = -1
-        bOK = oObj.endOfSentence(UnicodeString, len(UnicodeString) + 1, oLocale) = -1
-        if (NOT bOK) then Out.Log("When invalid position, returned range is NOT [-1, -1]")
-    end if
-
-    Test.MethodTested("beginOfSentence()", bOK)
-    Test.MethodTested("endOfSentence()", bOK)
-
-    Test.StartMethod("getLineBreak()")
-    bOK = true
-    Dim LineBreakResults As Variant
-    Dim _LineBreakHyphenationOptions As new com.sun.star.i18n.LineBreakHyphenationOptions
-    Dim _LineBreakUserOptions As new com.sun.star.i18n.LineBreakUserOptions
-    Dim breakPos As Long, pos As Long
-    _LineBreakUserOptions.applyForbiddenRules = false
-    _LineBreakUserOptions.allowHyphenateEnglish = false
-
-    breakPos = 0  : pos = 0
-    
-    while breakPos = 0 AND pos &lt; len(UnicodeString)
-        LineBreakResults = oObj.getLineBreak(UnicodeString, pos, oLocale, 0, _LineBreakHyphenationOptions, _LineBreakUserOptions)
-        breakPos = LineBreakResults.BreakIndex
-        pos = pos + 1
-    wend 
-    
-    ' finally the position of break must be found in the middle and 
-    ' it must be before the break position specified
-    bOK = (breakPos &lt;= pos AND breakPos > 0)
-
-    if (NOT bOK) then
-        Out.Log("The last position was: " + pos + ", and the break position was: " + breakPos)
-    end if
-
-    Test.MethodTested("getLineBreak()", bOK)
-
-
-    Test.StartMethod("beginOfScript()")
-    Test.StartMethod("endOfScript()")
-    bOK = true
-    Out.Log("Searching for scripts...")
-    iPos = 0
-    nBoundsToTest = 0
-
-    while iPos &lt; len(UnicodeString) AND iPos &gt; -1 AND nBoundsToTest &lt; arrSize
-        iType = oObj.getScriptType(UnicodeString, iPos)
-        BoundsToTest(nBoundsToTest).startPos = oObj.beginOfScript(UnicodeString, iPos, iType)
-        BoundsToTest(nBoundsToTest).endPos = oObj.endOfScript(UnicodeString, iPos, iType)
-        Types(nBoundsToTest) = iType
-        iPos = BoundsToTest(nBoundsToTest).endPos
-        Out.Log("Type: " + iType + "; Bounds: [" + BoundsToTest(nBoundsToTest).startPos + "," + BoundsToTest(nBoundsToTest).endPos + "]")
-        nBoundsToTest = nBoundsToTest + 1
-    wend
-    bOK = bOK AND nBoundsToTest &gt; 0
-
-    Test.MethodTested("beginOfScript()", bOK)
-    Test.MethodTested("endOfScript()", bOK)
-
-
-    Test.StartMethod("nextScript()")
-    bOK = true
-    i = 1
-    iPos = -1
-    while i &lt; nBoundsToTest AND bOK
-        iPos = oObj.nextScript(UnicodeString, iPos, Types(i))
-        Out.Log("Expected index for Type " + Types(i) + " for nextScript is " + BoundsToTest(i).startPos)
-        bOK = bOK AND iPos = BoundsToTest(i).startPos
-        Out.Log("NextScript returned " + iPos + ";")
-        i = i + 1
-    wend
-    Test.MethodTested("nextScript()", bOK)
-
-    Test.StartMethod("previousScript()")
-    bOK = true
-    i = nBoundsToTest - 2
-    iPos = len(UnicodeString) + 1
-    while i &gt;= 0  AND bOK
-        iPos = oObj.previousScript(UnicodeString, iPos, Types(i))
-        Out.Log("Expected index for Type " + Types(i) + " for previousScript is " + BoundsToTest(i).startPos)
-        bOK = bOK AND iPos = BoundsToTest(i).startPos
-        Out.Log("PreviousScript returned " + iPos + ";")
-        i = i - 1
-    wend
-    Test.MethodTested("previousScript()", bOK)
-
-    Test.StartMethod("getScriptType()")
-    bOK = true
-    for i = 0 to 2
-        iPos = oObj.getScriptType(UnicodeString, ScriptType(i, 0))
-        Out.Log("Expected result is: ScriptType = " + ScriptType(i, 1))
-        Out.Log("Actual result is: ScriptType = " + iPos)
-        bOK = bOK AND iPos = ScriptType(i, 1)
-    next i
-    Test.MethodTested("getScriptType()", bOK)
-
-    Test.StartMethod("beginOfCharBlock()")
-    Test.StartMethod("endOfCharBlock()")
-    bOK = true
-    Out.Log("getting CharBlocks bounds...")
-    iPos = 0
-    nBoundsToTest = 0
-
-    while iPos &lt; len(UnicodeString) AND iPos &gt; -1 AND nBoundsToTest &lt; arrSize
-        iType = getCharBlockType(iPos)
-        BoundsToTest(nBoundsToTest).startPos = oObj.beginOfCharBlock(UnicodeString, iPos, oLocale, iType)
-        BoundsToTest(nBoundsToTest).endPos = oObj.endOfCharBlock(UnicodeString, iPos, oLocale, iType)
-        iPos = BoundsToTest(nBoundsToTest).endPos
-        Out.Log("" + nBoundsToTest + "). Bounds: [" + BoundsToTest(nBoundsToTest).startPos + "," + BoundsToTest(nBoundsToTest).endPos + "]; Type = " + iType)
-        Types(nBoundsToTest) = iType
-        nBoundsToTest = nBoundsToTest + 1
-    wend
-
-    for i = 0 to nBoundsToTest - 2
-        bOK = bOK AND BoundsToTest(i).endPos = BoundsToTest(i + 1).startPos
-    next
-    Out.Log("Testing for no intersections : " + bOK)
-    bOK = bOK AND BoundsToTest(0).startPos = 0
-    bOK = bOK AND BoundsToTest(nBoundsToTest - 1).endPos = len(UnicodeString)
-    Out.Log("Regions should starts with 0 and ends with " + len(UnicodeString))
-
-    Test.MethodTested("beginOfCharBlock()", bOK)
-    Test.MethodTested("endOfCharBlock()", bOK)
-
-    Test.StartMethod("nextCharBlock()")
-    bOK = true
-    for i = 0 to nBoundsToTest - 1
-        iPos = oObj.nextCharBlock(UnicodeString, BoundsToTest(i).startPos - 1, oLocale, Types(i))
-        if (iPos &lt;&gt; BoundsToTest(i).startPos) then
-            bOK = false
-            Out.Log("nextCharBlock(UnicodeString, " + BoundsToTest(i).startPos - 1 + ", oLocale, " + Types(i) + ") should return " + BoundsToTest(i).startPos)
-            Out.Log("... and actual value is " + iPos)
-        end if
-    next i
-    Test.MethodTested("nextCharBlock()", bOK)
-
-    Test.StartMethod("previousCharBlock()")
-    bOK = true
-    for i = 0 to nBoundsToTest - 1
-        iPos = oObj.previousCharBlock(UnicodeString, BoundsToTest(i).endPos + 1, oLocale, Types(i))
-        if (iPos &lt;&gt; BoundsToTest(i).startPos) then
-            bOK = false
-            Out.Log("previousCharBlock(UnicodeString, " + BoundsToTest(i).startPos - 1 +", oLocale, " + Types(i) + ") should return " + BoundsToTest(i).startPos)
-            Out.Log("... and actual value is " + iPos)
-        end if
-    next i
-    Test.MethodTested("previousCharBlock()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function getCharBlockType(pos As Integer) As Integer
-    Dim i As Integer
-    Dim cType As Integer
-
-    cType = 0
-    i = 1
-    while (i &lt; 31)
-        if (oObj.beginOfCharBlock(UnicodeString, pos, oLocale, i) &lt;&gt; -1) then
-            cType = i
-            i = 100
-        end if
-        i = i + 1
-    wend
-
-    getCharBlockType = cType
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/script.xlb
deleted file mode 100644
index 245750532c7b..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XBreakIterator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XBreakIterator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XBreakIterator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCalendar/i18n_XCalendar.xba b/qadevOOo/tests/basic/ifc/i18n/XCalendar/i18n_XCalendar.xba
deleted file mode 100644
index c3d7befd4987..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCalendar/i18n_XCalendar.xba
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XCalendar" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XCalendar
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim oLocale As Object
-    Dim allLocales As Variant
-    Dim allCalendars As Variant
-    Dim uniqueID As String
-    Dim oCalendar As Object
-    Dim dDateTime As Double
-    Dim aValue As Variant
-    Dim oldValue As Variant
-    Dim newValue As Variant
-    Dim i As Integer
-
-    oLocaleData = createUnoService("com.sun.star.i18n.LocaleData")
-    allLocales = oLocaleData.getAllInstalledLocaleNames()
-    Out.Log("Found " + ubound(allLocales) + " Loacales registered in the system")
-    Randomize
-    oLocale = allLocales(rnd * ubound(allLocales))
-    Out.Log("Choose for testing : " + oLocale.Country)
-
-    Test.StartMethod("getAllCalendars()")
-    bOK = true
-    allCalendars = oObj.getAllCalendars(oLocale)
-    Out.Log("There are " + ubound(allCalendars) + 1 + " calendars for this locale.")
-    bOK = bOK AND NOT isNULL(allCalendars)
-    Test.MethodTested("getAllCalendars()", bOK)
-
-    Test.StartMethod("loadDefaultCalendar()")
-    bOK = true
-    oObj.loadDefaultCalendar(oLocale)
-    bOK = bOK AND oObj.getLoadedCalendar().Default
-    Test.MethodTested("loadDefaultCalendar()", bOK)
-
-    Test.StartMethod("getUniqueID()")
-    bOK = true
-    uniqueID = oObj.getUniqueID()
-    Out.Log("UniqueID for loaded calendar is " + uniqueID)
-    bOK = bOK AND (uniqueID = allCalendars(0))
-    Test.MethodTested("getUniqueID()", bOK)
-
-    Test.StartMethod("loadCalendar()")
-    bOK = true
-    oObj.loadCalendar(allCalendars(0), oLocale)
-    bOK = bOK AND NOT isNULL(oObj.getLoadedCalendar())
-    Test.MethodTested("loadCalendar()", bOK)
-
-    Test.StartMethod("getLoadedCalendar()")
-    bOK = true
-    oCalendar = oObj.getLoadedCalendar()
-    Out.Log("Loaded calendar's name is '" + oCalendar.Name + "'")
-    bOK = bOK AND NOT isNULL(oCalendar)
-    Test.MethodTested("getLoadedCalendar()", bOK)
-
-    Test.StartMethod("setDateTime()")
-    Test.StartMethod("getDateTime()")
-    bOK = true
-    oObj.setDateTime(12345.25)
-    dDateTime = oObj.getDateTime()
-    bOK = bOK AND dDateTime = 12345.25
-    Out.Log("Expected: 12345,25; Actual: " + dDateTime)
-    Test.MethodTested("setDateTime()", bOK)
-    Test.MethodTested("getDateTime()", bOK)
-
-    Test.StartMethod("getFirstDayOfWeek()")
-    Test.StartMethod("setFirstDayOfWeek()")
-    bOK = true
-    oObj.setFirstDayOfWeek(com.sun.star.i18n.Weekdays.SATURDAY)
-    Out.Log("Expected: " + com.sun.star.i18n.Weekdays.SATURDAY + ", Actual: " + oObj.getFirstDayOfWeek())
-    bOK = bOK AND oObj.getFirstDayOfWeek() = com.sun.star.i18n.Weekdays.SATURDAY
-    oObj.setFirstDayOfWeek(com.sun.star.i18n.Weekdays.SUNDAY)
-    Out.Log("Expected: " + com.sun.star.i18n.Weekdays.SUNDAY + ", Actual: " + oObj.getFirstDayOfWeek())
-    bOK = bOK AND oObj.getFirstDayOfWeek() = com.sun.star.i18n.Weekdays.SUNDAY
-
-    Test.MethodTested("getFirstDayOfWeek()", bOK)
-    Test.MethodTested("setFirstDayOfWeek()", bOK)
-
-    Test.StartMethod("setValue()")
-    Test.StartMethod("getValue()")
-    bOK = true
-    bOK = bOK AND TestValue(1, com.sun.star.i18n.Months.JANUARY, 2001, com.sun.star.i18n.WeekDays.MONDAY, 1, 1) 
-    '1.01.2001 - Monday, 1-st week of month, 1-st week of year
-    bOK = bOK AND TestValue(12, com.sun.star.i18n.Months.JULY, 2001, com.sun.star.i18n.WeekDays.THURSDAY, 2, 28) 
-    '12.07.2001 - Thursday, 2-nd week of month, 28-st week of year
-
-    Test.MethodTested("setValue()", bOK)
-    Test.MethodTested("getValue()", bOK)
-
-    Test.StartMethod("addValue()")
-    bOK = true
-
-    bOK = bOK AND TestAddValue("DST_OFFSET", com.sun.star.i18n.CalendarFieldIndex.DST_OFFSET, 1, 0)
-    bOK = bOK AND TestAddValue("DAY_OF_MONTH", com.sun.star.i18n.CalendarFieldIndex.DAY_OF_MONTH, 1, 0)
-    bOK = bOK AND TestAddValue("MONTH", com.sun.star.i18n.CalendarFieldIndex.MONTH, 3, 12)
-    bOK = bOK AND TestAddValue("YEAR", com.sun.star.i18n.CalendarFieldIndex.YEAR, -1, 0)
-    bOK = bOK AND TestAddValue("HOUR", com.sun.star.i18n.CalendarFieldIndex.HOUR, 7, 24)
-    bOK = bOK AND TestAddValue("MINUTE", com.sun.star.i18n.CalendarFieldIndex.MINUTE, 31, 60)
-    bOK = bOK AND TestAddValue("SECOND", com.sun.star.i18n.CalendarFieldIndex.SECOND, 13, 60)
-    bOK = bOK AND TestAddValue("MILLISECOND", com.sun.star.i18n.CalendarFieldIndex.MILLISECOND, 67, 1000)
-    bOK = bOK AND TestAddValue("ERA", com.sun.star.i18n.CalendarFieldIndex.ERA, -1, 0)
-
-    Test.MethodTested("addValue()", bOK)
-
-    Test.StartMethod("getNumberOfMonthsInYear()")
-    bOK = true
-    aValue = oObj.getNumberOfMonthsInYear()
-    Out.Log("There are " + aValue + " months in year")
-    bOK = bOK AND aValue = 12
-    Test.MethodTested("getNumberOfMonthsInYear()", bOK)
-
-    Test.StartMethod("getNumberOfDaysInWeek()")
-    bOK = true
-    aValue = oObj.getNumberOfDaysInWeek()
-    Out.Log("There are " + aValue + " days in week")
-    bOK = bOK AND aValue = 7
-    Test.MethodTested("getNumberOfDaysInWeek()", bOK)
-
-    Test.StartMethod("getMinimumNumberOfDaysForFirstWeek()")
-    bOK = true
-    aValue = oObj.getMinimumNumberOfDaysForFirstWeek()
-    Out.Log("MinimumNumberOfDaysForFirstWeek = " + aValue)
-    bOK = bOK AND aValue &gt; 0 AND aValue &lt; 8
-    Test.MethodTested("getMinimumNumberOfDaysForFirstWeek()", bOK)
-
-    Test.StartMethod("setMinimumNumberOfDaysForFirstWeek()")
-    bOK = true
-    oObj.setMinimumNumberOfDaysForFirstWeek(211)
-    aValue = oObj.getMinimumNumberOfDaysForFirstWeek()
-    Out.Log("MinimumNumberOfDaysForFirstWeek = " + aValue)
-    bOK = bOK AND aValue &gt; 0 AND aValue &lt; 8
-    Test.MethodTested("setMinimumNumberOfDaysForFirstWeek()", bOK)
-
-    Test.StartMethod("getMonths()")
-    bOK = true
-    Dim allMonths As Variant
-    Dim cAllMonths As String
-    allMonths = oObj.getMonths()
-    Out.Log("Returned " + ubound(allMonths) + 1 + " months.")
-    bOK = bOK AND ubound(allMonths) + 1= oObj.getNumberOfMonthsInYear()
-    if (bOK) then
-        cAllMonths = ""
-        for i = 0 to ubound(allMonths)
-            cAllMonths = cAllMonths + allMonths(i).FullName + ", "
-        next i
-        Out.Log("Months: " + cAllMonths)
-    end if
-
-    Test.MethodTested("getMonths()", bOK)
-
-    Test.StartMethod("getDays()")
-    bOK = true
-    Dim allDays As Variant
-    Dim cAllDays As String
-    allDays = oObj.getDays()
-    Out.Log("Returned " + ubound(allMonths) + 1 + " days.")
-    bOK = bOK AND ubound(allDays) + 1= oObj.getNumberOfDaysInWeek()
-    if (bOK) then
-        cAllDays = ""
-        for i = 0 to ubound(allDays)
-            cAllDays = cAllDays + allDays(i).FullName + ", "
-        next i
-        Out.Log("Days: " + cAllDays)
-    end if
-    Test.MethodTested("getDays()", bOK)
-
-    Test.StartMethod("getDisplayName()")
-    bOK = true
-    Dim cDisplayName As String
-    cDisplayName = oObj.getDisplayName(com.sun.star.i18n.CalendarDisplayIndex.MONTH, com.sun.star.i18n.Months.JANUARY, 1)
-    Out.Log("Full name for JANUARY is: " + cDisplayName)
-    bOK = bOK AND cDisplayName &lt;&gt; ""
-    Test.MethodTested("getDisplayName()", bOK)
-
-    Test.StartMethod("isValid()")
-    bOK = true
-    
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.DAY_OF_MONTH, 30)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.MONTH, com.sun.star.i18n.Months.FEBURARY)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.YEAR, 2001)
-    Out.Log("isValid() = " + oObj.isValid())
-    bOK = bOK AND NOT oObj.isValid()
-
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.DAY_OF_MONTH, 27)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.MONTH, com.sun.star.i18n.Months.FEBURARY)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.YEAR, 2001)
-    Out.Log("isValid() = " + oObj.isValid())
-    bOK = bOK AND oObj.isValid()
-    
-    Test.MethodTested("isValid()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function TestValue(_Day As Integer, _Month As Integer, _Year As Integer, _
-                   _Day_of_week As Integer, _Week_of_month As Integer, _Week_of_year As Integer) As Boolean
-
-    Dim bOK As Boolean
-    Dim aDay As Integer, aMonth As Integer, aYear As Integer
-    Dim aDay_of_week As Integer, aWeek_of_Month As Integer, aWeek_of_year As Integer
-
-    bOK = true
-
-    Out.Log("Set date to " + _Day + "." + _Month + "." + _Year + ";")
-
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.DAY_OF_MONTH, _Day)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.MONTH, _Month)
-    oObj.setValue(com.sun.star.i18n.CalendarFieldIndex.YEAR, _Year)
-
-    aDay = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.DAY_OF_MONTH)
-    aMonth = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.MONTH)
-    aYear = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.YEAR)
-
-    Out.Log("Now date is " + aDay + "." + aMonth + "." + aYear + ";")
-
-    bOK = (aDay = _Day) AND (aMonth = _Month) AND (aYear = _Year)
-
-    if (bOK) then
-        aDay_of_week = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.DAY_OF_WEEK)
-        aWeek_of_month = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.WEEK_OF_MONTH)
-        aWeek_of_year = oObj.getValue(com.sun.star.i18n.CalendarFieldIndex.WEEK_OF_YEAR)
-        Out.Log("aDay_of_week: Expected: " + _Day_of_week + ", Actual: " + aDay_of_week)
-        Out.Log("aWeek_of_month: Expected: " + _Week_of_month + ", Actual: " + aWeek_of_month)
-        Out.Log("aWeek_of_year: Expected: " + _Week_of_year + ", Actual: " + aWeek_of_year)
-        bOK = (aDay_of_week = _Day_of_week) AND (aWeek_of_month = _Week_of_month) AND (aWeek_of_year = _Week_of_year)
-    end if
-
-    TestValue() = bOK
-
-Exit Function
-ErrHndl:
-    Test.Exception()
-    TestValue() = false
-End Function
-
-Function TestAddValue(valname As String, Idx As Integer, incValue As Integer, valModule As Integer) As Boolean
-    Dim aValue As Integer
-    Dim newValue As Integer
-    Dim bOK As Boolean
-
-    aValue = oObj.getValue(idx)
-    oObj.addValue(idx, incValue)
-    newValue = oObj.getValue(idx)
-    if (valModule = 0) then
-        bOK = (newValue = (aValue + incValue))
-        Out.Log(valname + ": Expected: " + (aValue + incValue) + ", Actual: " + newValue)
-    else
-        bOK = (newValue = (aValue + incValue) mod valModule)
-        Out.Log(valname + ": Expected: " + (aValue + incValue) mod valModule + ", Actual: " + newValue)
-    end if
-    TestAddValue() = bOK
-Exit Function
-ErrHndl:
-    Test.Exception()
-    TestAddValue() = false
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCalendar/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XCalendar/script.xlb
deleted file mode 100644
index 2eedd64721be..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCalendar/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XCalendar" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XCalendar"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/i18n_XCharacterClassification.xba b/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/i18n_XCharacterClassification.xba
deleted file mode 100644
index d31b612cab49..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/i18n_XCharacterClassification.xba
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XCharacterClassification" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XCharacterClassification
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sType As Variant
-    Dim cString1 As String, cString2 As String
-    Dim cRes As Variant, sDir As Variant
-    
-    Const cString = "TestString1"
-
-    Dim Locale As New com.sun.star.lang.Locale
-
-    Locale.Language = "DE"
-    Locale.Country = "GERMANY"
-    Locale.Variant = ""
-
-    Test.StartMethod("toUpper()")
-    bOK = true
-    cRes = oObj.toUpper(cString, 2, 3, Locale)
-    bOK = bOK AND Comp(cRes, "STS")
-    Test.MethodTested("toUpper()", bOK)
-
-    Test.StartMethod("toLower()")
-    bOK = true
-    cRes = oObj.toLower(cString, 2, 3, Locale)
-    bOK = bOK AND Comp(cRes, "sts")
-    Test.MethodTested("toLower()", bOK)
-
-    Test.StartMethod("toTitle()")
-    bOK = true
-    cRes = oObj.toTitle(cString, 2, 3, Locale)
-    bOK = bOK AND Comp(cRes, "STS")
-    Test.MethodTested("toTitle()", bOK)
-
-    Test.StartMethod("getType()")
-    bOK = true
-    bOK = bOK AND oObj.getType(cString, 0) &lt;&gt; oObj.getType(cString, 2)
-    Test.MethodTested("getType()", bOK)
-
-    Test.StartMethod("getCharacterDirection()")
-    bOK = true
-    sDir = oObj.getCharacterDirection(cString, 1)
-    bOK = bOK AND isNumeric(sDir)
-    Test.MethodTested("getCharacterDirection()", bOK)
-
-    Test.StartMethod("getScript()")
-    bOK = true
-    bOK = bOK AND isNUmeric(oObj.getScript(cString, 0))
-    Test.MethodTested("getScript()", bOK)
-
-    Test.StartMethod("getCharacterType()")
-    bOK = true
-    sType = oObj.getCharacterType(cString,  0, Locale)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.UPPER)
-    bOK = bOK AND NOT (sType AND com.sun.star.i18n.KCharacterType.DIGIT)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.BASE_FORM)
-    sType = oObj.getCharacterType(cString,  1, Locale)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.LOWER)
-    bOK = bOK AND NOT (sType AND com.sun.star.i18n.KCharacterType.DIGIT)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.BASE_FORM)
-    sType = oObj.getCharacterType(cString, 10, Locale)
-    bOK = bOK AND NOT (sType AND com.sun.star.i18n.KCharacterType.UPPER)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.DIGIT)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.BASE_FORM)
-    Test.MethodTested("getCharacterType()", bOK)
-
-    Test.StartMethod("getStringType()")
-    bOK = true
-    sType = oObj.getStringType(cString, 0, 10, Locale)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.UPPER)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.LOWER)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.BASE_FORM)
-    bOK = bOK AND NOT (sType AND com.sun.star.i18n.KCharacterType.DIGIT)
-    sType = oObj.getStringType(cString, 0, 11, Locale)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.UPPER)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.LOWER)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.BASE_FORM)
-    bOK = bOK AND (sType AND com.sun.star.i18n.KCharacterType.DIGIT)
-    Test.MethodTested("getStringType()", bOK)
-
-    Test.StartMethod("parseAnyToken()")
-    bOK = true
-
-    cString1 = "int _ind1 = 1234;"
-    Out.Log ("Parsing string: " + cString1)
-    Dim tTypes(10) As Integer
-    Dim tVals(10) As String
-    Dim nStartChartFlags As Variant, userDefinedCharactersStart As Variant
-    Dim nContCharFlags As Variant, userDefinedCharactersCont As Variant, nTokenType As Variant
-
-   	with com.sun.star.i18n.KParseType
-        tTypes(0) = .IDENTNAME: tVals(0) = "int"
-        tTypes(1) = .IDENTNAME: tVals(1) = "_ind1"
-        tTypes(2) = .ONE_SINGLE_CHAR: tVals(2) = "=" 
-        tTypes(3) = .ANY_NUMBER: tVals(3) = "1234"
-    end with
-
-    with com.sun.star.i18n.KParseTokens
-        nStartChartFlags = .ANY_ALPHA OR .IGNORE_LEADING_WS
-        userDefinedCharactersStart = "_"
-        nContCharFlags = nStartChartFlags OR .ANY_ALNUM
-        userDefinedCharactersCont = ""
-    end with
-
-    Dim nStart As Integer, idx As Integer, nPos As Integer
-    Dim pRes As Variant
-    Dim cActStr As String
-    
-    nStart = 1
-    idx = 0
-
-    while nStart &lt; Len(cString1)
-       	pRes = oObj.parseAnyToken(cString1, nStart - 1, Locale, nStartChartFlags, userDefinedCharactersStart, _
-   	        nContCharFlags, userDefinedCharactersCont)
-
-      Out.Log("Type is " + pRes.TokenType)
-   		if (pRes.TokenType = 0) then
-          nStart = nStart + 1
-   		else
-          Out.Log("Type is as expexted - " + ((pRes.TokenType AND tTypes(idx)) &gt; 0))
-          bOK = bOK AND (pRes.TokenType AND tTypes(idx))
-          cActStr = mid(cString1, (nStart + pRes.LeadingWhiteSpace), pRes.EndPos - (nStart + pRes.LeadingWhiteSpace) + 1)
-          Out.Log("Expected: '" + tVals(idx) + "'; actual is: '" + cActStr + "'")
-          bOK = bOK AND (cActStr = tVals(idx))
-          nStart = pRes.EndPos + 1
-      end if
-      idx = idx + 1
-    wend
-    Test.MethodTested("parseAnyToken()", bOK)
-
-    Test.StartMethod("parsePredefinedToken()")
-    bOK = true
-
-    cString2 = "1a, _a1$5"
-   	with com.sun.star.i18n.KParseType
-        nTokenType = .IDENTNAME
-    end with
-    with com.sun.star.i18n.KParseTokens
-        nStartChartFlags = .ANY_ALPHA OR .IGNORE_LEADING_WS
-        userDefinedCharactersStart = "_"
-        nContCharFlags = nStartChartFlags OR .ANY_ALNUM
-        userDefinedCharactersCont = ""
-    end with
-
-    tVals(0) = "a"
-    tVals(1) = "_a1"
-
-    nPos = 1
-    idx = 0
-    while nPos &lt; Len(cString2)
-       	pRes = oObj.parsePredefinedToken(nTokenType, cString2, nPos - 1, Locale, nStartChartFlags, userDefinedCharactersStart, _
-   	        nContCharFlags, userDefinedCharactersCont)
-
-        Out.Log("Type is " + pRes.TokenType)
-        if (pRes.TokenType = 0) then
-            nPos = nPos + 1
-        else
-            bOK = bOK AND (pRes.TokenType AND tTypes(idx))
-            cActStr = mid(cString2, (nPos + pRes.LeadingWhiteSpace), pRes.EndPos - (nPos + pRes.LeadingWhiteSpace) + 1)
-            bOK = bOK AND Comp(cActStr, tVals(idx))
-            nPos = pRes.EndPos + 1
-            idx = idx + 1
-        end if
-    wend
-
-    bOK = bOK AND true
-    Test.MethodTested("parsePredefinedToken()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function Comp(cS1 As String, cS2 As String) As Boolean
-    Out.Log("Expected : '" + cS2 + "', actual : '" + cS1 + "'")
-    Comp = cS1 = cS2
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/script.xlb
deleted file mode 100644
index 730b504c245b..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCharacterClassification/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XCharacterClassification" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XCharacterClassification"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCollator/i18n_XCollator.xba b/qadevOOo/tests/basic/ifc/i18n/XCollator/i18n_XCollator.xba
deleted file mode 100644
index 4a4f7cc02bac..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCollator/i18n_XCollator.xba
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XCollator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oLocal As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XCollator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Algorithms As Variant
-    Dim options As Variant
-
-    Test.StartMethod("listCollatorAlgorithms()")
-    bOK = true
-    Algorithms = oObj.listCollatorAlgorithms(oLocale)
-    Out.Log("Found " + (ubound(Algorithms) + 1) + " algorithms.")
-    bOK = bOK AND ubound(Algorithms) &gt;= 0
-    Test.MethodTested("listCollatorAlgorithms()", bOK)
-
-    Test.StartMethod("loadCollatorAlgorithm()")
-    bOK = true
-    options = com.sun.star.i18n.CollatorOptions.CollatorOptions_IGNORE_CASE
-    oObj.loadCollatorAlgorithm(Algorithms(0), oLocale, options)
-    bOK = bOK AND oObj.compareString("A", "a") = 0
-    oObj.loadCollatorAlgorithm(Algorithms(0), oLocale, 0)
-    bOK = bOK AND oObj.compareString("A", "a") &lt;&gt; 0
-    Test.MethodTested("loadCollatorAlgorithm()", bOK)
-
-    Test.StartMethod("loadDefaultCollator()")
-    bOK = true
-    oObj.loadDefaultCollator(oLocale, 0)
-    bOK = bOK AND oObj.compareString("A", "a") &lt;&gt; 0
-    oObj.loadDefaultCollator(oLocale, options)
-    bOK = bOK AND oObj.compareString("A", "a") = 0
-    Test.MethodTested("loadDefaultCollator()", bOK)
-
-    Test.StartMethod("listCollatorOptions()")
-    bOK = true
-    options = oObj.listCollatorOptions(Algorithms(0))
-    Out.Log("Found " + (ubound(options) + 1) + " options.")
-    bOK = bOK AND ubound(options) &gt;= 0
-    Test.MethodTested("listCollatorOptions()", bOK)
-
-    Test.StartMethod("compareSubstring()")
-    bOK = true
-    bOK = bOK AND oObj.compareSubstring("a", 0, 1, "B", 0, 1) = -1
-    bOK = bOK AND oObj.compareSubstring("A", 0, 1, "b", 0, 1) = -1
-    bOK = bOK AND oObj.compareSubstring("A", 0, 1, "a", 0, 1) = 0
-    Test.MethodTested("compareSubstring()", bOK)
-
-    Test.StartMethod("compareString()")
-    bOK = true
-    bOK = bOK AND oObj.compareString("a", "B") = -1
-    bOK = bOK AND oObj.compareString("A", "b") = -1
-    bOK = bOK AND oObj.compareString("A", "a") = 0
-    Test.MethodTested("compareString()", bOK)
-
-    Test.StartMethod("loadCollatorAlgorithmWithEndUserOption()")
-    bOK = true
-    Dim noOptions() As Integer
-    Dim optionsArray(0) As Integer
-    Dim ColAlgorithm As String
-
-    colAlgorithm = "alphanumeric"
-    Out.Log("Used collation algorithm: "+colAlgorithm)
-    optionsArray(0) = com.sun.star.i18n.CollatorOptions.CollatorOptions_IGNORE_CASE
-    oObj.loadCollatorAlgorithmWithEndUserOption(colAlgorithm, oLocale, noOptions())
-    bOK = bOK AND oObj.compareString("A", "a") = 1
-    bOK = bOK AND oObj.compareString("a", "A") = -1
-    bOK = bOK AND oObj.compareString("a", "a") = 0
-    oObj.loadCollatorAlgorithmWithEndUserOption(colAlgorithm, oLocale, optionsArray())
-    bOK = bOK AND oObj.compareString("A", "a") = 0
-    bOK = bOK AND oObj.compareString("a", "A") = 0
-    bOK = bOK AND oObj.compareString("a", "a") = 0
-    Test.MethodTested("loadCollatorAlgorithmWithEndUserOption()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XCollator/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XCollator/script.xlb
deleted file mode 100644
index 0a2236d45ade..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XCollator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XCollator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XCollator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/i18n_XIndexEntrySupplier.xba b/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/i18n_XIndexEntrySupplier.xba
deleted file mode 100644
index f1798683fd02..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/i18n_XIndexEntrySupplier.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XIndexEntrySupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oLocale As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XIndexEntrySupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim entry As String, index As String
-
-    Test.StartMethod("getIndexCharacter()")
-    bOK = true
-    entry = "abc"
-    index = oObj.getIndexCharacter("abc", oLocale, "")
-    Out.Log("Index key for entry '" + entry + "' is '" + index + "'")
-    bOK = bOK AND index = "A" OR index = "a"
-    Test.MethodTested("getIndexCharacter()", bOK)
-
-    Test.StartMethod("getIndexFollowPageWord()")
-    bOK = true
-    Out.Log("getIndexFollowPageWord(true, oLocale) returned " + oObj.getIndexFollowPageWord(true, oLocale))
-    bOK = bOK AND oObj.getIndexFollowPageWord(true, oLocale) &lt;&gt; ""
-    Out.Log("getIndexFollowPageWord(false, oLocale) returned " + oObj.getIndexFollowPageWord(false, oLocale))
-    bOK = bOK AND oObj.getIndexFollowPageWord(true, oLocale) &lt;&gt; ""
-    Test.MethodTested("getIndexFollowPageWord()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/script.xlb
deleted file mode 100644
index 33a460d62c30..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XIndexEntrySupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XIndexEntrySupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XIndexEntrySupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XLocaleData/i18n_XLocaleData.xba b/qadevOOo/tests/basic/ifc/i18n/XLocaleData/i18n_XLocaleData.xba
deleted file mode 100644
index 88c9952fb920..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XLocaleData/i18n_XLocaleData.xba
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XLocaleData" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XLocaleData
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim AllNames As Variant, nNamesCount As Integer, i As Integer
-    Dim Locale As Variant, oInfo As Variant, LocItem As Variant
-    Dim AllCalendars As Variant, AllCurrencies As Variant
-    Dim AllFormats As Variant, Implementations As Variant
-    Dim sOpt As Variant, size As Variant
-    Dim rtLit As Variant, fbc As Variant, rw As Variant
-
-    Test.StartMethod("getAllInstalledLocaleNames()")
-    bOK = true
-    AllNames = oObj.getAllInstalledLocaleNames()
-    nNamesCount = ubound(AllNames)
-    Out.Log("Found " + nNamesCount + " Loacales registered in the system")
-
-    for i = 0 to nNamesCount
-        Out.Log("" + i + "). " + AllNames(i).Country + ";" + AllNames(i).Language + ";" + AllNames(i).Variant)
-    next i
-
-    Randomize
-    Locale = AllNames(rnd * nNamesCount)
-    Out.Log("Choose for testing : " + Locale.Country)
-
-    bOK = bOK AND NOT isNULL(Locale)
-    Test.MethodTested("getAllInstalledLocaleNames()", bOK)
-
-    Test.StartMethod("getLanguageCountryInfo()")
-    bOK = true
-    oInfo = oObj.getLanguageCountryInfo(Locale)
-    bOK = bOK AND oInfo.Language = Locale.Language
-    bOK = bOK AND oInfo.Country = Locale.Country
-    Out.Log("Language: " + oInfo.Language + _
-           ", LanguageDefaultName: " + oInfo.LanguageDefaultName + _
-           ", Country: " + oInfo.Country + _
-           ", CountryDefaultName: " + oInfo.CountryDefaultName + _
-           ", Variant: " + oInfo.Variant)
-
-    Test.MethodTested("getLanguageCountryInfo()", bOK)
-
-    Test.StartMethod("getLocaleItem()")
-    bOK = true
-    LocItem = oObj.getLocaleItem(Locale)
-    bOK = bOK AND LocItem.unoID &lt;&gt; ""
-    Out.Log(" unoID: " + LocItem.unoID + _
-           " dateSeparator: " + LocItem.dateSeparator + _
-           " thousandSeparator: " + LocItem.thousandSeparator + _
-           " decimalSeparator: " + LocItem.decimalSeparator + _
-           " timeSeparator: " + LocItem.timeSeparator + _
-           " time100SecSeparator: " + LocItem.time100SecSeparator + _
-           " listSeparator: " + LocItem.listSeparator + _
-           " quotationStart: " + LocItem.quotationStart + _
-           " quotationEnd: " + LocItem.quotationEnd + _
-           " doubleQuotationStart: " + LocItem.doubleQuotationStart + _
-           " doubleQuotationEnd: " + LocItem.doubleQuotationEnd + _
-           " timeAM: " + LocItem.timeAM + _
-           " timePM: " + LocItem.timePM + _
-           " measurementSystem: " + LocItem.measurementSystem + _
-           " LongDateDayOfWeekSeparator: " + LocItem.LongDateDayOfWeekSeparator + _
-           " LongDateDaySeparator: " + LocItem.LongDateDaySeparator + _
-           " LongDateMonthSeparator: " + LocItem.LongDateMonthSeparator + _
-           " LongDateYearSeparator: " + LocItem.LongDateYearSeparator)
-    Test.MethodTested("getLocaleItem()", bOK)
-
-    Test.StartMethod("getAllCalendars()")
-    bOK = true
-    AllCalendars = oObj.getAllCalendars(Locale)
-    bOK = bOK AND NOT isNULL(AllCalendars(0))
-    Out.Log("Found " + ubound(AllCalendars) + 1 + " calendar(s) used in this Locale")
-
-    Dim Days As Variant, Months As Variant, Eras As Variant
-    Dim j As Integer
-    for i = 0 to ubound(AllCalendars)
-
-        Out.Log("Calendar " + i + 1 + ":")
-        Out.Log("  Days:")
-        Days = AllCalendars(i).Days
-        for j = 0 to ubound(Days)
-            Out.Log("    " + j + ") ID: " + Days(j).ID + ", AbbrevName: " + Days(j).AbbrevName + ", FullName: " + Days(j).FullName)
-        next j
-        Out.Log("  Months:")
-        Months = AllCalendars(i).Months
-        for j = 0 to ubound(Months)
-            Out.Log("    " + j + ") ID: " + Months(j).ID + ", AbbrevName: " + Months(j).AbbrevName + ", FullName: " + Months(j).FullName)
-        next j
-        Out.Log("  Eras:")
-        Eras = AllCalendars(i).Eras
-        for j = 0 to ubound(Eras)
-            Out.Log("    " + j + ") ID: " + Eras(j).ID + ", AbbrevName: " + Eras(j).AbbrevName + ", FullName: " + Eras(j).FullName)
-        next j
-        Out.Log("  StartOfWeek: " + AllCalendars(i).StartOfWeek)
-        Out.Log("  MinimumNumberOfDaysForFirstWeek: " + AllCalendars(i).MinimumNumberOfDaysForFirstWeek)
-        Out.Log("  Default: " + AllCalendars(i).Default)
-        Out.Log("  Name: " + AllCalendars(i).Name)
-    next i
-
-    Test.MethodTested("getAllCalendars()", bOK)
-
-    Test.StartMethod("getAllCurrencies()")
-    bOK = true
-    AllCurrencies = oObj.getAllCurrencies(Locale)
-    Out.Log("Found " + ubound(AllCurrencies) + 1 + " Currencies used in this Locale")
-    bOK = bOK AND NOT isNULL(AllCurrencies(0))
-    for i = 0 to ubound(AllCurrencies)
-        Out.Log("Currency " + i + 1 + ":")
-        Out.Log("  ID: " + AllCurrencies(i).ID + _
-              "  Symbol: " + AllCurrencies(i).Symbol + _
-              "  BankSymbol: " + AllCurrencies(i).BankSymbol + _
-              "  Name: " + AllCurrencies(i).Name + _
-              "  Default: " + AllCurrencies(i).Default)
-    next i
-
-    Test.MethodTested("getAllCurrencies()", bOK)
-
-    Test.StartMethod("getAllFormats()")
-    bOK = true
-    AllFormats = oObj.getAllFormats(Locale)
-    Out.Log("Found " + ubound(AllFormats) + 1 + " FormatElement(s) used in this Locale")
-    bOK = bOK AND NOT isNULL(AllFormats(0))
-    for i = 0 to ubound(AllFormats)
-        Out.Log("FormatElement " + i + 1 + ":")
-        Out.Log("  formatCode: " + AllFormats(i).formatCode + _
-              "  formatName: " + AllFormats(i).formatName + _
-              "  formatKey: " + AllFormats(i).formatKey + _
-              "  formatType: " + AllFormats(i).formatType + _
-              "  formatUsage: " + AllFormats(i).formatUsage + _
-              "  formatIndex: " + AllFormats(i).formatIndex + _
-              "  isDefault: " + AllFormats(i).isDefault)
-   	next i
-    Test.MethodTested("getAllFormats()", bOK)
-
-    Test.StartMethod("getCollatorImplementations()")
-    bOK = true
-    Implementations = oObj.getCollatorImplementations(Locale)
-    Out.Log("Found " + (ubound(Implementations) + 1) + " Implementation(s) used in this Locale")
-    bOK = bOK AND NOT isNULL(Implementations(0))
-    for i = 0 to ubound(Implementations)
-        Out.Log("Implementation " + (i + 1) + ":")
-        Out.Log("  unoID: " + Implementations(i).unoID )
-        Out.Log("  isDefault: " + Implementations(i).isDefault)
-    next i
-    Test.MethodTested("getCollatorImplementations()", bOK)
-
-    Test.StartMethod("getSearchOptions()")
-    bOK = true
-    sOpt = oObj.getSearchOptions(Locale)
-    size = ubound(sOpt)
-    Out.Log("There are : " + (size + 1) + " search options.")
-    for i = 0 to size
-    	Out.Log("'" + sOpt(i) + "'")
-    next i
-    bOK = bOK AND isArray(sOpt)
-    Test.MethodTested("getSearchOptions()", bOK)
-
-    Test.StartMethod("getCollationOptions()")
-    bOK = true
-    sOpt = oObj.getCollationOptions(Locale)
-    size = ubound(sOpt)
-    Out.Log("There are : " + (size + 1) + " collation options.")
-    for i = 0 to size
-    	Out.Log("'" + sOpt(i) + "'")
-    next i
-    bOK = bOK AND isArray(sOpt)
-    Test.MethodTested("getCollationOptions()", bOK)
-
-    Test.StartMethod("getTransliterations()")
-    bOK = true
-    rtLit = oObj.getTransliterations(Locale)
-    bOK = bOK AND NOT isNULL(rtLit)
-    for i = 0 to ubound(rtLit)
-        Out.Log("" + i + 1 +") " + rtLit(i))
-    next i
-    Test.MethodTested("getTransliterations()", bOK)
-
-    Test.StartMethod("getForbiddenCharacters()")
-    bOK = true
-    fbc = oObj.getForbiddenCharacters(Locale)
-
-    Out.Log(" beginLine: " + fbc.beginLine)
-    Out.Log(" endLine: " + fbc.endLine)
-
-    bOK = bOK AND NOT isNULL(fbc)
-    Test.MethodTested("getForbiddenCharacters()", bOK)
-
-    Test.StartMethod("getReservedWord()")
-    bOK = true
-    rw = oObj.getReservedWord(Locale)
-    bOK = bOK AND NOT isNULL(rw)
-    for i = 0 to ubound(rw)
-        Out.Log("" + i + 1 +") " + rw(i))
-    next i
-    Test.MethodTested("getReservedWord()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XLocaleData/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XLocaleData/script.xlb
deleted file mode 100644
index fb7472a9c4ab..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XLocaleData/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XLocaleData" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XLocaleData"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/i18n_XNumberFormatCode.xba b/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/i18n_XNumberFormatCode.xba
deleted file mode 100644
index 752e20ab38ae..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/i18n_XNumberFormatCode.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XNumberFormatCode" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XNumberFormatCode
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim vDefault As Variant
-    Dim vFormatCode As Variant
-
-
-    Test.StartMethod("getDefault()")
-    vDefault = oObj.getDefault(1, 1, vLocale)
-    bOK = isNumeric(vDefault.Type)
-    Test.MethodTested("getDefault()", bOK)
-
-    Test.StartMethod("getFormatCode()")
-    vFormatCode = oObj.getFormatCode(1, vLocale)
-    bOK = isNumeric(vFormatCode.Usage)
-    Test.MethodTested("getFormatCode()", bOK)
-
-    Test.StartMethod("getAllFormatCode()")
-    vGetAllFormatCode = oObj.getAllFormatCode(1, vLocale)
-    bOK = uBound(vGetAllFormatCode)
-    Test.MethodTested("getAllFormatCode()", bOK)
-
-    Test.StartMethod("getAllFormatCodes()")
-    vGetAllFormatCodes = oObj.getAllFormatCodes(vLocale)
-    bOK = uBound(vGetAllFormatCodes)
-    Test.MethodTested("getAllFormatCodes()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/script.xlb
deleted file mode 100644
index 3d354daa63ea..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XNumberFormatCode/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XNumberFormatCode" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XNumberFormatCode"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XTransliteration/i18n_XTransliteration.xba b/qadevOOo/tests/basic/ifc/i18n/XTransliteration/i18n_XTransliteration.xba
deleted file mode 100644
index faaf0bab69f4..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XTransliteration/i18n_XTransliteration.xba
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_XTransliteration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oLocale As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.i18n.XTransliteration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim availableModules As Variant
-    Dim _string As String
-    Dim i As Integer
-
-
-    Test.StartMethod("getAvailableModules()")
-    bOK = true
-    availableModules = oObj.getAvailableModules(oLocale, com.sun.star.i18n.TransliterationModules.UPPERCASE_LOWERCASE)
-    _string = ""
-    for i = 0 to ubound(availableModules)
-        _string = _string + availableModules(i) + "; "
-    next i
-    Out.Log("AvailableModules: " + _string)
-    bOK = bOK AND _string &lt;&gt; ""
-    Test.MethodTested("getAvailableModules()", bOK)
-
-    Test.StartMethod("loadModuleByImplName()")
-    bOK = true
-    oObj.loadModuleByImplName("LOWERCASE_UPPERCASE", oLocale)
-    Dim module_name As String
-    module_name = oObj.getName()
-    out.log("getName return: " + module_name)
-    bOK = module_name = "lower_to_upper(generic)"
-    Test.MethodTested("loadModuleByImplName()", bOK)
-
-    Test.StartMethod("getName()")
-    bOK = true
-    Out.Log("Module name is " + oObj.getName())
-    bOK = bOK AND oObj.getName() &lt;&gt; ""
-    Test.MethodTested("getName()", bOK)
-
-    Test.StartMethod("getType()")
-    bOK = true
-    Out.Log("Type is " + oObj.getType())
-    bOK = bOK AND oObj.getType() = 1 ' for UPPERCASE_LOWERCASE it is ONE_TO_ONE
-    Test.MethodTested("getType()", bOK)
-
-    Test.StartMethod("loadModule()")
-    bOK = true
-    oObj.loadModule(com.sun.star.i18n.TransliterationModules.LOWERCASE_UPPERCASE, oLocale)
-    bOK = bOK AND oObj.getType = com.sun.star.i18n.TransliterationType.ONE_TO_ONE
-    Test.MethodTested("loadModule()", bOK)
-
-    Test.StartMethod("loadModulesByImplNames()")
-    bOK = true
-    Dim Names(0) As String
-    Names(0) = "UPPERCASE_LOWERCASE"
-    oObj.loadModulesByImplNames(Names(), oLocale)
-    module_name = oObj.getName()
-    out.log("getName return: " + module_name)
-    bOK = module_name = "upper_to_lower(generic)"
-    Test.MethodTested("loadModulesByImplNames()", bOK)
-
-    Test.StartMethod("loadModuleNew()")
-    bOK = true
-    Dim ModulesNew(0) As Variant
-    ModulesNew(0) = com.sun.star.i18n.TransliterationModulesNew.LOWERCASE_UPPERCASE
-    oObj.loadModuleNew(ModulesNew(), oLocale)
-    bOK = bOK AND oObj.getType = com.sun.star.i18n.TransliterationType.ONE_TO_ONE
-    Test.MethodTested("loadModuleNew()", bOK)
-
-    Test.StartMethod("transliterate()")
-    Dim offset() As Variant
-    bOK = true
-    Out.Log("LOWERCASE_UPPERCASE-transliterate part of string 'AaBbCc'")
-    _string = oObj.transliterate("AaBbCc", 1, 4, offset())
-    Out.Log("Result of transliteration: " + _string)
-    bOK = bOK AND "ABBC" = _string
-    bOK = bOK AND ubound(offset()) = 3
-    for i = 0 to ubound(offset())
-        bOK = bOK AND offset(i) = i + 1
-    next i
-    Test.MethodTested("transliterate()", bOK)
-
-    Test.StartMethod("equals()")
-    bOK = true
-    Dim Match1 As Variant, Match2 As Variant
-    bOK = bOK AND oObj.equals("This is an example string to be transliterate", 2, 20, Match1, _
-                              "IS IS AN EXAMPLE STR", 0, 20, Match2)
-    Test.MethodTested("equals()", bOK)
-
-    Test.StartMethod("folding()")
-    bOK = true
-    _string = oObj.folding("AaBbCc", 1, 4, offset())
-    Out.Log("Result of folding: " + _string)
-    bOK = bOK AND "ABBC" = _string
-    bOK = bOK AND ubound(offset()) = 3
-    for i = 0 to ubound(offset())
-        bOK = bOK AND offset(i) = i + 1
-    next i
-    Test.MethodTested("folding()", bOK)
-
-    Test.StartMethod("transliterateRange()")
-    Dim Result As Variant
-    bOK = true
-    oObj.loadModule(com.sun.star.i18n.TransliterationModules.IGNORE_CASE, _Locale)
-    Result = oObj.transliterateRange("a", "c")
-    for i = 0 to ubound(Result)
-        Out.Log(Result(i))
-    next i
-    bOK = bOK AND ubound(Result()) = 3 AND _
-        ((Result(0) = "a" AND Result(1) = "c" AND Result(2) = "A" AND Result(3) = "C" ) OR _
-         (Result(0) = "A" AND Result(1) = "C" AND Result(2) = "a" AND Result(3) = "c" ))
-    Test.MethodTested("transliterateRange()", bOK)
-
-    Test.StartMethod("compareString()")
-    oObj.loadModule(com.sun.star.i18n.TransliterationModules.LOWERCASE_UPPERCASE, _Locale)
-    bOK = true
-    bOK = bOK AND testString("", "", 0)
-    bOK = bOK AND testString("a", "", 1)
-    bOK = bOK AND testString("a", "a", 0)
-    bOK = bOK AND testString("A", "a", 1)
-    bOK = bOK AND testString("b", "a", 1)
-    bOK = bOK AND testString(chr(10), chr(10), 0)
-    bOK = bOK AND testString(chr(10), chr(9), 1)
-    bOK = bOK AND testString("aaa", "aaa", 0)
-    bOK = bOK AND testString("aaA", "aaa", 1)
-    bOK = bOK AND testString("aaa", "aa", 1)
-    bOK = bOK AND testString("ab", "aaa", 1)
-    bOK = bOK AND testString("aba", "aa", 1)
-    bOK = bOK AND testString("aaa" + chr(10) + chr(9) + "a", "aaa" + chr(10) + chr(9) + "a", 0)
-    bOK = bOK AND testString("aaa" + chr(9) + chr(10) + "b", "aaa" + chr(9) + chr(10) + "a", 1)
-    Test.MethodTested("compareString()", bOK)
-
-    Test.StartMethod("compareSubstring()")
-    bOK = true
-    ' substrings below must be equal
-    bOK = bOK AND testSubstring("", 0, 0, "", 0, 0, 0)
-    bOK = bOK AND testSubstring("aa", 1, 0, "", 0, 0, 0)
-    bOK = bOK AND testSubstring("aa", 1, 0, "aa", 2, 0, 0)
-    bOK = bOK AND testSubstring("a", 0, 1, "a", 0, 1, 0)
-    bOK = bOK AND testSubstring("ab", 0, 2, "ab", 0, 2, 0)
-    bOK = bOK AND testSubstring("abc", 1, 2, "abc", 1, 2, 0)
-    bOK = bOK AND testSubstring("abcdef", 0, 3, "123abc", 3, 3, 0)
-    bOK = bOK AND testSubstring("abcdef", 1, 1, "123abc", 4, 1, 0)
-
-    ' substrings below must NOT be equal
-    bOK = bOK AND testSubstring("a", 0, 1, "a", 0, 0, 1)
-    bOK = bOK AND testSubstring("aaa", 1, 1, "", 0, 0, 1)
-    bOK = bOK AND testSubstring("bbb", 2, 1, "aaa", 2, 1, 1)
-    bOK = bOK AND testSubstring("abc", 0, 3, "abc", 0, 2, 1)
-    bOK = bOK AND testSubstring("bbc", 1, 2, "bbc", 0, 2, 1)
-
-    Test.MethodTested("compareSubstring()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function testString(str1 As String, str2 As String, expRes As Integer) As Boolean
-    if expRes = 0 then
-        testString = testStringCommon(str1, str2, expRes, false)
-    else
-        testString = testStringCommon(str1, str2, expRes, true)
-    end if
-End Function
-
-Function testStringCommon(str1 As String, str2 As String, expRes As Integer, testReverse As Boolean) As Boolean
-        Dim res As Integer
-
-        testStringCommon = true
-
-        res = -666
-
-        res = oObj.compareString(str1, str2)
-
-        if res = expRes then
-            Out.Log("Comparing of '" + str1 + "' and '" + str2 + "' OK" )
-        else
-            Out.Log("Comparing of '" + str1 + "' and '" + str2 + _
-                "' FAILED; return: " + res + ", expected: " + expRes)
-            testStringCommon = false
-        end if
-
-        if NOT testReverse then
-            Exit Function
-        end if
-
-        res = -666
-
-        res = oObj.compareString(str2, str1)
-
-        if res = -expRes then
-            Out.Log("Comparing of '" + str2 + "' and '" + str1 + "' OK" )
-        else
-            Out.Log("Comparing of '" + str2 + "' and '" + str1 + _
-                "' FAILED; return: " + res + ", expected: " + -expRes)
-            testStringCommon = false
-        end if
-End Function
-
-Function testSubstring(str1 As String, p1 As Integer, len1 As Integer, _
-        str2 As String, p2 As Integer, len2 As Integer, expRes As Integer) As Boolean
-
-        testSubstring = true
-
-        Dim res As Integer
-        res = -666
-
-        res = oObj.compareSubstring(str1, p1, len1, str2, p2, len2)
-
-        if res &lt;&gt; expRes then
-            Out.Log("Comparing FAILED; return: " + res + ", expected: " + expRes + " ")
-            testSubstring = false
-        else
-            Out.Log("Comparing OK : ")
-        end if
-        Out.Log("('" + str1 + "', " + p1 + ", " + len1 + ", '" + _
-            str2 + "', " + p2 + ", " + len2 + ")")
-
-        res = -666
-
-        res = oObj.compareSubstring(str2, p2, len2, str1, p1, len1)
-
-        if res &lt;&gt; -expRes then
-            Out.Log("Comparing FAILED; return: " + res + ", expected: " + _
-                -expRes  + " ")
-            testSubstring = false
-        else
-            Out.Log("Comparing OK :")
-        end if
-        Out.Log("('" + str2 + "', " + p2 + ", " + len2 + ", '" + _
-            str1 + "', " + p1 + ", " + len1 + ")")
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/i18n/XTransliteration/script.xlb b/qadevOOo/tests/basic/ifc/i18n/XTransliteration/script.xlb
deleted file mode 100644
index ea5ecbba7158..000000000000
--- a/qadevOOo/tests/basic/ifc/i18n/XTransliteration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_XTransliteration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_XTransliteration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataControl/io_XActiveDataControl.xba b/qadevOOo/tests/basic/ifc/io/XActiveDataControl/io_XActiveDataControl.xba
deleted file mode 100644
index b62d12cabbf0..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataControl/io_XActiveDataControl.xba
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XActiveDataControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oPipe As Object
-'     - Global PumpOUTFileName As String
-
-'*************************************************************************
-
-
-
-
-Dim oListener1 As Object
-Dim oListener2 As Object
-Dim CB1Started As Integer
-Dim CB1Closed As Integer
-Dim CB1Terminated As Integer
-Dim CB1Error As Integer
-Dim CB2Started As Integer
-Dim CB2Closed As Integer
-Dim CB2Terminated As Integer
-Dim CB2Error As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XActiveDataControl
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iSize As Integer
-
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    Dim aBytes(10) As Integer
-    for i = 0 to ubound(aBytes())
-        aBytes(i) = i * 3
-    next i
-
-    Test.StartMethod("start()")
-    Test.StartMethod("terminate()")
-    bOK = true
-
-    Out.Log("Writing some bytes to Pipe")
-
-    oPipe.writeBytes(aBytes())
-
-    Out.Log("The pump was not started yet. So, PumpOUT should be of zero size")
-    Out.Log("Terminating a pipe to have an opportunity to get a file size")
-    oObj.terminate()
-
-    iSize = oFileAcc.getSize(PumpOUTFileName)
-    Out.Log("Size of file is " &amp; iSize)
-    bOK = bOK AND iSize = 0
-    DisposeObj()
-    CreateObj()
-
-    Out.Log("Writing bytes again (because object was destroyed)")
-    oPipe.writeBytes(aBytes())
-    Out.Log("... and starting pump")
-    oObj.start()
-    wait(100)
-    Out.Log("Now PumpOUT should have size " &amp; ubound(aBytes()) + 1)
-    Out.Log("Terminating a pipe to have an opportunity to get a file size")
-    oObj.terminate()
-    iSize = oFileAcc.getSize(PumpOUTFileName)
-    Out.Log("Size of file is " &amp; iSize)
-    bOK = bOK AND iSize = ubound(aBytes()) + 1
-
-    Test.MethodTested("start()", bOK)
-    Test.MethodTested("terminate()", bOK)
-
-    DisposeObj()
-    CreateObj()
-    ResetCounters()
-
-    oListener1 = createUnoListener("CB1_", "com.sun.star.io.XStreamListener")
-    oListener2 = createUnoListener("CB2_", "com.sun.star.io.XStreamListener")
-
-    Test.StartMethod("addListener()")
-    bOK = true
-    Out.Log("adding two listeners")
-    oObj.addListener(oListener1)
-    oObj.addListener(oListener2)
-    oPipe.writeBytes(aBytes())
-    oObj.start()
-    wait(100) ' for listeners to change counters
-    bOK = CB1Started = 1 AND CB2Started = 1
-    Test.MethodTested("addListener()", bOK)
-
-    DisposeObj()
-    CreateObj()
-    ResetCounters()
-
-    Test.StartMethod("removeListener()")
-    bOK = true
-    Out.Log("adding two listeners")
-    oObj.addListener(oListener1)
-    oObj.addListener(oListener2)
-    Out.Log("Removing first listener...")
-    oObj.removeListener(oListener1)
-    oPipe.writeBytes(aBytes())
-    oObj.start()
-    wait(100)
-    bOK = CB1Started = 0 AND CB2Started = 1
-    Test.MethodTested("removeListener()", bOK)
-    DisposeObj()
-    CreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub ResetCounters()
-    CB1Started = 0
-    CB1Closed = 0
-    CB1Terminated = 0
-    CB1Error = 0
-    CB2Started = 0
-    CB2Closed = 0
-    CB2Terminated = 0
-    CB2Error = 0
-End Sub
-
-Sub CB1_Started()
-    Out.Log("CB1_Started called")
-    CB1Started = CB1Started + 1
-End Sub
-
-Sub CB2_Started()
-    Out.Log("CB2_Started called")
-    CB2Started = CB2Started + 1
-End Sub
-
-Sub CB1_Closed()
-    Out.Log("CB1_Closed called")
-    CB1Closed = CB1Closed + 1
-End Sub
-
-Sub CB2_Closed()
-    Out.Log("CB2_Closed called")
-    CB2Closed = CB2Closed + 1
-End Sub
-
-Sub CB1_Terminated()
-    Out.Log("CB1_Terminated called")
-    CB1Terminated = CB1Terminated + 1
-End Sub
-
-Sub CB2_Terminated()
-    Out.Log("CB2_Terminated called")
-    CB2Terminated = CB2Terminated + 1
-End Sub
-
-Sub CB1_Error(aError As Object)
-    Out.Log("CB1_Error called")
-    CB1Error = CB1Error + 1
-End Sub
-
-Sub CB2_Error(aError As Object)
-    Out.Log("CB2_Error called")
-    CB2Error = CB2Error + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataControl/script.xlb b/qadevOOo/tests/basic/ifc/io/XActiveDataControl/script.xlb
deleted file mode 100644
index 8492bc4365c6..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XActiveDataControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XActiveDataControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataSink/io_XActiveDataSink.xba b/qadevOOo/tests/basic/ifc/io/XActiveDataSink/io_XActiveDataSink.xba
deleted file mode 100644
index d28d501553cd..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataSink/io_XActiveDataSink.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XActiveDataSink" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XActiveDataSink
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oIS As Object, oPipe As Object, oGetPipe As Object
-    Dim aData As Variant, aGetData As Variant
-    Dim bytesRead As Variant
-
-    ResetStreams()
-    Test.StartMethod("getInputStream()")
-    bOK = true
-    oIS = oObj.getInputStream()
-    bOK = bOK AND hasUnoInterfaces(oIS, "com.sun.star.io.XInputStream")
-    Test.MethodTested("getInputStream()", bOK)
-
-    Test.StartMethod("setInputStream()")
-    bOK = true
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-    aData = Array(23, 65, 32, 119)
-    oPipe.writeBytes(aData)
-    oObj.setInputStream(oPipe)
-    oGetPipe = oObj.getInputStream()
-    aGetData = dimArray(ubound(aData())
-    bytesRead = oGetPipe.readBytes(aGetData(), ubound(aData()) + 1)
-    Out.Log("Reading bytes: " + bytesRead)
-    
-    bOK = bOK AND cmpArrays(aData, aGetData)
-    
-    Out.Log("Setting old input stream ...")
-    oObj.setInputStream(oIS)
-    
-    Test.MethodTested("setInputStream()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function cmpArrays(arr1 As Variant, arr2 As Variant) As Boolean
-On Error Goto ErrHndl
-    Dim bRet As Boolean
-    Dim i As Integer
-    
-    bRet = true
-    if (isNull(arr1) OR isNull(arr2)) then 
-        bRet = false
-        Out.Log("One of arrays is null")
-    else
-        if (ubound(arr1()) &lt;&gt; ubound(arr2())) then
-            Out.Log("UBOUND of 1st array is " + ubound(arr1()) + _
-                "UBOUND of 2nd array is " + ubound(arr2()))
-            bRet = false
-        else
-            for i = 0 to ubound(arr1()) 
-                Out.Log("(" + i + "): " + arr1(i) + "-" + arr2(i))
-                bRet = bRet AND (arr1(i) = arr2(i))
-            next i
-        end if
-    end if
-    
-    cmpArrays() = bRet
-exit Function
-ErrHndl:
-    Test.Exception()
-    cmpArrays() = false
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataSink/script.xlb b/qadevOOo/tests/basic/ifc/io/XActiveDataSink/script.xlb
deleted file mode 100644
index b85797766d3e..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataSink/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XActiveDataSink" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XActiveDataSink"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataSource/io_XActiveDataSource.xba b/qadevOOo/tests/basic/ifc/io/XActiveDataSource/io_XActiveDataSource.xba
deleted file mode 100644
index 3bd00f2bd4ad..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataSource/io_XActiveDataSource.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XActiveDataSource" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XActiveDataSource
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oOS As Object
-
-    Test.StartMethod("getOutputStream()")
-    bOK = true
-    oOS = oObj.getOutputStream()
-    bOK = bOK AND hasUnoInterfaces(oOS, "com.sun.star.io.XOutputStream")
-    Test.MethodTested("getOutputStream()", bOK)
-
-    Test.StartMethod("setOutputStream()")
-    bOK = true
-    oObj.setOutputStream(oOS)
-    Test.MethodTested("setOutputStream()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XActiveDataSource/script.xlb b/qadevOOo/tests/basic/ifc/io/XActiveDataSource/script.xlb
deleted file mode 100644
index 8dd0873e6226..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XActiveDataSource/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XActiveDataSource" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XActiveDataSource"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XConnectable/io_XConnectable.xba b/qadevOOo/tests/basic/ifc/io/XConnectable/io_XConnectable.xba
deleted file mode 100644
index a30e570dea38..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XConnectable/io_XConnectable.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XConnectable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XConnectable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("setPredecessor()")
-    bOK = true
-    oObj.setPredecessor(oObj)
-    Test.MethodTested("setPredecessor()", bOK)
-
-    Test.StartMethod("getPredecessor()")
-    bOK = true
-    oPr = oObj.getPredecessor()
-    bOK = bOK AND hasUnoInterfaces(oPr, "com.sun.star.io.XConnectable")
-    Test.MethodTested("getPredecessor()", bOK)
-
-    Test.StartMethod("setSuccessor()")
-    bOK = true
-    oObj.setSuccessor(oObj)
-    Test.MethodTested("setSuccessor()", bOK)
-
-    Test.StartMethod("getSuccessor()")
-    bOK = true
-    oSc = oObj.getSuccessor()
-    bOK = bOK AND hasUnoInterfaces(oSc, "com.sun.star.io.XConnectable")
-    Test.MethodTested("getSuccessor()", bOK)
-
-    ResetStreams()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XConnectable/script.xlb b/qadevOOo/tests/basic/ifc/io/XConnectable/script.xlb
deleted file mode 100644
index b0feddcc80d4..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XConnectable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XConnectable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XConnectable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XDataInputStream/io_XDataInputStream.xba b/qadevOOo/tests/basic/ifc/io/XDataInputStream/io_XDataInputStream.xba
deleted file mode 100644
index 989ceed4875e..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XDataInputStream/io_XDataInputStream.xba
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XDataInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XDataInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim DataTypes(10) As String
-    Dim Data(10) As Variant
-    Dim oTypeConvertor As Object
-
-    bOK = true
-
-    oTypeConvertor = createUnoService("com.sun.star.script.Converter")
-
-    DataTypes(0) = "byte"
-    Data(0) = 65
-    DataTypes(1) = "boolean"
-    Data(1) = true
-    DataTypes(2) = "double"
-    Data(2) = 10.567
-    DataTypes(3) = "long"
-    Data(3) = 12345678
-    DataTypes(4) = "char"
-    Data(4) = oTypeConvertor.convertToSimpleType(89, com.sun.star.uno.TypeClass.CHAR)
-    DataTypes(5) = "short"
-    Data(5) = 233
-    DataTypes(6) = "UTF"
-    Data(6) = "UTF String"
-    DataTypes(7) = "float"
-    Data(7) = -233.15
-    DataTypes(8) = "Hyper"
-    Data(8) = 98765432123456
-
-    Out.Log("Writing data first... ")
-
-    oOutStream = getOutStream()
-
-    for i = 0 to ubound(Data())
-        select case DataTypes(i)
-            case "boolean"
-                oOutStream.writeBoolean(Data(i))
-            case "byte"
-                oOutStream.writeByte(Data(i))
-            case "char"
-                oOutStream.writeChar(Data(i))
-            case "short"
-                oOutStream.writeShort(Data(i))
-            case "long"
-                oOutStream.writeLong(Data(i))
-            case "Hyper"
-                oOutStream.writeHyper(Data(i))
-            case "float"
-                oOutStream.writeFloat(Data(i))
-            case "double"
-                oOutStream.writeDouble(Data(i))
-            case "UTF"
-                oOutStream.writeUTF(Data(i))
-        end select
-    next i
-
-    Out.Log("then reading and comparering... ")
-
-    ResetStreams()
-
-    for i = 0 to ubound(Data())
-        select case DataTypes(i)
-            case "boolean"
-                Dim bVar As Boolean
-                bVar = oObj.readBoolean()
-                Out.Log("Expected boolean '" &amp; Data(i) &amp; "', actual is '" &amp; bVar &amp; "'")
-                bOK = bOK AND Data(i) = bVar
-                Test.MethodTested("readBoolean()", bOK)
-            case "byte"
-                Dim iByteVar As Integer
-                iByteVar = oObj.readByte()
-                Out.Log("Expected byte '" &amp; int(Data(i)) &amp; "', actual is '" &amp; int(iByteVar) &amp; "'")
-                bOK = bOK AND Data(i) = iByteVar
-                Test.MethodTested("readByte()", bOK)
-            case "char"
-                Dim cCharVar As Integer
-                cCharVar = oObj.readChar()
-                Out.Log("Expected char '" &amp; chr(Data(i)) &amp; "', actual is '" &amp; chr(cCharVar) &amp; "'")
-                bOK = bOK AND Data(i) = cCharVar
-                Test.MethodTested("readChar()", bOK)
-            case "short"
-                Dim iShortVar As Integer
-                iShortVar = oObj.readShort()
-                Out.Log("Expected short '" &amp; int(Data(i)) &amp; "', actual is '" &amp; int(iShortVar) &amp; "'")
-                bOK = bOK AND Data(i) = iShortVar
-                Test.MethodTested("readShort()", bOK)
-            case "long"
-                Dim iLongVar As Long
-                iLongVar = oObj.readLong()
-                Out.Log("Expected long '" &amp; Data(i) &amp; "', actual is '" &amp; iLongVar &amp; "'")
-                bOK = bOK AND Data(i) = iLongVar
-                Test.MethodTested("readLong()", bOK)
-            case "Hyper"
-                Dim iHyperVar As Variant
-                iHyperVar = oObj.readHyper()
-                Out.Log("Expected hyper '" &amp; Data(i) &amp; "', actual is '" &amp; iHyperVar &amp; "'")
-                bOK = bOK AND Data(i) = iHyperVar
-                Test.MethodTested("readHyper()", bOK)
-            case "float"
-                Dim dFloatVar As Double
-                dFloatVar = oObj.readFloat()
-                Out.Log("Expected float '" &amp; Data(i) &amp; "', actual is '" &amp; dFloatVar &amp; "'")
-                bOK = bOK AND (abs(Data(i) - dFloatVar) &lt; 0.00001)
-                Test.MethodTested("readFloat()", bOK)
-            case "double"
-                Dim dDoubleVar As Double
-                dDoubleVar = oObj.readDouble()
-                Out.Log("Expected double '" &amp; Data(i) &amp; "', actual is '" &amp; dDoubleVar &amp; "'")
-                bOK = bOK AND Data(i) = dDoubleVar
-                Test.MethodTested("readDouble()", bOK)
-            case "UTF"
-                Dim cUTFVar As String
-                cUTFVar = oObj.readUTF()
-                Out.Log("Expected UTF '" &amp; Data(i) &amp; "', actual is '" &amp; cUTFVar &amp; "'")
-                bOK = bOK AND Data(i) = cUTFVar
-                Test.MethodTested("readUTF()", bOK)
-        end select
-    next i
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XDataInputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XDataInputStream/script.xlb
deleted file mode 100644
index c3623319e6ed..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XDataInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XDataInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XDataInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XDataOutputStream/io_XDataOutputStream.xba b/qadevOOo/tests/basic/ifc/io/XDataOutputStream/io_XDataOutputStream.xba
deleted file mode 100644
index 6ec09d17c2cd..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XDataOutputStream/io_XDataOutputStream.xba
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XDataOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XDataOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim DataTypes(10) As String
-    Dim Data(10) As Variant
-    Dim oTypeConvertor As Object
-    Dim i As Integer
-    Dim oInputStream As Object
-
-    bOK = true
-
-    oTypeConvertor = createUnoService("com.sun.star.script.Converter")
-
-    DataTypes(0) = "byte"
-    Data(0) = 65
-    DataTypes(1) = "boolean"
-    Data(1) = true
-    DataTypes(2) = "double"
-    Data(2) = 10.567
-    DataTypes(3) = "long"
-    Data(3) = 12345678
-    DataTypes(4) = "char"
-    Data(4) = oTypeConvertor.convertToSimpleType(89, com.sun.star.uno.TypeClass.CHAR)
-    DataTypes(5) = "short"
-    Data(5) = 233
-    DataTypes(6) = "UTF"
-    Data(6) = "UTF String"
-    DataTypes(7) = "float"
-    Data(7) = -233.15
-    DataTypes(8) = "Hyper"
-    Data(8) = 98765432123456
-
-    Out.Log("Writing data first... ")
-
-    for i = 0 to ubound(Data())
-        select case DataTypes(i)
-            case "boolean"
-                oObj.writeBoolean(Data(i))
-            case "byte"
-                oObj.writeByte(Data(i))
-            case "char"
-                oObj.writeChar(Data(i))
-            case "short"
-                oObj.writeShort(Data(i))
-            case "long"
-                oObj.writeLong(Data(i))
-            case "Hyper"
-                oObj.writeHyper(Data(i))
-            case "float"
-                oObj.writeFloat(Data(i))
-            case "double"
-                oObj.writeDouble(Data(i))
-            case "UTF"
-                oObj.writeUTF(Data(i))
-        end select
-    next i
-
-    Out.Log("then reading and comparering... ")
-
-    oInputStream = getInStream()
-
-    for i = 0 to ubound(Data())
-        select case DataTypes(i)
-            case "boolean"
-                Dim bVar As Boolean
-                bVar = oInputStream.readBoolean()
-                Out.Log("Expected boolean '" + Data(i) + "', actual is '" + bVar + "'")
-                bOK = bOK AND Data(i) = bVar
-                Test.MethodTested("writeBoolean()", bOK)
-            case "byte"
-                Dim iByteVar As Integer
-                iByteVar = oInputStream.readByte()
-                Out.Log("Expected byte '" + int(Data(i)) + "', actual is '" + int(iByteVar) + "'")
-                bOK = bOK AND Data(i) = iByteVar
-                Test.MethodTested("writeByte()", bOK)
-            case "char"
-                Dim cCharVar As Integer
-                cCharVar = oInputStream.readChar()
-                Out.Log("Expected char '" + chr(Data(i)) + "', actual is '" + chr(cCharVar) + "'")
-                bOK = bOK AND Data(i) = cCharVar
-                Test.MethodTested("writeChar()", bOK)
-            case "short"
-                Dim iShortVar As Integer
-                iShortVar = oInputStream.readShort()
-                Out.Log("Expected short '" + int(Data(i)) + "', actual is '" + int(iShortVar) + "'")
-                bOK = bOK AND Data(i) = iShortVar
-                Test.MethodTested("writeShort()", bOK)
-            case "long"
-                Dim iLongVar As Long
-                iLongVar = oInputStream.readLong()
-                Out.Log("Expected long '" + Data(i) + "', actual is '" + iLongVar + "'")
-                bOK = bOK AND Data(i) = iLongVar
-                Test.MethodTested("writeLong()", bOK)
-            case "Hyper"
-                Dim iHyperVar As Variant
-                iHyperVar = oInputStream.readHyper()
-                Out.Log("Expected hyper '" + Data(i) + "', actual is '" + iHyperVar + "'")
-                bOK = bOK AND Data(i) = iHyperVar
-                Test.MethodTested("writeHyper()", bOK)
-            case "float"
-                Dim dFloatVar As Double
-                dFloatVar = oInputStream.readFloat()
-                Out.Log("Expected float '" + Data(i) + "', actual is '" + dFloatVar + "'")
-                bOK = bOK AND (abs(Data(i) - dFloatVar) &lt; 0.00001)
-                Test.MethodTested("writeFloat()", bOK)
-            case "double"
-                Dim dDoubleVar As Double
-                dDoubleVar = oInputStream.readDouble()
-                Out.Log("Expected double '" + Data(i) + "', actual is '" + dDoubleVar + "'")
-                bOK = bOK AND Data(i) = dDoubleVar
-                Test.MethodTested("writeDouble()", bOK)
-            case "UTF"
-                Dim cUTFVar As Variant
-                cUTFVar = oInputStream.readUTF()
-                Out.Log("Expected UTF '" + Data(i) + "', actual is '" + cUTFVar + "'")
-                bOK = bOK AND Data(i) = cUTFVar
-                Test.MethodTested("writeUTF()", bOK)
-        end select
-    next i
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XDataOutputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XDataOutputStream/script.xlb
deleted file mode 100644
index 95fc351c043e..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XDataOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XDataOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XDataOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XInputStream/io_XInputStream.xba b/qadevOOo/tests/basic/ifc/io/XInputStream/io_XInputStream.xba
deleted file mode 100644
index f4fae54389ea..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XInputStream/io_XInputStream.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Bytes(10) As Integer
-    Dim rBytes(10) As Integer
-    Dim oOutputStream As Object
-    Dim i As Integer
-    Dim nRead As Integer
-
-    Out.Log("First writeBytes()...")
-    bOK = true
-
-    for i = 0 to ubound(Bytes())
-        Bytes(i) = i
-    next i
-
-    oOutputStream = getOutStream()
-    oOutputStream.writeBytes(Bytes())
-
-    if (cObjectName &lt;&gt; "stm.Pipe") then ResetStreams()
-
-    Test.StartMethod("readBytes()")
-    bOK = true
-    nRead = oObj.readBytes(Bytes(), 5)
-    bOK = bOK AND nRead = 5
-    for i = 0 to 4
-        Out.Log("Expected " &amp; i &amp; ", actual is " &amp; int(Bytes(i)))
-        bOK = bOK AND Bytes(i) = i
-    next i
-    Test.MethodTested("readBytes()", bOK)
-
-    Test.StartMethod("skipBytes()")
-    bOK = true
-    oObj.skipBytes(2)
-    nRead = oObj.readBytes(Bytes(), 2)
-    Out.Log("Expected " &amp; 7 &amp; ", actual is " &amp; int(Bytes(0)))
-    bOK = bOK AND Bytes(0) = 7
-    Test.MethodTested("skipBytes()", bOK)
-
-    Test.StartMethod("available()")
-    bOK = true
-    iAvail = oObj.available()
-    Out.Log("bytes available without blocking: " &amp; iAvail)
-    bOK = bOK AND iAvail &gt;= 0
-    Test.MethodTested("available()", bOK)
-
-    Test.StartMethod("readSomeBytes()")
-    bOK = true
-    nRead = oObj.readSomeBytes(Bytes(), 10)
-    Out.Log("Can read " &amp; nRead &amp; " bytes.")
-    for i = 0 to ubound(Bytes())
-        Out.Log(int(Bytes(i)))
-    next i
-    bOK = bOK AND ubound(Bytes()) = 1
-    bOK = bOK AND nRead = 2
-    bOK = bOK AND Bytes(0) = 9
-    bOK = bOK AND Bytes(1) = 10
-    Test.MethodTested("readSomeBytes()", bOK)
-
-    Test.StartMethod("closeInput()")
-    bOK = true
-    Out.Log("This method is called in main module.")
-    Test.MethodTested("closeInput()", bOK)
-
-    ResetStreams()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XInputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XInputStream/script.xlb
deleted file mode 100644
index 7154ab2bb35b..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XMarkableStream/io_XMarkableStream.xba b/qadevOOo/tests/basic/ifc/io/XMarkableStream/io_XMarkableStream.xba
deleted file mode 100644
index 12d14e6f2c9c..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XMarkableStream/io_XMarkableStream.xba
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XMarkableStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XMarkableStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Bytes(20) As Integer
-    Dim rBytes(0)
-    Dim lastRByte As Integer
-    Dim i As Integer
-    Dim oOutStream As Object
-    Dim oInStream As Object
-    Dim iMark1 As Integer
-    Dim iMark2 As Integer
-    Dim iByte As Integer
-    Dim iBytes As Integer
-    Dim iByteAfterMark As Integer
-    Dim iByteAfterMark1 As Integer
-    Dim iByteAfterMark2 As Integer
-    Dim iOffset As Integer
-    Dim sFileStr As String
-
-    if (cObjectName = "stm.MarkableInputStream" OR cObjectName = "stm.ObjectInputStream") then
-
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i * 2
-        next i
-
-        Out.Log("First reset streams and write some bytes...")
-        oOutStream = getOutStream()
-        oOutStream.writeBytes(Bytes())
-        ResetStreams()
-
-        Test.StartMethod("createMark()")
-        bOK = true
-        Out.Log("Skip 3 bytes.")
-        oObj.skipBytes(3)
-        iMark1 = oObj.createMark()
-        Out.Log("Mark" + iMark1 + " was created.")
-
-        oObj.readBytes(rBytes(), 1)
-        iByteAfterMark1 = rBytes(0)
-        Out.Log("Byte after Mark" + iMark1 + " is " + int(iByteAfterMark1))
-
-        Out.Log("Skip 5 bytes.")
-        oObj.skipBytes(5)
-        iMark2 = oObj.createMark()
-        Out.Log("Mark" + iMark2 + " was created.")
-
-        oObj.readBytes(rBytes(), 1)
-        iByteAfterMark2 = rBytes(0)
-        Out.Log("Byte after Mark" + iMark2 + " is " + int(iByteAfterMark2))
-
-        Out.Log("Skip 7 bytes.")
-        oObj.skipBytes(7)
-        oObj.readBytes(rBytes(), 1)
-        lastRByte = rBytes(0)
-
-        Out.Log("Jump to Mark" + iMark2)
-        oObj.jumpToMark(iMark2)
-        oObj.readBytes(rBytes(), 1)
-        iByteAfterMark = rBytes(0)
-        Out.Log("Byte after Mark" + iMark2 + " is " + int(iByteAfterMark) + ", expected " + int(iByteAfterMark2))
-        bOK = bOK AND iByteAfterMark = iByteAfterMark2
-
-        Out.Log("Jump to Mark" + iMark1)
-        oObj.jumpToMark(iMark1)
-        oObj.readBytes(rBytes(), 1)
-        iByteAfterMark = rBytes(0)
-        Out.Log("Byte after Mark" + iMark1 + " is " + int(iByteAfterMark) + ", expected " + int(iByteAfterMark1))
-        bOK = bOK AND iByteAfterMark = iByteAfterMark1
-
-        Test.MethodTested("createMark()", bOK)
-        Test.MethodTested("jumpToMark()", bOK)
-
-        Test.StartMethod("offsetToMark()")
-        bOK = true
-        iOffset = oObj.offsetToMark(iMark2)
-        Out.Log("Offset from current position to Mark" + iMark2 + " is " + iOffset)
-        bOK = bOK AND iOffset = -5
-        Test.MethodTested("offsetToMark()", bOK)
-
-        Test.StartMethod("deleteMark()")
-        bOK = true
-        Out.Log("Delete Mark" + iMark1)
-        oObj.deleteMark(iMark1)
-        On Error goto ErrHndl1
-            Out.Log("Trying to jump to deleted mark")
-            oObj.jumpToMark(iMark1)
-            Out.Log("No exception occurred. FAILED")
-            bOK = false
-            goto Cont1
-        ErrHndl1:
-            Out.Log("Expected exception: " + error)
-        Cont1:
-        Test.MethodTested("deleteMark()", bOK)
-
-        Test.StartMethod("jumpToFurthest()")
-        bOK = true
-        oObj.readBytes(rBytes(), 1)
-        iByte = rBytes(0)
-        Out.Log("Perform a reading operation from the current position. Byte " + int(iByte) + " was read.")
-        Out.Log("Changing position.")
-        oObj.jumpToMark(iMark2)
-        Out.Log("Changing position with jumpToFurthest()")
-        oObj.jumpToFurthest()
-        oObj.readBytes(rBytes(), 1)
-        Out.Log("From the current position byte " + int(rBytes(0)) + " was read. Expected byte is " + int(lastRByte) + 2)
-        bOK = bOK AND lastRByte + 2 = rBytes(0)
-        Test.MethodTested("jumpToFurthest()", bOK)
-    else
-        bOK = true
-        Out.Log("Write 3 bytes to stream")
-        ReDim Bytes(2) As Integer
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i
-        next i
-        oObj.writeBytes(Bytes())
-        Out.Log("Creating a Mark.")
-        iMark1 = oObj.createMark()
-        Out.Log("Write 4 bytes to stream")
-        ReDim Bytes(3) As Integer
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i + 3
-        next i
-        oObj.writeBytes(Bytes())
-        Out.Log("Creating a Mark.")
-        iMark2 = oObj.createMark()
-
-        iOffset = oObj.offsetToMark(iMark1)
-        Out.Log("Offset from current position to Mark" + iMark1 + " is " + iOffset)
-        bOK = bOK AND iOffset = 4
-        Test.MethodTested("offsetToMark()", bOK)
-
-        Out.Log("Write 5 bytes to stream")
-        ReDim Bytes(4) As Integer
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i + 7
-        next i
-        oObj.writeBytes(Bytes())
-
-        Out.Log("Testing jumpToMark()")
-        Out.Log("Testing deleteMark()")
-        bOK = true
-        Out.Log("Deleting Mark1")
-        oObj.deleteMark(iMark2)
-        On Error goto ErrHndl2
-            Out.Log("Trying to jump to Mark1")
-            oObj.jumpToMark(iMark2)
-            Out.Log("No exception occurred - FAILED")
-            bOK = false
-            goto Cont2
-        ErrHndl2:
-            Out.Log("Expected exception: " + error)
-        Cont2:
-
-        Test.MethodTested("deleteMark()", bOK)
-
-        bOK = true
-
-        Out.Log("Jump to Mark0")
-        oObj.jumpToMark(iMark1)
-        Test.MethodTested("jumpToMark()", bOK)
-        Test.MethodTested("createMark()", bOK)
-
-        bOK = true
-        Out.Log("Write 2 bytes to stream")
-        ReDim Bytes(1) As Integer
-
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i + 12
-        next i
-
-        oObj.writeBytes(Bytes())
-        Out.Log("Changing position")
-        oObj.jumpToMark(iMark1)
-        Out.Log("Changing position with jumpToFurthest()")
-        oObj.jumpToFurthest()
-
-        Out.Log("Write 2 bytes to stream")
-        ReDim Bytes(1) As Integer
-        for i = 0 to ubound(Bytes())
-            Bytes(i) = i + 14
-        next i
-        oObj.writeBytes(Bytes())
-
-        Out.Log("Comparing file with expected {0, 1, 2, 12, 13, 5, 6, 7, 8, 9, 10, 11, 14, 15}")
-        oInStream = getInStream()
-        iBytes = oInStream.readBytes(rBytes(), 20)
-        Out.Log("There are " + iBytes + " in stream:")
-        sFileStr = "" + int(rBytes(0))
-        for i = 1 to ubound(rBytes())
-            sFileStr = sFileStr + ", " + int(rBytes(i))
-        next i
-        Out.Log("They are {" + sFileStr + "}")
-        bOK = bOK AND sFileStr = "0, 1, 2, 12, 13, 5, 6, 7, 8, 9, 10, 11, 14, 15"
-
-        Test.MethodTested("jumpToFurthest()", bOK)
-    end if
-
-    ResetStreams()
-    DisposeObj()
-    CreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XMarkableStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XMarkableStream/script.xlb
deleted file mode 100644
index 0cccb2f8f56c..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XMarkableStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XMarkableStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XMarkableStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XObjectInputStream/io_XObjectInputStream.xba b/qadevOOo/tests/basic/ifc/io/XObjectInputStream/io_XObjectInputStream.xba
deleted file mode 100644
index c12c8ce0180e..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XObjectInputStream/io_XObjectInputStream.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XObjectInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XObjectInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Dim oObjToWrite As Object
-    oObjToWrite = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-    oObjToWrite.Label = "XObjectInputStream"
-
-    Out.Log("Writing object with label " &amp; oObjToWrite.Label )
-
-    oOutStream = getOutStream()
-    oOutStream.writeObject(oObjToWrite)
-
-    ResetStreams()
-
-    Test.StartMethod("readObject()")
-    bOK = true
-
-    if (bOK) then
-        oReadObj = oObj.readObject()
-
-        Out.Log("Object with label " &amp; oReadObj.Label &amp; " was read")
-        bOK = bOK AND oReadObj.Label = "XObjectInputStream"
-    end if
-
-    Test.MethodTested("readObject()", bOK)
-
-    ResetStreams()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XObjectInputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XObjectInputStream/script.xlb
deleted file mode 100644
index 08c456872069..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XObjectInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XObjectInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XObjectInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/io_XObjectOutputStream.xba b/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/io_XObjectOutputStream.xba
deleted file mode 100644
index 0f3f1f6bc97c..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/io_XObjectOutputStream.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XObjectOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XObjectOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oObjToWrite As Object
-    oObjToWrite = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-    oObjToWrite.Label = "XObjectOutputStream"
-
-    Out.Log("Writing object with label " &amp; oObjToWrite.Label )
-
-    Test.StartMethod("writeObject()")
-    bOK = true
-    oObj.writeObject(oObjToWrite)
-
-    if (bOK) then
-        inStream = getInStream()
-        oReadObj = inStream.readObject()
-
-        Out.Log("Object with label " &amp; oReadObj.Label &amp; " was read")
-        bOK = bOK AND oReadObj.Label = "XObjectOutputStream"
-    end if
-
-    Test.MethodTested("writeObject()", bOK)
-
-    ResetStreams()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/script.xlb
deleted file mode 100644
index 84af6a647208..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XObjectOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XObjectOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XObjectOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XOutputStream/io_XOutputStream.xba b/qadevOOo/tests/basic/ifc/io/XOutputStream/io_XOutputStream.xba
deleted file mode 100644
index f88bb41866c8..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XOutputStream/io_XOutputStream.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Bytes(10) As Integer
-    Dim rBytes(10) As Integer
-
-    Test.StartMethod("writeBytes()")
-    bOK = true
-
-    for i = 0 to ubound(Bytes())
-        Bytes(i) = i
-    next i
-    oObj.writeBytes(Bytes())
-
-    oInputStream = getInStream()
-    iBytesRead = oInputStream.readBytes(rBytes(), ubound(Bytes()) + 1)
-    Out.Log("" &amp; iBytesRead &amp; " bytes were read")
-    bOK = bOK AND iBytesRead = ubound(Bytes()) + 1
-
-    for i = 0 to ubound(rBytes())
-        Out.Log("Expected " &amp; Bytes(i) &amp; ", actual is " &amp; int(rBytes(i)))
-        bOK = bOK AND Bytes(i) = rBytes(i)
-    next i
-
-    Test.MethodTested("writeBytes()", bOK)
-
-    Test.StartMethod("flush()")
-    bOK = true
-    oObj.flush()
-    Test.MethodTested("flush()", bOK)
-
-    Test.StartMethod("closeOutput()")
-    bOK = true
-    Out.Log("This method is called in main module.")
-    Test.MethodTested("closeOutput()", bOK)
-
-    ResetStreams()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XOutputStream/script.xlb b/qadevOOo/tests/basic/ifc/io/XOutputStream/script.xlb
deleted file mode 100644
index 38a1f413e6d9..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/io/XPersistObject/io_XPersistObject.xba b/qadevOOo/tests/basic/ifc/io/XPersistObject/io_XPersistObject.xba
deleted file mode 100644
index 11b00b9e7dce..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XPersistObject/io_XPersistObject.xba
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="io_XPersistObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oPersistInstance As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.io.XPersistObject
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oMarkIn, oMarkOut, oOutStrm, oInStrm As Object
-    Dim oDummy, oCopy, oPipe As Object
-    Dim uuidString As String
-    Dim UUID(), UUIDnew() As Variant
-    Dim i As Integer
-
-    if isNull(oPersistInstance) Then
-        Out.Log("oPersistInstance is Empty! No oPersistInstance in main created?")
-        Exit Sub
-    end if
-
-    Test.StartMethod("getServiceName()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getServiceName()) = 8)
-    Test.MethodTested("getServiceName()", bOK)
-
-    if (hasUnoInterfaces(oObj,"com.sun.star.lang.XTypeProvider")) then
-	    'get ImplementationID
-        Out.Log("Before writing object, rememeber it's implementation ID.")
-        uuidString = ""
-        UUID = oObj.getImplementationId()
-        for i = 0 to ubound(UUID())
-            uuidString = uuidString &amp; UUID(i) &amp; "; "
-        next i
-        Out.Log("ImplementationID: " &amp; uuidString)
-    endif
-
-    oDummy = oPersistInstance
-    oPipe = createUNOService("com.sun.star.io.Pipe")
-    oMarkOut = createUNOService("com.sun.star.io.MarkableOutputStream")
-    oMarkIn  = createUNOService("com.sun.star.io.MarkableInputStream")
-    oOutStrm = createUNOService("com.sun.star.io.ObjectOutputStream")
-    oInStrm = createUNOService("com.sun.star.io.ObjectInputStream")
-
-    'made chain
-    oOutStrm.setOutputStream(oMarkOut)
-    oMarkOut.setOutputStream(oPipe)
-    oMarkIn.setInputStream(oPipe)
-    oInStrm.setInputStream(oMarkIn)
-
-    Test.StartMethod("write()")
-    Test.StartMethod("read()")
-    bOK = true
-    'write dummy
-    oOutStrm.writeObject(oDummy)
-    oObj.write(oOutStrm)
-    'read copy
-    oCopy = oInStrm.readObject()
-    oObj.read(oInStrm)
-
-    if (hasUnoInterfaces(oObj,"com.sun.star.lang.XTypeProvider")) then
-        Out.Log("After reading object, get it's implementation ID.")
-        uuidString = ""
-        UUIDnew = oObj.getImplementationId()
-        for i = 0 to ubound(UUID())
-            bOK = bOK AND (UUID(i) = UUIDnew(i))
-            uuidString = uuidString &amp; UUIDnew(i) &amp; "; "
-        next i
-        Out.Log("ImplementationID: " &amp; uuidString)
-    endif
-
-    Test.MethodTested("write()", bOK)
-    Test.MethodTested("read()", bOK)
-
-    ReCreateObj()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/io/XPersistObject/script.xlb b/qadevOOo/tests/basic/ifc/io/XPersistObject/script.xlb
deleted file mode 100644
index baaea2bba562..000000000000
--- a/qadevOOo/tests/basic/ifc/io/XPersistObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="io_XPersistObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="io_XPersistObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/java/XJavaVM/javajava_XJavaVM.xba b/qadevOOo/tests/basic/ifc/java/XJavaVM/javajava_XJavaVM.xba
deleted file mode 100644
index 1b8c1336be60..000000000000
--- a/qadevOOo/tests/basic/ifc/java/XJavaVM/javajava_XJavaVM.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="javajava_XJavaVM" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.java.XJavaVM
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getJavaVM()")
-    bOK = true
-    Out.Log("First, registering thread...")
-    oObj.registerThread()
-
-    JVMAddress = oObj.getJavaVM(noargs())
-    Out.Log("Returned address is " &amp; JVMAddress)
-    bOK = bOK AND JVMAddress &lt;&gt; 0
-
-    Test.MethodTested("getJavaVM()", bOK)
-
-    Test.StartMethod("isVMStarted()")
-    bOK = true
-    Dim isStarted As Boolean
-    isStarted = oObj.isVMStarted()
-    Out.Log("isVMStarted() returned " &amp; isStarted)
-    Test.MethodTested("isVMStarted()", bOK)
-
-    Test.StartMethod("isVMEnabled()")
-    bOK = true
-    Dim bEnabled As Boolean
-    bEnabled = oObj.isVMEnabled()
-    Out.Log("isVMEnabled() returned " &amp; bEnabled)
-    Test.MethodTested("isVMEnabled()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/java/XJavaVM/script.xlb b/qadevOOo/tests/basic/ifc/java/XJavaVM/script.xlb
deleted file mode 100644
index 7536d1f4bde1..000000000000
--- a/qadevOOo/tests/basic/ifc/java/XJavaVM/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="javajava_XJavaVM" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="javajava_XJavaVM"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/ServiceManager/lang_ServiceManager.xba b/qadevOOo/tests/basic/ifc/lang/ServiceManager/lang_ServiceManager.xba
deleted file mode 100644
index 39894b9ea349..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/ServiceManager/lang_ServiceManager.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_ServiceManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.lang.ServiceManager
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("DefaultContext")
-	
-	'test the RTL function getDefaultcontext()
-	Test.MethodTested("DefaultContext", isObject(getDefaultContext()))
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/ServiceManager/script.xlb b/qadevOOo/tests/basic/ifc/lang/ServiceManager/script.xlb
deleted file mode 100644
index 7f4958ace7ec..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/ServiceManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_ServiceManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_ServiceManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XComponent/lang_XComponent.xba b/qadevOOo/tests/basic/ifc/lang/XComponent/lang_XComponent.xba
deleted file mode 100644
index 6d429bed4c7b..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XComponent/lang_XComponent.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XComponent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     Global oComponentInstance As Object it will be disposed
-
-'*************************************************************************
-
-
-Dim bCB1 As Boolean, bCB2 As Boolean
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XEventListener
-
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1 as Object, oListener2 As Object
-
-    If isNull(oComponentInstance) Then Out.Log("oComponentInstance is not initialized")
-
-    bCB1 = false
-    bCB2 = false
-
-    Out.Log("create two listeners")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.lang.XEventListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.lang.XEventListener")
-
-    ' add listeners to object if initialized
-    if NOT(isNull(oListener2)) then
-        oComponentInstance.addEventListener(oListener2)
-    end if
-    if NOT(isNull(oListener1)) then
-        oComponentInstance.addEventListener(oListener1)
-    end if
-
-    Out.Log("remove Listener2")
-    oComponentInstance.removeEventListener(oListener2)
-
-    ' dispose object and check the count
-    Test.StartMethod("dispose()")
-    bOK = true
-    oComponentInstance.dispose()
-    bOK = bCB1 AND NOT bCB2
-    Test.MethodTested("dispose()", bOK)
-
-    ' check if only one eventlistener-callback was executed
-    Test.StartMethod("addEventListener()")
-    bOK = bCB1 AND NOT bCB2
-    Test.MethodTested("addEventListener()", bOK)
-
-    ' check if there was only one of the listener callbacks executed
-    Test.StartMethod("removeEventListener()")
-    bOK = bCB1 AND NOT bCB2
-    Test.MethodTested("removeEventListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub CB1_disposing
-    Out.Log("CallBack for Listener1 disposing was called.")
-    bCB1 = true
-End Sub
-Sub CB2_disposing
-    Out.Log("CallBack for Listener2 disposing was called.")
-    bCB2 = true
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XComponent/script.xlb b/qadevOOo/tests/basic/ifc/lang/XComponent/script.xlb
deleted file mode 100644
index 6868484b6179..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XComponent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XComponent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XComponent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XEventListener/lang_XEventListener.xba b/qadevOOo/tests/basic/ifc/lang/XEventListener/lang_XEventListener.xba
deleted file mode 100644
index bc98741e7b98..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XEventListener/lang_XEventListener.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XEventListener" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XEventListener
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("disposing()")
-    bOK = true
-    Out.Log("The method 'disposing'")
-    Out.Log("gets called when the broadcaster is about to be disposed.")
-    Out.Log("All listeners and all other objects which reference the broadcaster should release the references.")
-    Out.Log("So there is nothing to test here")
-    Test.MethodTested("disposing()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XEventListener/script.xlb b/qadevOOo/tests/basic/ifc/lang/XEventListener/script.xlb
deleted file mode 100644
index 41dd6886e66c..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XEventListener/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XEventListener" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XEventListener"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XInitialization/lang_XInitialization.xba b/qadevOOo/tests/basic/ifc/lang/XInitialization/lang_XInitialization.xba
deleted file mode 100644
index bd57e0d44942..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XInitialization/lang_XInitialization.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XInitialization" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global aInitArgs() As Variant
-'       Global aNoInit() As Variant [optional]
-'       if the variable defined as Array the method initialize() isnt called.
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XInitialization
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bInit As Boolean
-
-    bInit = true
-    
-    Test.StartMethod("initialize()")
-    bOK = true
-    
-    if NOT isArray(aNoInit) then
-        if NOT isArray(aInitArgs) then
-            Out.Log("aInitArgs is NULL ... trying with no arguments")
-            oObj.initialize(DimArray())
-        else
-            oObj.initialize(aInitArgs())
-        end if
-    else
-        Out.Log("The object already initialized ... OK") 
-    end if
-    
-    Test.MethodTested("initialize()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XInitialization/script.xlb b/qadevOOo/tests/basic/ifc/lang/XInitialization/script.xlb
deleted file mode 100644
index 25601d809973..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XInitialization/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XInitialization" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XInitialization"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/lang_XMultiComponentFactory.xba b/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/lang_XMultiComponentFactory.xba
deleted file mode 100644
index 2d56d6f2184d..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/lang_XMultiComponentFactory.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XMultiComponentFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cServiceName As String ie. 'com.sun.star.drawing.RectangleShape'
-'     - Global aContext() As Variant
-'     - Global aArguments() As Variant
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XMultiComponentFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oInstance1 As Object
-    Dim oInstance2 As Object
-
-    Test.StartMethod("getAvailableServiceNames()")
-    bOK = true
-    Names = oObj.getAvailableServiceNames()
-    Dim bFound As Boolean
-    bFound = false
-    for i = 0 to ubound(Names)
-        if Names(i) = cServiceName then bFound = true
-    next i
-    if (NOT bFound) then Out.Log("Can't find '" &amp; cServiceName &amp; "' in returned array.")
-    bOK = bOK AND bFound
-    Test.MethodTested("getAvailableServiceNames()", bOK)
-
-    Test.StartMethod("createInstanceWithContext()")
-    bOK = true
-    oInstance1 = oObj.createInstanceWithContext(cServiceName, aContext())
-    bOK = bOK AND NOT isNULL(oInstance1)
-    Test.MethodTested("createInstanceWithContext()", bOK)
-
-    Test.StartMethod("createInstanceWithArgumentsAndContext()")
-    bOK = true
-    oInstance2 = oObj.createInstanceWithArgumentsAndContext(cServiceName, aArguments(), aContext())
-    bOK = bOK AND NOT isNULL(oInstance2)
-    Test.MethodTested("createInstanceWithArgumentsAndContext()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/script.xlb b/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/script.xlb
deleted file mode 100644
index 3ed4be77bbe1..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XMultiComponentFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XMultiComponentFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XMultiComponentFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/lang_XMultiServiceFactory.xba b/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/lang_XMultiServiceFactory.xba
deleted file mode 100644
index e7ee9543a28e..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/lang_XMultiServiceFactory.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XMultiServiceFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cServiceName As String ie. "com.sun.star.drawing.RectangleShape"
-'     - Global bCreateInstanceWithoutArguments As Boolean
-'     - Global aArguments() As Variant
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XMultiServiceFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oInstance1, oInstance2 As Object
-    Dim Names
-
-    Test.StartMethod("getAvailableServiceNames()")
-    bOK = true
-    Names = oObj.getAvailableServiceNames()
-    Dim bFound As Boolean
-    bFound = false
-    for i = 0 to ubound(Names)
-        if Names(i) = cServiceName then bFound = true
-    next i
-    if (NOT bFound) then Out.Log("Can't find '" &amp; cServiceName &amp; "' in returned array.")
-    bOK = bOK AND bFound
-    Test.MethodTested("getAvailableServiceNames()", bOK)
-
-    Test.StartMethod("createInstance()")
-    bOK = true
-    if bCreateInstanceWithoutArguments then
-        oInstance1 = oObj.createInstance(cServiceName)
-        bOK = bOK AND NOT isNull(oInstance1)
-    else
-        Out.Log("createInstance() skipped for this object.")
-    end if
-    Test.MethodTested("createInstance()", bOK)
-
-    Test.StartMethod("createInstanceWithArguments()")
-    bOK = true
-    if (cObjectName = "sd.SdXImpressDocument") then
-        Out.Log("Object SdXImpressDocument doesn't suppotr createInstanceWithArguments().")
-    else
-        oInstance2 = oObj.createInstanceWithArguments(cServiceName, aArguments())
-        bOK = bOK AND NOT isNULL(oInstance2)
-    end if
-    Test.MethodTested("createInstanceWithArguments()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/script.xlb b/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/script.xlb
deleted file mode 100644
index ebca38bedb29..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XMultiServiceFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XMultiServiceFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XMultiServiceFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/lang_XServiceDisplayName.xba b/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/lang_XServiceDisplayName.xba
deleted file mode 100644
index 2d79fd5e6fcc..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/lang_XServiceDisplayName.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XServiceDisplayName" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XServiceDisplayName
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim cName As String
-
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-
-    Test.StartMethod("getServiceDisplayName()")
-    bOK = true
-    cName = oObj.getServiceDisplayName(vLocale)
-    bOK = bOK AND (cName &lt;&gt; "")
-    Test.MethodTested("getServiceDisplayName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/script.xlb b/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/script.xlb
deleted file mode 100644
index d133ba6703cd..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XServiceDisplayName/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XServiceDisplayName" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XServiceDisplayName"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XServiceInfo/lang_XServiceInfo.xba b/qadevOOo/tests/basic/ifc/lang/XServiceInfo/lang_XServiceInfo.xba
deleted file mode 100644
index 90691ddbedfe..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XServiceInfo/lang_XServiceInfo.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XServiceInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XServiceInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getImplementationName()")
-    bOK = VarType(oObj.getImplementationName()) = 8
-    Test.MethodTested("getImplementationName()", bOK)
-
-    Test.StartMethod("supportsService()")
-    bOK = true
-    vServices = oObj.getSupportedServiceNames()
-    bOK = bOK AND uBound(vServices()) &gt;= 0
-    Test.MethodTested("supportsService()", bOK)
-
-    Test.StartMethod("getSupportedServiceNames()")
-    bOK = oObj.supportsService(vServices(0))
-    Test.MethodTested("getSupportedServiceNames()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XServiceInfo/script.xlb b/qadevOOo/tests/basic/ifc/lang/XServiceInfo/script.xlb
deleted file mode 100644
index 1fb4bfa6401a..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XServiceInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XServiceInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XServiceInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/lang_XSingleServiceFactory.xba b/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/lang_XSingleServiceFactory.xba
deleted file mode 100644
index 77ad0a8c79b1..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/lang_XSingleServiceFactory.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XSingleServiceFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global aArguments As Variant [optional]
-'       Array of arguments for createInstanceWithArguments()
-'       Global aMustSupportInterface As Variant [optional]
-'       Array of Strings with names of interfaces which must be supported by created instance.
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XSingleServiceFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aArgs()
-    Dim inst As Object
-    Dim i As Integer
-
-    Test.StartMethod("createInstance()")
-    bOK = true
-    if (cObjectName = "inv.Invocation") then
-        Out.Log("createInstance() not available in " + cObjectName + " - SKIPPED")
-    else
-        bOK = bOK AND isObject(oObj.createInstance())
-    end if
-    Test.MethodTested("createInstance()", bOK)
-
-    Test.StartMethod("createInstanceWithArguments()")
-    bOK = true
-    if isArray(aArguments) then
-        inst = oObj.createInstanceWithArguments(aArguments())
-    else
-        inst = oObj.createInstanceWithArguments(aArgs())
-    end if
-    
-    if NOT isObject(inst) then
-        bOK = false 
-        Out.Log("The returned instance is not object : FAILED.")
-    end if
-    
-    if isArray(aMustSupportInterface) AND bOK then
-        Out.Log("Checking supported interfaces ...")
-        for i = 0 to ubound(aMustSupportInterface())
-            if NOT hasUnoInterfaces(inst, aMustSupportInterface(i)) then
-                Out.Log("The created instance doesn't support '" + aMustSupportInterface(i) + "'")
-                bOK = false
-            end if
-        next i
-    end if
-
-    Test.MethodTested("createInstanceWithArguments()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/script.xlb b/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/script.xlb
deleted file mode 100644
index acff5b4a09b2..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XSingleServiceFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XSingleServiceFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XSingleServiceFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/lang/XTypeProvider/lang_XTypeProvider.xba b/qadevOOo/tests/basic/ifc/lang/XTypeProvider/lang_XTypeProvider.xba
deleted file mode 100644
index 8422f4574e0e..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XTypeProvider/lang_XTypeProvider.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lang_XTypeProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.lang.XTypeProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim n As Integer
-    Dim vTypes As Variant
-    Dim IDs1(15) As Integer
-    Dim IDs2(15) As Integer
-
-    Test.StartMethod("getTypes()")
-    bOK = false
-    vTypes = oObj.getTypes()
-    For n = lBound(vTypes()) to UBound(vTypes())
-      If vTypes(n).Name = cIfcLongName Then
-        Out.Log("Type of Object " &amp; n &amp; " is " &amp; vTypes(n).Name &amp; ". Same as Interface =&gt; ok!"
-        bOK = true
-      Else
-        Out.Log("Type of Object " &amp; n &amp; " is " &amp; vTypes(n).Name
-      End If
-    Next n
-    Test.MethodTested("getTypes()", bOK)
-
-    Test.StartMethod("getImplementationId()")
-    bOK = true
-    IDs1() = oObj.getImplementationId()
-    IDs2() = oObj.getImplementationId()
-
-    bOK = bOK AND ubound(IDs1()) = ubound(IDs2())
-    bOK = bOK AND ubound(IDs1()) = 15
-    if (bOK) then
-        for n = lBound(IDs1()) to lBound(IDs2())
-            bOK = bOK AND IDs1(n) = IDs2(n)
-        Next n
-    end if
-
-    if (NOT bOK) then
-        Out.Log("Returned IDs are NOT identical!")
-    end if
-    Test.MethodTested("getImplementationId()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/lang/XTypeProvider/script.xlb b/qadevOOo/tests/basic/ifc/lang/XTypeProvider/script.xlb
deleted file mode 100644
index ef09fbba13a2..000000000000
--- a/qadevOOo/tests/basic/ifc/lang/XTypeProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lang_XTypeProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lang_XTypeProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/linguistic2_LinguProperties.xba b/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/linguistic2_LinguProperties.xba
deleted file mode 100644
index c0de8cb85a49..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/linguistic2_LinguProperties.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_LinguProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.linguistic2.LinguProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("IsGermanPreReform")
-
-    PropertyTester.TestProperty("IsUseDictionaryList")
-
-    PropertyTester.TestProperty("IsIgnoreControlCharacters")
-
-    PropertyTester.TestProperty("IsSpellUpperCase")
-
-    PropertyTester.TestProperty("IsSpellWithDigits")
-
-    PropertyTester.TestProperty("IsSpellCapitalization")
-
-    PropertyTester.TestProperty("HyphMinLeading")
-
-    PropertyTester.TestProperty("HyphMinTrailing")
-
-    PropertyTester.TestProperty("HyphMinWordLength")
-
-    PropertyTester.TestProperty("DefaultLocale")
-
-    PropertyTester.TestProperty("IsHyphAuto")
-
-    PropertyTester.TestProperty("IsHyphSpecial")
-
-    PropertyTester.TestProperty("IsSpellAuto")
-
-    PropertyTester.TestProperty("IsSpellHide")
-
-    PropertyTester.TestProperty("IsSpellInAllLanguages")
-
-    PropertyTester.TestProperty("IsSpellSpecial")
-
-    PropertyTester.TestProperty("IsWrapReverse")
-
-    PropertyTester.TestProperty("DefaultLocale_CJK")
-
-    PropertyTester.TestProperty("DefaultLocale_CTL")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/script.xlb
deleted file mode 100644
index a16e649510ad..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/LinguProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_LinguProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_LinguProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/linguistic2_XDictionaryList.xba b/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/linguistic2_XDictionaryList.xba
deleted file mode 100644
index 41c5f4c9509a..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/linguistic2_XDictionaryList.xba
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XDictionaryList" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Dim bCB1 As Long, bCB2 As Long
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XDictionaryList
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vGetDics As Variant
-    Dim oNegative As Object
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim nPrevious As Integer
-    Dim oAddDic As Object
-    Dim oNewDic As Object
-    Dim oListenDic1 As Object
-    Dim oListenDic As Object
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-
-    oListener1 = createUNOListener("CB1_", "com.sun.star.linguistic2.XDictionaryListEventListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.linguistic2.XDictionaryListEventListener")
-    bCB1 = 0
-    bCB2 = 0
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-    vLocale.Variant = "WIN"
-
-    Test.StartMethod("getCount()")
-    bOK = true
-    Out.Log("getCouint retunrs " + oObj.getCount())
-    bOK = bOK AND (oObj.getCount() &gt; 0)
-    Test.MethodTested("getCount()", bOK)
-
-    Test.StartMethod("getDictionaries()")
-    bOK = true
-    vGetDics = oObj.getDictionaries()
-    Out.Log("oObj.getDictionaries returned " + (uBound(vGetDics) + 1) + " elements")
-    bOK = bOK AND ((uBound(vGetDics) + 1) = oObj.getCount())
-    Test.MethodTested("getDictionaries()", bOK)
-
-    Test.StartMethod("getDictionaryByName()")
-    bOK = true
-    Out.Log("Try to get 'NegativDic' which should created in ObjCreation()"
-    oNegative = oObj.getDictionaryByName("NegativDic")
-    bOK = bOK AND hasUnoInterfaces(oNegative, "com.sun.star.linguistic2.XDictionary")
-    Test.MethodTested("getDictionaryByName()", bOK)
-
-    Test.StartMethod("createDictionary()")
-    bOK = true
-    oAddDic = oObj.createDictionary("AddedDicBasic", vLocale,_
-                     com.sun.star.linguistic2.DictionaryType.POSITIVE,"")
-    bOK = bOK AND hasUnoInterfaces(oAddDic, "com.sun.star.linguistic2.XDictionary")
-    Test.MethodTested("createDictionary()", bOK)
-
-    Test.StartMethod("addDictionary()")
-    bOK = true
-    nPrevious = oObj.getCount()
-    oObj.addDictionary(oAddDic)
-    Out.Log("Dictionaries before: " + nPrevious + ", after: " + oObj.getCount())
-    bOK = bOK AND ((nPrevious + 1) = oObj.getCount())
-    Test.MethodTested("addDictionary()", bOK)
-
-    Test.StartMethod("removeDictionary()")
-    bOK = true
-    oObj.removeDictionary(oAddDic)
-    bOK = bOK AND (nPrevious = oObj.getCount())
-    Test.MethodTested("removeDictionary()", bOK)
-
-    Test.StartMethod("addDictionaryListEventListener()")
-    Dim bListOK As Boolean
-    
-    bOK = true
-    bCB1 = false
-    bCB2 = false
-    oListenDic = oObj.createDictionary("ListenDicBasic", vLocale,_
-                     com.sun.star.linguistic2.DictionaryType.POSITIVE,"")
-    bListOK = oObj.addDictionaryListEventListener(oListener1, false)
-    Out.Log("First listener was added: " + bListOK)
-    bListOK = oObj.addDictionaryListEventListener(oListener2, false)
-    Out.Log("Second listener was added: " + bListOK)
-    
-    Test.StartMethod("flushEvents()")
-
-    Out.Log("The level of buffer returned by flushEvents() is " + oObj.flushEvents())
-
-    oObj.addDictionary(oListenDic)
-    oListenDic.setActive(true)
-'    oListenDic.add("AWord", false, "")
-
-    Out.Log("The level of buffer returned by flushEvents() is " + oObj.flushEvents())
-
-    bOK = bOK AND bCB1 AND bCB2
-    oObj.removeDictionary(oListenDic)
-
-    Test.MethodTested("addDictionaryListEventListener()", bOK)
-    Test.MethodTested("flushEvents()", bOK)
-
-    Test.StartMethod("removeDictionaryListEventListener()")
-    bOK = true
-    bCB1 = 0
-    bCB2 = 0
-    oObj.removeDictionaryListEventListener(oListener2)
-    oListenDic1 = oObj.createDictionary("ListenDicBasic1", vLocale,_
-                     com.sun.star.linguistic2.DictionaryType.POSITIVE,"")
-    oObj.flushEvents()
-    oObj.addDictionary(oListenDic)
-    oListenDic.setActive(true)
-    oObj.flushEvents()
-    oObj.removeDictionary(oListenDic)
-    bOK = bOK AND bCB1 AND NOT bCB2
-    Test.MethodTested("removeDictionaryListEventListener()", bOK)
-
-    Test.StartMethod("beginCollectEvents()")
-    bOK = true
-    Dim bufSize1 As Integer, bufSize2 As Integer
-    
-    bufSize1 = oObj.beginCollectEvents()
-    bufSize2 = oObj.beginCollectEvents()
-    
-    bOK = bOK AND (bufSize2 = bufSize1 + 1)
-    Test.MethodTested("beginCollectEvents()", bOK)
-
-    Test.StartMethod("endCollectEvents()")
-    bufSize1 = oObj.endCollectEvents()
-    
-    bOK = bOK AND (bufSize2 = bufSize1 + 1)
-    Test.MethodTested("endCollectEvents()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub CB1_processDictionaryListEvent
-    Out.Log("CallBack for Listener1 was called.")
-    bCB1 = bCB1 + 1
-End Sub
-Sub CB1_disposing
-End Sub
-
-Sub CB2_processDictionaryListEvent
-    Out.Log("CallBack for Listener2 was called.")
-    bCB2 = bCB2 + 1
-End Sub
-Sub CB2_disposing
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/script.xlb
deleted file mode 100644
index 8f31954d31d9..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XDictionaryList/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XDictionaryList" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XDictionaryList"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/linguistic2_XHyphenator.xba b/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/linguistic2_XHyphenator.xba
deleted file mode 100644
index 356b2e9b8c6a..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/linguistic2_XHyphenator.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XHyphenator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XHyphenator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vProp As new com.sun.star.beans.PropertyValue
-    Dim vPops(0) As Variant
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim oHyphenate As Object
-    Dim oAlternative As Object
-    Dim oPossible As Object
-
-    vProps(0) = vProp
-
-    vLocale.Language = "de"
-    vLocale.Country = "DE"
-    vLocale.Variant = ""
-
-
-    Test.StartMethod("hyphenate()")
-    bOK = true
-    oHyphenate = oObj.hyphenate("wacker", vLocale, 3, vProps())
-    bOK = bOK AND hasUnoInterfaces(oHyphenate, "com.sun.star.linguistic2.XHyphenatedWord")
-    Test.MethodTested("hyphenate()", bOK)
-
-    Test.StartMethod("queryAlternativeSpelling()")
-    bOK = true
-    oAlternative = oObj.queryAlternativeSpelling("wacker", vLocale, 2, vProps())
-    bOK = bOK AND hasUnoInterfaces(oHyphenate, "com.sun.star.linguistic2.XHyphenatedWord")
-    Test.MethodTested("queryAlternativeSpelling()", bOK)
-
-    Test.StartMethod("createPossibleHyphens()")
-    bOK = true
-    oPossible = oObj.createPossibleHyphens("wacker", vLocale, vProps())
-    bOK = bOK AND hasUnoInterfaces(oPossible, "com.sun.star.linguistic2.XPossibleHyphens")
-    Test.MethodTested("createPossibleHyphens()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/script.xlb
deleted file mode 100644
index 71eda6f3347e..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XHyphenator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XHyphenator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XHyphenator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/linguistic2_XLinguServiceEventBroadcaster.xba b/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/linguistic2_XLinguServiceEventBroadcaster.xba
deleted file mode 100644
index 46010b0a055d..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/linguistic2_XLinguServiceEventBroadcaster.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XLinguServiceEventBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XLinguServiceEventBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Out.Log("create two listeners")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.linguistic2.XLinguServiceEventListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.linguistic2.XLinguServiceEventListener")
-
-    Test.StartMethod("addLinguServiceEventListener()")
-    bOK = true
-    bOK = bOK AND oObj.addLinguServiceEventListener(oListener1)
-    bOK = bOK AND oObj.addLinguServiceEventListener(oListener2)
-    Test.MethodTested("addLinguServiceEventListener()", bOK)
-
-    Test.StartMethod("removeLinguServiceEventListener()")
-    bOK = true
-    bOK = bOK AND oObj.removeLinguServiceEventListener(oListener2)
-    Test.MethodTested("removeLinguServiceEventListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub CB1_processLinguServiceEvent
-    Out.Log("CallBack for Listener1 processLinguServiceEvent was called.")
-    bCB1 = true
-End Sub
-
-Sub CB2_processLinguServiceEvent
-    Out.Log("CallBack for Listener2 processLinguServiceEvent was called.")
-    bCB2 = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/script.xlb
deleted file mode 100644
index 8b50d4cd343c..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceEventBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XLinguServiceEventBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XLinguServiceEventBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/linguistic2_XLinguServiceManager.xba b/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/linguistic2_XLinguServiceManager.xba
deleted file mode 100644
index c83c9c54fbf3..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/linguistic2_XLinguServiceManager.xba
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XLinguServiceManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-Dim nCB1Val As Long, nCB2Val As Long
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XLinguServiceManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim aServices As Variant
-    Dim vGetServices As Variant
-
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-    vLocale.Variant = ""
-
-    oListener1 = createUNOListener("CB1_", "com.sun.star.linguistic2.XLinguServiceEventListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.linguistic2.XLinguServiceEventListener")
-    nCB1Val = 0
-    nCB2Val = 0
-
-    Test.StartMethod("getSpellChecker()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getSpellChecker(), "com.sun.star.linguistic2.XSpellChecker")
-    Test.MethodTested("getSpellChecker()", bOK)
-
-    Test.StartMethod("getHyphenator()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getHyphenator(), "com.sun.star.linguistic2.XHyphenator")
-    Test.MethodTested("getHyphenator()", bOK)
-
-    Test.StartMethod("getThesaurus()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getThesaurus(), "com.sun.star.linguistic2.XThesaurus")
-    Test.MethodTested("getThesaurus()", bOK)
-
-    Test.StartMethod("addLinguServiceManagerListener()")
-    bOK = true
-    bOK = bOK AND oObj.addLinguServiceManagerListener(oListener1)
-    bOK = bOK AND oObj.addLinguServiceManagerListener(oListener2)
-    Out.Log("oListener1 and oListener2 added =&gt; " + bOK )
-    Test.MethodTested("addLinguServiceManagerListener()", bOK)
-
-    Test.StartMethod("removeLinguServiceManagerListener()")
-    bOK = true
-    bOK = bOK AND oObj.removeLinguServiceManagerListener(oListener2)
-    Out.Log("oListener2 removed =&gt; " +bOK)
-    Test.MethodTested("removeLinguServiceManagerListener()", bOK)
-
-    Test.StartMethod("getAvailableServices()")
-    bOK = true
-    aServices = oObj.getAvailableServices("com.sun.star.linguistic2.Thesaurus", vLocale)
-    bOK = bOK AND (uBound(aServices()) &gt; -1)
-    Test.MethodTested("getAvailableServices()", bOK)
-
-    Test.StartMethod("getConfiguredServices()")
-    bOK = true
-    vGetServices = oObj.getConfiguredServices("com.sun.star.linguistic2.Thesaurus", vLocale)
-    bOK = bOK AND (uBound(vGetServices()) &gt; -1)
-    Test.MethodTested("getConfiguredServices()", bOK)
-
-    Test.StartMethod("setConfiguredServices()")
-    Dim vSetServices(0) As String
-    Dim vSetGetServices As Variant
-    bOK = true
-    oObj.setConfiguredServices("com.sun.star.linguistic2.Hyphenator", vLocale, vSetServices())
-    vSetGetServices = oObj.getConfiguredServices("com.sun.star.linguistic2.Hyphenator", vLocale)
-    bOK = bOK AND (uBound(vSetGetServices()) = -1)
-    oObj.setConfiguredServices("com.sun.star.linguistic2.Hyphenator", vLocale, vGetServices())
-    Test.MethodTested("setConfiguredServices()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub CB1_processLinguServiceEvent
-    Out.Log("CallBack for Listener1 processLinguServiceEvent was called.")
-    nCB1Val = nCB1Val + 1
-End Sub
-
-Sub CB2_processLinguServiceEvent
-    Out.Log("CallBack for Listener2 processLinguServiceEvent was called.")
-    nCB2Val = nCB2Val + 1
-End Sub
-Sub CB1_
-    Out.Log("CallBack for Listener1 disposing was called.")
-    nCB1Val = nCB1Val + 1
-End Sub
-
-Sub CB2_disposing
-    Out.Log("CallBack for Listener2 disposing was called.")
-    nCB2Val = nCB2Val + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/script.xlb
deleted file mode 100644
index 3584b2494b87..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XLinguServiceManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XLinguServiceManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XLinguServiceManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/linguistic2_XSearchableDictionaryList.xba b/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/linguistic2_XSearchableDictionaryList.xba
deleted file mode 100644
index 7ad9eb041457..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/linguistic2_XSearchableDictionaryList.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XSearchableDictionaryList" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XSearchableDictionaryList
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vLocale As new com.sun.star.lang.Locale
-
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-    vLocale.Variant = "WIN"
-
-    Test.StartMethod("queryDictionaryEntry()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.queryDictionaryEntry("Negative", vLocale, false, false),_
-                  "com.sun.star.linguistic2.XDictionaryEntry")
-    bOK = bOK AND hasUnoInterfaces(oObj.queryDictionaryEntry("Positive", vLocale, true, true),_
-                  "com.sun.star.linguistic2.XDictionaryEntry")
-    Test.MethodTested("queryDictionaryEntry()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/script.xlb
deleted file mode 100644
index 782bf1beef0d..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSearchableDictionaryList/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XSearchableDictionaryList" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XSearchableDictionaryList"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/linguistic2_XSpellChecker.xba b/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/linguistic2_XSpellChecker.xba
deleted file mode 100644
index cb208d107450..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/linguistic2_XSpellChecker.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XSpellChecker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XSpellChecker
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vLocale As new com.sun.star.lang.Locale
-    Dim Prop As new com.sun.star.beans.PropertyValue
-    Dim Props(0 to 0) As Variant
-
-    Props(0) = Prop
-
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-
-
-    Test.StartMethod("isValid()")
-    bOK = true
-    bOK = bOK AND oObj.isValid("Sun", vLocale, Props())
-    bOK = bOK AND NOT oObj.isValid("Summersun", vLocale, Props())
-    Test.MethodTested("isValid()", bOK)
-
-    Dim vAlt As Variant
-    Dim cAlternative As Variant
-    Test.StartMethod("spell()")
-    bOK = true
-    vAlt = oObj.spell("Summersun", vLocale, Props())
-    cAlternative = vAlt.getAlternatives()
-    bOK = bOK AND (cAlternative(0) &lt;&gt; "")
-    Test.MethodTested("spell()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/script.xlb
deleted file mode 100644
index 530343cb3c4e..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSpellChecker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XSpellChecker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XSpellChecker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/linguistic2_XSupportedLocales.xba b/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/linguistic2_XSupportedLocales.xba
deleted file mode 100644
index 6127924df421..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/linguistic2_XSupportedLocales.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XSupportedLocales" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XSupportedLocales
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim vLocales As Variant
-
-    Test.StartMethod("getLocales()")
-    bOK = true
-    vLocales = oObj.getLocales()
-    bOK = bOK AND (uBound(vLocales()) &gt; 0)
-    Test.MethodTested("getLocales()", bOK)
-
-    Test.StartMethod("hasLocale()")
-    bOK = true
-    Out.Log("first check all available locales")
-    for i=0 to uBound(vLocales())
-      bOK = bOK AND oObj.hasLocale(vLocales(i))
-    next i
-    Out.Log("all available locales result: " + bOK)
-
-    Out.Log(" now create a invalid locale")
-    Dim vLocale As new com.sun.star.lang.Locale
-    vLocale.Language = "myLanguage"
-    vLocale.Country = "myCountry"
-    vLocale.Variant = "dummy"
-    bOK = bOK AND Not oObj.hasLocale(vLocale)
-
-    Test.MethodTested("hasLocale()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/script.xlb
deleted file mode 100644
index 904ac803b61a..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XSupportedLocales/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XSupportedLocales" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XSupportedLocales"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/linguistic2_XThesaurus.xba b/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/linguistic2_XThesaurus.xba
deleted file mode 100644
index 4919533c477b..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/linguistic2_XThesaurus.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="linguistic2_XThesaurus" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.linguistic2.XThesaurus
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cMeanings As Variant
-    Dim vProp As new com.sun.star.beans.PropertyValue
-    Dim vPops(0) As Variant
-    Dim vLocale As new com.sun.star.lang.Locale
-
-    vProps(0) = vProp
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-    vLocale.Variant = ""
-
-    Test.StartMethod("queryMeanings()")
-    bOK = true
-    XMeanings = oObj.queryMeanings("joke", vLocale, vProps())
-    bOK = bOK AND hasUnoInterfaces(XMeanings(0), "com.sun.star.linguistic2.XMeaning")
-    Test.MethodTested("queryMeanings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/script.xlb b/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/script.xlb
deleted file mode 100644
index 3caf514a4c66..000000000000
--- a/qadevOOo/tests/basic/ifc/linguistic2/XThesaurus/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="linguistic2_XThesaurus" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="linguistic2_XThesaurus"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/loader_XImplementationLoader.xba b/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/loader_XImplementationLoader.xba
deleted file mode 100644
index 2be27a887c2b..000000000000
--- a/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/loader_XImplementationLoader.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="loader_XImplementationLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'   Global cImpLoader As String
-'   Global cImpURL As String
-'   Global cImpName As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.loader.XImplementationLoader
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bRes As Boolean
-    Dim xIfc As Object
-    Dim xReg As Object
-    Dim regKey As Object
-
-    xReg = createUNOService("com.sun.star.registry.SimpleRegistry")
-    xReg.Open(utils.getTempFileURL("XImpLoader.reg"), false, true)
-    regKey = xReg.getRootKey
-
-    Test.StartMethod("writeRegistryInfo()")
-    bOK = true
-    bRes = oObj.writeRegistryInfo(regKey, cImpLoader, cImpURL)
-    Out.Log("writeRegistryInfo() returned " &amp; bRes)
-    bOK = bOK AND bRes
-    Test.MethodTested("writeRegistryInfo()", bOK)
-
-    Test.StartMethod("activate()")
-    bOK = true
-    Out.Log("Activating implementation for " + cImpName)
-    xIfc = oObj.activate(cImpName, cImpLoader, cImpURL, regKey)
-    Out.Log("Returned object supports XServiceInfo : " + _
-        hasUnoInterfaces(xIfc, "com.sun.star.lang.XServiceInfo"))
-    Out.Log("Returned object's implementation name is " + xIfc.getImplementationName())
-
-    bOK = bOK AND xIfc.getImplementationName() = cImpName
-    Test.MethodTested("activate()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/script.xlb b/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/script.xlb
deleted file mode 100644
index 327a1f78b6e7..000000000000
--- a/qadevOOo/tests/basic/ifc/loader/XImplementationLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="loader_XImplementationLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="loader_XImplementationLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/OutlineView/presentation_OutlineView.xba b/qadevOOo/tests/basic/ifc/presentation/OutlineView/presentation_OutlineView.xba
deleted file mode 100644
index f0b5382ecbd5..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/OutlineView/presentation_OutlineView.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_OutlineView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.presentation.OutlineView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    bOK = True
-
-    PropertyTester.TestProperty("VisibleArea")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/OutlineView/script.xlb b/qadevOOo/tests/basic/ifc/presentation/OutlineView/script.xlb
deleted file mode 100644
index 433038dafcef..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/OutlineView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_OutlineView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="presentation_OutlineView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/Presentation/presentation_Presentation.xba b/qadevOOo/tests/basic/ifc/presentation/Presentation/presentation_Presentation.xba
deleted file mode 100644
index 2cb4950e4f0e..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/Presentation/presentation_Presentation.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_Presentation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.presentation.Presentation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("AllowAnimations")
-
-    Dim aShows(1) As String
-    aShows(0) = "FirstPresentation"
-    aShows(1) = "SecondPresentation"
-    PropertyTester.TestProperty("CustomShow", aShows())
-
-    PropertyTester.TestProperty("FirstPage")
-
-    PropertyTester.TestProperty("IsAlwaysOnTop")
-
-    PropertyTester.TestProperty("IsAutomatic")
-
-    PropertyTester.TestProperty("IsEndless")
-
-    PropertyTester.TestProperty("IsFullScreen")
-
-    ' This property can be changed ONLY during presentation is running.
-    ' So, starting the presentation
-    oObj.start()
-    PropertyTester.TestProperty("IsLivePresentation")
-    oObj.end()
-
-    PropertyTester.TestProperty("IsMouseVisible")
-
-    PropertyTester.TestProperty("Pause")
-
-    PropertyTester.TestProperty("StartWithNavigator")
-
-    PropertyTester.TestProperty("UsePen")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/Presentation/script.xlb b/qadevOOo/tests/basic/ifc/presentation/Presentation/script.xlb
deleted file mode 100644
index bd617066a402..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/Presentation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_Presentation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="presentation_Presentation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/PresentationView/presentation_PresentationView.xba b/qadevOOo/tests/basic/ifc/presentation/PresentationView/presentation_PresentationView.xba
deleted file mode 100644
index 24f706db0e97..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/PresentationView/presentation_PresentationView.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_PresentationView" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.presentation.PresentationView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-'
-    PropertyTester.TestProperty("CurrentPage")
-
-    PropertyTester.TestProperty("VisibleArea")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/PresentationView/script.xlb b/qadevOOo/tests/basic/ifc/presentation/PresentationView/script.xlb
deleted file mode 100644
index 936a2ba9ceb3..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/PresentationView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_PresentationView" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="presentation_PresentationView"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/PreviewView/presentation_PreviewView.xba b/qadevOOo/tests/basic/ifc/presentation/PreviewView/presentation_PreviewView.xba
deleted file mode 100644
index 9b060b548f34..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/PreviewView/presentation_PreviewView.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_PreviewView" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' NONE
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.presentation.PreviewView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-'
-    PropertyTester.TestProperty("CurrentPage")
-
-    PropertyTester.TestProperty("VisibleArea")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/PreviewView/script.xlb b/qadevOOo/tests/basic/ifc/presentation/PreviewView/script.xlb
deleted file mode 100644
index ecfdd26cb45c..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/PreviewView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_PreviewView" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="presentation_PreviewView"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/presentation_XCustomPresentationSupplier.xba b/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/presentation_XCustomPresentationSupplier.xba
deleted file mode 100644
index 3f999c6caef8..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/presentation_XCustomPresentationSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_XCustomPresentationSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.presentation.XCustomPresentationSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCustPres As Object
-
-    Test.StartMethod("getCustomPresentations()")
-    bOK = true
-    oCustPres = oObj.getCustomPresentations()
-    bOK = bOK AND NOT isNull(oCustPres)
-    bOK = bOK AND hasUnoInterfaces(oCustPres, "com.sun.star.container.XNameContainer")
-    Test.MethodTested("getCustomPresentations()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/script.xlb b/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/script.xlb
deleted file mode 100644
index a47543309bc2..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XCustomPresentationSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_XCustomPresentationSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="presentation_XCustomPresentationSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XPresentation/presentation_XPresentation.xba b/qadevOOo/tests/basic/ifc/presentation/XPresentation/presentation_XPresentation.xba
deleted file mode 100644
index 8b31c1dda6dd..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XPresentation/presentation_XPresentation.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_XPresentation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.presentation.XPresentation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("start()")
-    bOK = true
-    oObj.start()
-    Test.MethodTested("start()", bOK)
-
-    Test.StartMethod("rehearseTimings()")
-    bOK = true
-    oObj.rehearseTimings()
-    Test.MethodTested("rehearseTimings()", bOK)
-
-    Test.StartMethod("end()")
-    bOK = true
-    oObj.end()
-    Test.MethodTested("end()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XPresentation/script.xlb b/qadevOOo/tests/basic/ifc/presentation/XPresentation/script.xlb
deleted file mode 100644
index 1983239dd174..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XPresentation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_XPresentation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="presentation_XPresentation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/presentation_XPresentationSupplier.xba b/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/presentation_XPresentationSupplier.xba
deleted file mode 100644
index d5902e2375e9..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/presentation_XPresentationSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="presentation_XPresentationSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.presentation.XPresentationSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oPresentation As Object
-
-    Test.StartMethod("getPresentation()")
-    bOK = true
-    oPresentation = oObj.getPresentation()
-    bOK = bOK AND NOT isNull(oPresentation)
-    bOK = bOK AND hasUnoInterfaces(oPresentation, "com.sun.star.presentation.XPresentation")
-    Test.MethodTested("getPresentation()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/script.xlb b/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/script.xlb
deleted file mode 100644
index c118d9ff34d4..000000000000
--- a/qadevOOo/tests/basic/ifc/presentation/XPresentationSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="presentation_XPresentationSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="presentation_XPresentationSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/reflection_XIdlReflection.xba b/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/reflection_XIdlReflection.xba
deleted file mode 100644
index 65335dd20403..000000000000
--- a/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/reflection_XIdlReflection.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="reflection_XIdlReflection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.reflection.XIdlReflection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oIdlClass As Object
-    Dim oIdlClassType As Object
-
-    Test.StartMethod("forName()")
-    bOK = true
-    oIdlClass = oObj.forName("com.sun.star.drawing.LineStyle")
-    bOK = bOK AND oIdlClass.Name = "com.sun.star.drawing.LineStyle"
-    Test.MethodTested("forName()", bOK)
-
-    Test.StartMethod("getType()")
-    bOK = true
-    oIdlClassType = oObj.getType(oIdlClass)
-    bOK = bOK AND hasUnoInterfaces(oIdlClass, "com.sun.star.reflection.XIdlClass")
-    bOK = bOK AND oIdlClassType.Name = "com.sun.star.reflection.XIdlClass"
-    Test.MethodTested("getType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/script.xlb b/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/script.xlb
deleted file mode 100644
index 7d0e642cb4e7..000000000000
--- a/qadevOOo/tests/basic/ifc/reflection/XIdlReflection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="reflection_XIdlReflection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="reflection_XIdlReflection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/reflection_XProxyFactory.xba b/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/reflection_XProxyFactory.xba
deleted file mode 100644
index b7a26af0e045..000000000000
--- a/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/reflection_XProxyFactory.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="reflection_XProxyFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.reflection.XProxyFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createProxy()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.createProxy(StarDesktop), "com.sun.star.uno.XAggregation")
-    Test.MethodTested("createProxy()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/script.xlb b/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/script.xlb
deleted file mode 100644
index 3784677d8aaa..000000000000
--- a/qadevOOo/tests/basic/ifc/reflection/XProxyFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="reflection_XProxyFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="reflection_XProxyFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/registry_XImplementationRegistration.xba b/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/registry_XImplementationRegistration.xba
deleted file mode 100644
index 2915d317d47a..000000000000
--- a/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/registry_XImplementationRegistration.xba
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="registry_XImplementationRegistration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.registry.XImplementationRegistration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aImplementationLoader As String
-    Dim aImplementations As Variant
-    Dim aMissingServices As Variant
-    Dim aLocation As String
-    Dim i As Integer
-    Dim k As Integer
-    Dim xReg As Object
-    Dim regKey As Object
-    Dim keyNames As Variant
-    Dim bNeedTest As Boolean
-
-    xReg = createUNOService("com.sun.star.registry.SimpleRegistry")
-    xReg.Open(utils.Path2URL(cTestDocsDir &amp; "XImpReg.reg"), false, true)
-    aImplementationLoader = "com.sun.star.loader.Java2"
-    aLocation = utils.Path2URL(cTestDocsDir &amp; "qadevlibs/MyPersistObjectImpl.jar")
-
-    Test.StartMethod("getImplementations()")
-    bOK = true
-    aImplementations = oObj.getImplementations(aImplementationLoader, aLocation)
-    bOK = bOK AND i &gt;= 0
-    for i = 0 to ubound(aImplementations)
-        Out.Log "" &amp; i + 1 &amp; ") " &amp; aImplementations(i)
-    next i
-    Test.MethodTested("getImplementations()", bOK)
-
-    Test.StartMethod("registerImplementation()")
-    Out.Log("Registering implementation from " &amp; aLocation)
-    bOK = true
-    oObj.registerImplementation(aImplementationLoader, aLocation, xReg)
-
-    bOK = bOK AND xReg.isValid()
-
-    regKey = xReg.getRootKey.openKey("IMPLEMENTATIONS")
-    keyNames = regKey.getKeyNames()
-    Out.Log("In registry found " &amp; ubound(keyNames) + 1 &amp; " implementations.")
-    Dim aFlags(ubound(aImplementations())) As Boolean
-    for i = 0 to ubound(aFlags())
-        aFlags(i) = false
-    next i
-
-    for i = 0 to ubound(keyNames())
-        Out.Log("Found key: " &amp; keyNames(i))
-        for k = 0 to ubound(aImplementations)
-            if (inStr(1, keyNames(i), aImplementations(k)) &gt; 0 ) then
-                aFlags(k) = true
-            end if
-        next k
-    next i
-
-    for i = 0 to ubound(aFlags())
-        if (NOT aFlags(i)) then
-            Out.Log("Can't find information about " &amp; aImplementations(i) &amp; " in regestry")
-            bOK = false
-        end if
-    next i
-
-    Test.MethodTested("registerImplementation()", bOK)
-
-    Test.StartMethod("checkInstantiation()")
-    bOK = true
-    Out.Log("Looking for missing services to create " &amp; aImplementations(0))
-    aMissingServices = oObj.checkInstantiation(aImplementations(0))
-    Out.Log("" &amp; ubound(aMissingServices) + 1 &amp; " missing services were found")
-    for i = 0 to ubound(aMissingServices)
-        Out.Log "" &amp; i &amp; ") " &amp; aMissingServices(i)
-    next i
-    Test.MethodTested("checkInstantiation()", bOK)
-
-    Test.StartMethod("revokeImplementation()")
-    bOK = true
-    bNeedTest = false
-
-    oObj.revokeImplementation(aLocation, xReg)
-
-    bOK = bOK AND xReg.isValid()
-    regKey = xReg.getRootKey
-    keyNames = regKey.getKeyNames()
-    for i = 0 to ubound(keyNames())
-        if (inStr(1, keyNames(i), "IMPLEMENTATIONS") &gt; 0) then
-            bNeedTest = true
-        end if
-    next i
-    if (NOT bNeedTest) then
-        Out.Log("No implementation was found.")
-    end if
-
-    if (bOK AND bNeedTest) then
-        regKey = xReg.getRootKey.openKey("IMPLEMENTATIONS")
-        Out.Log("In registry found " &amp; ubound(keyNames) + 1 &amp; " implementations.")
-
-        for i = 0 to ubound(aFlags())
-            aFlags(i) = false
-        next i
-
-        for i = 0 to ubound(keyNames())
-            Out.Log("Found key: " &amp; keyNames(i))
-            for k = 0 to ubound(aImplementations)
-                if (inStr(1, keyNames(i), aImplementations(k)) &gt; 0 ) then
-                    aFlags(k) = true
-                end if
-            next k
-        next i
-
-        for i = 0 to ubound(aFlags())
-            if (aFlags(i)) then
-                Out.Log("Information about " &amp; aImplementations(i) &amp; " is still in regestry")
-                bOK = false
-            end if
-        next i
-    end if
-    Test.MethodTested("revokeImplementation()", bOK)
-
-    xReg.Close()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/script.xlb b/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/script.xlb
deleted file mode 100644
index ba6078351ce9..000000000000
--- a/qadevOOo/tests/basic/ifc/registry/XImplementationRegistration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="registry_XImplementationRegistration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="registry_XImplementationRegistration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/registry_XSimpleRegistry.xba b/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/registry_XSimpleRegistry.xba
deleted file mode 100644
index fb9649252959..000000000000
--- a/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/registry_XSimpleRegistry.xba
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="registry_XSimpleRegistry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.registry.XSimpleRegistry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cURL As String
-    Dim cTempURL As String
-    Dim oTempReg As Object
-    Dim oRoot As Object
-    Dim oKey As Object
-    Dim oKey2 As Object
-
-    cURL = utils.getTempFileURL("BASReg.rdb", true)
-
-    Test.StartMethod("open()")
-    bOK = true
-    if (cObjectName &lt;&gt; "defreg.NestedRegistry") then
-        oObj.open(cURL, false, true)
-        bOK = bOK AND FileExists(cURL)
-    end if
-    Test.MethodTested("open()", bOK)
-
-    Test.StartMethod("isValid()")
-    bOK = true
-    bOK = bOK AND oObj.isValid()
-    Test.MethodTested("isValid()", bOK)
-
-    Test.StartMethod("getRootKey()")
-    bOK = true
-    oKey = oObj.getRootKey()
-    bOK = bOK AND hasUnoInterfaces(oKey, "com.sun.star.registry.XRegistryKey")
-    Test.MethodTested("getRootKey()", bOK)
-
-    Test.StartMethod("isReadOnly()")
-    bOK = true
-    bOK = bOK AND NOT oObj.isReadOnly()
-    Test.MethodTested("isReadOnly()", bOK)
-
-    Test.StartMethod("mergeKey()")
-    bOK = true
-
-    oKey.createKey("Key1").setStringValue("Value of Key1")
-
-    cTempURL = utils.getTempFileURL("BASRegTemp.rdb", true)
-    oTempReg = createUnoService("com.sun.star.registry.SimpleRegistry")
-    oTempReg.open(cTempURL, false, true)
-    oKey2 = oTempReg.getRootKey()
-    oKey2.createKey("Key2").setStringValue("Value of Key2")
-
-    oObj.mergeKey("/", cTempURL)
-
-    oRoot = oObj.RootKey
-    oKey = oRoot.openKey("Key1")
-    bOK = bOK AND oKey.getStringValue = "Value of Key1"
-    oKey = oRoot.openKey("Key2")
-    bOK = bOK AND oKey.getStringValue = "Value of Key2"
-    oTempReg.close()
-
-    Test.MethodTested("mergeKey()", bOK)
-
-    Test.StartMethod("getURL()")
-    bOK = true
-    Out.Log("Returned URL is " &amp; oObj.URL)
-    bOK = bOK AND inStr(1, oObj.URL, ".rdb") &gt; 0
-    Test.MethodTested("getURL()", bOK)
-
-    Test.StartMethod("destroy()")
-    bOK = true
-    if (cObjectName &lt;&gt; "defreg.NestedRegistry") then
-        oObj.open(cURL, false, true)
-        oObj.destroy()
-    end if
-    Test.MethodTested("destroy()", bOK)
-
-    Test.StartMethod("close()")
-    bOK = true
-    if (cObjectName &lt;&gt; "defreg.NestedRegistry") then
-        oObj.open(cURL, false, true)
-        oObj.close()
-    end if
-    Test.MethodTested("close()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/script.xlb b/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/script.xlb
deleted file mode 100644
index a4234ec9ee79..000000000000
--- a/qadevOOo/tests/basic/ifc/registry/XSimpleRegistry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="registry_XSimpleRegistry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="registry_XSimpleRegistry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script.xlb b/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script.xlb
deleted file mode 100644
index 915cdd0d4160..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="script_XEventAttacherManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="script_XEventAttacherManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script_XEventAttacherManager.xba b/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script_XEventAttacherManager.xba
deleted file mode 100644
index 8aa6a798ccaf..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XEventAttacherManager/script_XEventAttacherManager.xba
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="script_XEventAttacherManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.script.XEventAttacherManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-	oObj.insertEntry(0)
-
-    Test.StartMethod("addScriptListener()")
-    bOK = true
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-
-	oListener = createUnoListener("CB1_", "com.sun.star.script.XScriptListener")
-
-    oObj.addScriptListener(oListener)
-
-    Test.MethodTested("addScriptListener()", bOK)
-
-
-    Test.StartMethod("registerScriptEvent()")
-    bOK = true
-
-	Dim aScriptEvent1 As New com.sun.star.script.ScriptEventDescriptor
-	aScriptEvent1.ListenerType = "ScriptListener"
-	aScriptEvent1.EventMethod = "Test"
-	aScriptEvent1.AddListenerParam = ""
-	aScriptEvent1.ScriptType = "Basic"
-	aScriptEvent1.ScriptCode = "MsgBox ""Script1"""
-	oObj.registerScriptEvent(0, aScriptEvent1)
-
-    Test.MethodTested("registerScriptEvent()", bOK)
-
-    Test.StartMethod("registerScriptEvents()")
-    bOK = true
-	Dim aScriptEvent2 As New com.sun.star.script.ScriptEventDescriptor
-	aScriptEvent2.ListenerType = "ScriptListener"
-	aScriptEvent2.EventMethod = "Test"
-	aScriptEvent2.AddListenerParam = ""
-	aScriptEvent2.ScriptType = "Basic"
-	aScriptEvent2.ScriptCode = "MsgBox ""Script2"""
-	Dim aScriptEvent3 As New com.sun.star.script.ScriptEventDescriptor
-	aScriptEvent3.ListenerType = "ScriptListener"
-	aScriptEvent3.EventMethod = "Test"
-	aScriptEvent3.AddListenerParam = ""
-	aScriptEvent3.ScriptType = "Basic"
-	aScriptEvent3.ScriptCode = "MsgBox ""Script3"""
-
-	Dim aScripts(1)
-	aScripts(0) = aScriptEvent2
-	aScripts(1) = aScriptEvent3
-
-	oObj.registerScriptEvents(0, aScripts())
-
-    Test.MethodTested("registerScriptEvents()", bOK)
-
-    Test.StartMethod("getScriptEvents()")
-    bOK = true
-    allScripts = oObj.getScriptEvents(0)
-    bOK = bOK AND ubound(allScripts) = 2
-    bOK = bOK AND allScripts(0).ScriptCode = "MsgBox ""Script1"""
-    bOK = bOK AND allScripts(1).ScriptCode = "MsgBox ""Script2"""
-    bOK = bOK AND allScripts(2).ScriptCode = "MsgBox ""Script3"""
-    Test.MethodTested("getScriptEvents()", bOK)
-
-    Test.StartMethod("insertEntry()")
-    bOK = true
-    oObj.insertEntry(0)
-    allScripts = oObj.getScriptEvents(0)
-    bOK = bOK AND ubound(allScripts) = -1
-    allScripts = oObj.getScriptEvents(1)
-    bOK = bOK AND ubound(allScripts) = 2
-    Test.MethodTested("insertEntry()", bOK)
-
-    Test.StartMethod("removeEntry()")
-    bOK = true
-    oObj.removeEntry(0)
-    allScripts = oObj.getScriptEvents(1)
-    bOK = bOK AND ubound(allScripts) = -1
-    allScripts = oObj.getScriptEvents(0)
-    bOK = bOK AND ubound(allScripts) = 2
-    Test.MethodTested("removeEntry()", bOK)
-
-    Test.StartMethod("attach()")
-    bOK = true
-    oObj.attach(0, oObj, "")
-    Test.MethodTested("attach()", bOK)
-
-    Test.StartMethod("detach()")
-    bOK = true
-    oObj.detach(0, oObj)
-    Test.MethodTested("detach()", bOK)
-
-
-    Test.StartMethod("revokeScriptEvent()")
-    bOK = true
-    oObj.revokeScriptEvent(0, "ScriptListener", "Test", "")
-    allScripts = oObj.getScriptEvents(0)
-    bOK = bOK AND ubound(allScripts) = 1
-    Test.MethodTested("revokeScriptEvent()", bOK)
-
-    Test.StartMethod("revokeScriptEvents()")
-    bOK = true
-    oObj.revokeScriptEvents(0)
-    allScripts = oObj.getScriptEvents(0)
-    bOK = bOK AND ubound(allScripts) = -1
-    Test.MethodTested("revokeScriptEvents()", bOK)
-
-    Test.StartMethod("removeScriptListener()")
-    bOK = true
-    oObj.removeScriptListener(oListener)
-    Test.MethodTested("removeScriptListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script.xlb b/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script.xlb
deleted file mode 100644
index 6478659303e1..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="script_XInvocationAdapterFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="script_XInvocationAdapterFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script_XInvocationAdapterFactory.xba b/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script_XInvocationAdapterFactory.xba
deleted file mode 100644
index 34f1d2a7fc9d..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory/script_XInvocationAdapterFactory.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="script_XInvocationAdapterFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.script.XInvocationAdapterFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim pipe As Object, invFac As Object, inv As Object
-    Dim adp As Object
-    Dim tIS As Variant
-
-    Out.Log("Preparing arguments for method call ...")
-    pipe = createUnoService("com.sun.star.io.Pipe")
-    invFac = createUnoService("com.sun.star.script.Invocation")
-    inv = invFac.createInstanceWithArguments(Array(pipe))
-
-    Test.StartMethod("createAdapter()")
-    bOK = true
-    tIS = oCoreRefl.forName("com.sun.star.io.XInputStream")
-    Out.Log("Creating adapter for '" + tIS.Name + "' interface")
-    adp = oObj.createAdapter(inv, tIS)
-    if NOT isNull(adp) then
-        if NOT hasUnoInterfaces(adp, "com.sun.star.io.XInputStream") then
-            bOK = false
-            Out.Log("Returned object doesn't support XInputStream")
-        endif
-    else
-        bOK = false
-        Out.Log("NULL was returned.")
-    endif
-
-    Test.MethodTested("createAdapter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script.xlb b/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script.xlb
deleted file mode 100644
index f182c69bf6b1..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="script_XInvocationAdapterFactory2" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="script_XInvocationAdapterFactory2"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script_XInvocationAdapterFactory2.xba b/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script_XInvocationAdapterFactory2.xba
deleted file mode 100644
index 49dad6ec208d..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XInvocationAdapterFactory2/script_XInvocationAdapterFactory2.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="script_XInvocationAdapterFactory2" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.script.XInvocationAdapterFactory2
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim pipe As Object, invFac As Object, inv As Object
-    Dim adp As Object
-    Dim types As Variant
-
-    Out.Log("Preparing arguments for method call ...")
-    pipe = createUnoService("com.sun.star.io.Pipe")
-    invFac = createUnoService("com.sun.star.script.Invocation")
-    inv = invFac.createInstanceWithArguments(Array(pipe))
-
-    Test.StartMethod("createAdapter()")
-    bOK = true
-    types = Array( oCoreRefl.forName("com.sun.star.io.XInputStream") )
-    adp = oObj.createAdapter(inv, tIS)
-    if NOT isNull(adp) then
-        if NOT hasUnoInterfaces(adp, "com.sun.star.io.XInputStream") then
-            bOK = false
-            Out.Log("Returned object doesn't support XInputStream")
-        endif
-    else
-        bOK = false
-        Out.Log("NULL was returned.")
-    endif
-
-    Test.MethodTested("createAdapter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/script/XTypeConverter/script.xlb b/qadevOOo/tests/basic/ifc/script/XTypeConverter/script.xlb
deleted file mode 100644
index 2168d231f1d8..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XTypeConverter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="script_XTypeConverter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="script_XTypeConverter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/script/XTypeConverter/script_XTypeConverter.xba b/qadevOOo/tests/basic/ifc/script/XTypeConverter/script_XTypeConverter.xba
deleted file mode 100644
index 26d613cbef4c..000000000000
--- a/qadevOOo/tests/basic/ifc/script/XTypeConverter/script_XTypeConverter.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="script_XTypeConverter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.script.XTypeConverter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCoreRefl As Object
-
-    oCoreRefl = createUNOService("com.sun.star.reflection.CoreReflection")
-
-    Test.StartMethod("convertTo()")
-    bOK = true
-    Dim tXInterface As Variant
-    Dim tXInterfaceObject As Variant
-    Dim cObjTypeName As String
-    Dim oObjToConv As Object
-
-    Out.Log("Creating a Type object for XInterface")
-    tXInterface = oCoreRefl.forName("com.sun.star.io.XInputStream")
-    Out.Log("Created " + tXInterface.Name)
-
-    oObjToConv = createUnoService("com.sun.star.io.Pipe")
-    Out.Log("Converting object of type " + oCoreRefl.getType(oObjToConv).Name + " to " + tXInterface.Name)
-    tXInterfaceObject = oObj.convertTo(oObjToConv, tXInterface)
-
-    if (isNULL(tXInterfaceObject)) then
-        Out.Log("Returned object is NULL!!!")
-        bOK = false
-    elseif (isEmpty(tXInterfaceObject)) then
-        cObjTypeName = "Empty"
-    else
-        cObjTypeName = oCoreRefl.getType(tXInterfaceObject).Name
-    end if
-
-    Out.Log("New object is of type " + cObjTypeName + ".")
-
-    bOK = bOK AND NOT isNULL(tXInterfaceObject)
-    bOK = bOK AND inStr(1, cObjTypeName, "XInterface")
-    Test.MethodTested("convertTo()", bOK)
-
-
-    Test.StartMethod("convertToSimpleType()")
-    Dim oldType As String
-    Dim newType As String
-    Dim oldVal As Integer
-    Dim newVal
-
-    bOK = true
-
-    oldVal = 65
-    oldType = oCoreRefl.getType(oldVal).Name
-    newVal = oObj.convertToSimpleType(oldVal, com.sun.star.uno.TypeClass.STRING)
-    newType = oCoreRefl.getType(newVal).Name
-
-    bOK = bOK AND newType &lt;&gt; oldType
-    bOK = bOK AND inStr(1, newVal, "65")
-    Out.Log("Old value is " + oldVal + " of type " + oldType + ", new value is " + _
-                             newVal + " of type " + newType + ".")
-    Test.MethodTested("convertToSimpleType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/script.xlb
deleted file mode 100644
index cd1568bef490..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_DataAccessDescriptor" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sdb_DataAccessDescriptor"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/sdb_DataAccessDescriptor.xba b/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/sdb_DataAccessDescriptor.xba
deleted file mode 100644
index 9f00da7b7379..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DataAccessDescriptor/sdb_DataAccessDescriptor.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_DataAccessDescriptor" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' NONE
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.DataAccessDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("DataSourceName")
-
-    PropertyTester.TestProperty("ActiveConnection")
-
-    PropertyTester.TestProperty("Command")
-
-    PropertyTester.TestProperty("CommandType")
-
-    PropertyTester.TestProperty("Filter")
-
-    PropertyTester.TestProperty("EscapeProcessing")
-
-    PropertyTester.TestProperty("ResultSet")
-
-    PropertyTester.TestProperty("Selection", Array(Array(2,4), Array(1,3)))
-
-    PropertyTester.TestProperty("BookmarkSelection")
-
-    PropertyTester.TestProperty("ColumnName")
-
-    PropertyTester.TestProperty("Column")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DataSource/script.xlb b/qadevOOo/tests/basic/ifc/sdb/DataSource/script.xlb
deleted file mode 100644
index 2e4c15e4a7b8..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DataSource/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_DataSource" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_DataSource"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DataSource/sdb_DataSource.xba b/qadevOOo/tests/basic/ifc/sdb/DataSource/sdb_DataSource.xba
deleted file mode 100644
index 58894d625364..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DataSource/sdb_DataSource.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_DataSource" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - SuppressVersionColumns
-'     - IsReadOnly
-'     - NumberFormatsSupplier
-'     - TableFilter
-'     - TableTypeFilter
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdb.DataSource
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim infoUsr as new com.sun.star.beans.PropertyValue
-    Dim infoPass as new com.sun.star.beans.PropertyValue
-    Dim bOk as Boolean
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("URL")
-
-    Test.StartMethod("Info")
-    props() = oObj.Info
-
-    infoUsr.Name = "user"
-    if ubound(props()) > -1 then 
-        infoUsr.Value = "New" + props(0).Value 
-    else
-        infoUsr.Value = "DataSourceUser"
-    endif
-    
-    infoPass.Name = "password"
-    infoPass.Value = "DataSourcePasswd"
-
-    newProps = Array(infoUsr, infoPass)
-    oObj.Info = newProps
-    getProps() = oObj.Info
-    Out.Log("ubound = " + ubound(getProps()))
-
-    bOk = PropertyTester.equals(newProps, getProps)
-
-    Test.MethodTested("Info", bOk)
-
-    PropertyTester.TestProperty("User")
-
-    PropertyTester.TestProperty("Password")
-
-    PropertyTester.TestProperty("IsPasswordRequired")
-
-    PropertyTester.TestProperty("SuppressVersionColumns")
-
-    PropertyTester.TestProperty("IsReadOnly")
-
-    PropertyTester.TestProperty("NumberFormatsSupplier")
-
-    PropertyTester.TestProperty("TableFilter")
-
-    PropertyTester.TestProperty("TableTypeFilter")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/script.xlb b/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/script.xlb
deleted file mode 100644
index dd1009b2297b..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_DatasourceAdministrationDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_DatasourceAdministrationDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/sdb_DatasourceAdministrationDialog.xba b/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/sdb_DatasourceAdministrationDialog.xba
deleted file mode 100644
index db42fb893ad7..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/DatasourceAdministrationDialog/sdb_DatasourceAdministrationDialog.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_DatasourceAdministrationDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdb.DatasourceAdministrationDialog
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("ParentWindow")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/script.xlb b/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/script.xlb
deleted file mode 100644
index 9a2d6ef472df..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_ErrorMessageDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_ErrorMessageDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/sdb_ErrorMessageDialog.xba b/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/sdb_ErrorMessageDialog.xba
deleted file mode 100644
index 734a5d250ac3..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/ErrorMessageDialog/sdb_ErrorMessageDialog.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_ErrorMessageDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdb.ErrorMessageDialog
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim excep As Variant
-    Dim bOK As Boolean 
-    Dim msg As String
-
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("ParentWindow")
-
-    Test.StartMethod("SQLException")
-    bOk = true
-    excep = oObj.SQLException
-    if isNull(excep) OR isEmpty(excep) then
-        Out.Log("Property is null and cann't be changed")
-    else
-        oObj.SQLException = NULL_OBJECT
-        excep = oObj.SQLException
-        bOk = bOK AND (isNull(excep) OR isEmpty(excep))
-    endIf
-    Test.MethodTested("SQLException", bOK)   
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/script.xlb b/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/script.xlb
deleted file mode 100644
index be39aab5d1a8..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_QueryDefinition" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_QueryDefinition"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/sdb_QueryDefinition.xba b/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/sdb_QueryDefinition.xba
deleted file mode 100644
index 86723d3d00f8..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/QueryDefinition/sdb_QueryDefinition.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_QueryDefinition" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdb.QueryDefinition
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("Command")
-
-    PropertyTester.TestProperty("EscapeProcessing")
-
-    PropertyTester.TestProperty("UpdateTableName")
-
-    PropertyTester.TestProperty("UpdateCatalogName")
-
-    PropertyTester.TestProperty("UpdateSchemaName")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/RowSet/script.xlb b/qadevOOo/tests/basic/ifc/sdb/RowSet/script.xlb
deleted file mode 100644
index e739bd7198ea..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/RowSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_RowSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_RowSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/RowSet/sdb_RowSet.xba b/qadevOOo/tests/basic/ifc/sdb/RowSet/sdb_RowSet.xba
deleted file mode 100644
index cc52b46be8fc..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/RowSet/sdb_RowSet.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_RowSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdb.RowSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ActiveConnection")
-
-    PropertyTester.TestProperty("DataSourceName")
-
-    PropertyTester.TestProperty("Command")
-
-    Test.StartMethod("CommandType")
-    bOK = true
-    oldVal = oObj.CommandType
-    Out.Log("value before: "+oldVal)
-    if (oldVal &lt;&gt; 9999) then 
-        oObj.CommandType = 9999
-    else
-        oObj.CommandType = 10000
-    endif
-    newVal = oObj.CommandType
-    Out.Log("value after: "+newVal)
-    bOK = bOK AND (newVal &lt;&gt; oldVal)
-    Test.MethodTested("CommandType",bOK)
-
-    PropertyTester.TestProperty("ActiveCommand")
-
-    PropertyTester.TestProperty("IgnoreResult")
-
-    PropertyTester.TestProperty("Filter")
-
-    PropertyTester.TestProperty("ApplyFilter")
-
-    PropertyTester.TestProperty("Order")
-
-    PropertyTester.TestProperty("Privileges")
-
-    PropertyTester.TestProperty("IsModified")
-
-    PropertyTester.TestProperty("IsNew")
-
-    PropertyTester.TestProperty("RowCount")
-
-    PropertyTester.TestProperty("IsRowCountFinal")
-
-    PropertyTester.TestProperty("UpdateTableName")
-
-    PropertyTester.TestProperty("UpdateCatalogName")
-
-    PropertyTester.TestProperty("UpdateSchemaName")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/script.xlb
deleted file mode 100644
index 150ca7de9f49..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_XBookmarksSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_XBookmarksSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/sdb_XBookmarksSupplier.xba b/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/sdb_XBookmarksSupplier.xba
deleted file mode 100644
index 691dbc25aaca..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XBookmarksSupplier/sdb_XBookmarksSupplier.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_XBookmarksSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.XBookmarksSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bkMrks as Variant
-
-
-    Test.StartMethod("getBookmarks()")
-    bOK = true
-    bkMrks = oObj.getBookmarks()
-    bOK = bOK AND (NOT isNull(bkMrks))
-    if NOT bOK then Out.Log("The method returned NULL")
-    bOK = bOK AND hasUNOInterfaces(bkMrks, "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getBookmarks()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/script.xlb b/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/script.xlb
deleted file mode 100644
index 2ee70813f92a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_XCompletedConnection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_XCompletedConnection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/sdb_XCompletedConnection.xba b/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/sdb_XCompletedConnection.xba
deleted file mode 100644
index b8254ddb5e2a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XCompletedConnection/sdb_XCompletedConnection.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_XCompletedConnection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.XCompletedConnection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    ReCreateObj()
-
-    Test.StartMethod("connectWithCompletion()")
-    bOK = true
-    Dim oIH As Object
-    Dim oConnection As Object
-    oIH = createUnoService("com.sun.star.sdb.InteractionHandler")
-    oConnection = oObj.connectWithCompletion(oIH)
-    bOK = bOK AND hasUnoInterfaces(oConnection, "com.sun.star.sdbc.XConnection")
-    Test.MethodTested("connectWithCompletion()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/script.xlb
deleted file mode 100644
index 30016fad8059..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_XQueryDefinitionsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_XQueryDefinitionsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/sdb_XQueryDefinitionsSupplier.xba b/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/sdb_XQueryDefinitionsSupplier.xba
deleted file mode 100644
index 1d3a69bffea1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XQueryDefinitionsSupplier/sdb_XQueryDefinitionsSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_XQueryDefinitionsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.XQueryDefinitionsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getQueryDefinitions()")
-    bOK = true
-    Dim oQD As Object
-    oQD = oObj.getQueryDefinitions()
-    bOK = bOK AND hasUnoInterfaces(oQD, "com.sun.star.container.XNameAccess"
-    Test.MethodTested("getQueryDefinitions()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/script.xlb b/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/script.xlb
deleted file mode 100644
index 2f4becc94f61..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_XResultSetAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_XResultSetAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/sdb_XResultSetAccess.xba b/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/sdb_XResultSetAccess.xba
deleted file mode 100644
index cbbb70f067d1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XResultSetAccess/sdb_XResultSetAccess.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_XResultSetAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.XResultSetAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createResultSet()")
-    bOK = true
-    oResultSet = oObj.createResultSet()
-    bOK = bOK AND hasUnoInterfaces(oResultSet, "com.sun.star.sdbc.XResultSet")
-    Test.MethodTested("createResultSet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/script.xlb
deleted file mode 100644
index d5f0289de9ce..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdb_XRowSetApproveBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdb_XRowSetApproveBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/sdb_XRowSetApproveBroadcaster.xba b/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/sdb_XRowSetApproveBroadcaster.xba
deleted file mode 100644
index ba32a84bb2b3..000000000000
--- a/qadevOOo/tests/basic/ifc/sdb/XRowSetApproveBroadcaster/sdb_XRowSetApproveBroadcaster.xba
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdb_XRowSetApproveBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-Dim iApproveCursorMove1 As Integer
-Dim iApproveCursorMove2 As Integer
-Dim iApproveRowChange1 As Integer
-Dim iApproveRowChange2 As Integer
-Dim iApproveRowSetChange1 As Integer
-Dim iApproveRowSetChange2 As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdb.XRowSetApproveBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-    Dim cOrigStr As String
-    Dim cPrevStr As String
-
-    oObj.first()
-    cOrigStr = oObj.getString(1)
-
-    Out.Log("Creating two XRowSetApproveListeners")
-    oListener1 = createUnoListener("CB1_", "com.sun.star.sdb.XRowSetApproveListener")
-    oListener2 = createUnoListener("CB2_", "com.sun.star.sdb.XRowSetApproveListener")
-
-    ResetCounters()
-
-    Test.StartMethod("addRowSetApproveListener()")
-    bOK = true
-    oObj.addRowSetApproveListener(oListener1)
-    oObj.addRowSetApproveListener(oListener2)
-
-    bOK = bOK AND Expected(0, 0, 0, 0, 0, 0)
-
-    Out.Log("Call oObj.execute() - change RowSet")
-    oObj.execute()
-    bOK = bOK AND Expected(0, 0, 0, 0, 1, 1)
-
-    ResetCounters()
-    Out.Log("Call oObj.next() - move cursor")
-    oObj.next()
-    bOK = bOK AND Expected(1, 1, 0, 0, 0, 0)
-
-    Out.Log("Call oObj.updateString() - updating RowSet")
-    oObj.first()
-    ResetCounters()
-    cPrevStr = oObj.getString(1)
-    Out.Log(cPrevStr)
-    oObj.updateString(1, cPrevStr + "+")
-    oObj.updateRow()
-    Out.Log(oObj.getString(1))
-    bOK = bOK AND Expected(0, 0, 1, 1, 0, 0)
-    bOK = bOK AND oObj.getString(1) = cPrevStr + "+"
-
-    Test.MethodTested("addRowSetApproveListener()", bOK)
-
-    ResetCounters()
-
-    Test.StartMethod("removeRowSetApproveListener()")
-    bOK = true
-    Out.Log("Removing only first listener")
-    oObj.removeRowSetApproveListener(oListener1)
-
-    bOK = bOK AND Expected(0, 0, 0, 0, 0, 0)
-
-    Out.Log("Call oObj.execute() - change RowSet")
-    oObj.execute()
-    bOK = bOK AND Expected(0, 0, 0, 0, 0, 1)
-
-    ResetCounters()
-    Out.Log("Call oObj.next() - move cursor")
-    oObj.next()
-    bOK = bOK AND Expected(0, 1, 0, 0, 0, 0)
-
-    ResetCounters()
-    Out.Log("Call oObj.updateString() - updating RowSet")
-    oObj.first()
-    cPrevStr = oObj.getString(1)
-    Out.Log(cPrevStr)
-    oObj.updateString(1, cPrevStr + "+")
-    oObj.updateRow()
-    Out.Log(oObj.getString(1))
-    bOK = bOK AND Expected(0, 0, 0, 1, 0, 0)
-    bOK = bOK AND oObj.getString(1) = cPrevStr + "+"
-
-    Test.MethodTested("removeRowSetApproveListener()", bOK)
-
-    Out.Log("Removing last listener")
-    oObj.removeRowSetApproveListener(oListener2)
-
-    Out.Log("Returning first row back...")
-    oObj.first()
-    oObj.updateString(1, cOrigStr)
-    oObj.updateRow()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function CB1_approveCursorMove(oEvent As Object) As Boolean
-    Out.Log("callback function approveCursorMove() for Listener1 was called!")
-    iApproveCursorMove1 = iApproveCursorMove1 + 1
-    CB1_approveCursorMove() = true
-End Function
-
-Function CB2_approveCursorMove(oEvent As Object) As Boolean
-    Out.Log("callback function approveCursorMove() for Listener2 was called!")
-    iApproveCursorMove2 = iApproveCursorMove2 + 1
-    CB2_approveCursorMove() = true
-End Function
-
-Function CB1_approveRowChange(oEvent As Object) As Boolean
-    Out.Log("callback function approveRowChange() for Listener1 was called!")
-    iApproveRowChange1 = iApproveRowChange1 + 1
-    CB1_approveRowChange() = true
-End Function
-
-Function CB2_approveRowChange(oEvent As Object) As Boolean
-    Out.Log("callback function approveRowChange() for Listener2 was called!")
-    iApproveRowChange2 = iApproveRowChange2 + 1
-    CB2_approveRowChange() = true
-End Function
-
-Function CB1_approveRowSetChange(oEvent As Object) As Boolean
-    Out.Log("callback function approveRowSetChange() for Listener1 was called!")
-    iApproveRowSetChange1 = iApproveRowSetChange1 + 1
-    CB1_approveRowSetChange() = true
-End Function
-
-Function CB2_approveRowSetChange(oEvent As Object) As Boolean
-    Out.Log("callback function approveRowSetChange() for Listener2 was called!")
-    iApproveRowSetChange2 = iApproveRowSetChange2 + 1
-    CB2_approveRowSetChange() = true
-End Function
-
-Sub ResetCounters()
-    Out.Log("Reset counters...")
-    iApproveCursorMove1   = 0
-    iApproveCursorMove2   = 0
-    iApproveRowChange1    = 0
-    iApproveRowChange2    = 0
-    iApproveRowSetChange1 = 0
-    iApproveRowSetChange2 = 0
-End Sub
-
-Function Expected(iApprCursorMove1 As Integer, iApprCursorMove2 As Integer, _
-                  iApprRowChange1  As Integer, iApprRowChange2  As Integer, _
-                  iApprRowSetChange1 As Integer, iApprRowSetChange2 As Integer) As Boolean
-Dim bOK As Boolean
-    bOK = true
-
-    bOK = bOK AND Expected1("approveCursorMove()", 1, iApproveCursorMove1, iApprCursorMove1)
-    bOK = bOK AND Expected1("approveCursorMove()", 2, iApproveCursorMove2, iApprCursorMove2)
-    bOK = bOK AND Expected1("approveRowChange()",  1, iApproveRowChange1, iApprRowChange1)
-    bOK = bOK AND Expected1("approveRowChange()",  2, iApproveRowChange2, iApprRowChange2)
-    bOK = bOK AND Expected1("apprRowSetChange()",  1, iApproveRowSetChange1, iApprRowSetChange1)
-    bOK = bOK AND Expected1("apprRowSetChange()",  2, iApproveRowSetChange2, iApprRowSetChange2)
-    Expected() = bOK
-End Function
-
-Function Expected1(fname As String, ln As Integer, val1 As Integer, val2 As Integer) As Boolean
-    Dim bOK As Integer
-
-    bOK = true
-    if (val1 &lt;&gt; val2) then
-        Out.Log(fname + " of Listener" + ln + " was called " + val1 + " time(s), "_
-               + "but it should be called " + val2 + " time(s).")
-        bOK = false
-    end if
-    Expected1() = bOK
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/ResultSet/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/ResultSet/script.xlb
deleted file mode 100644
index 32a0dc881d96..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/ResultSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_ResultSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_ResultSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/ResultSet/sdbc_ResultSet.xba b/qadevOOo/tests/basic/ifc/sdbc/ResultSet/sdbc_ResultSet.xba
deleted file mode 100644
index 8c4be7b77bd1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/ResultSet/sdbc_ResultSet.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_ResultSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdbc.ResultSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("CursorName")
-
-    PropertyTester.TestProperty("ResultSetConcurrency")
-
-    PropertyTester.TestProperty("ResultSetType")
-
-    PropertyTester.TestProperty("FetchDirection")
-
-    PropertyTester.TestProperty("FetchSize")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/RowSet/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/RowSet/script.xlb
deleted file mode 100644
index b29bd1235b71..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/RowSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_RowSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_RowSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/RowSet/sdbc_RowSet.xba b/qadevOOo/tests/basic/ifc/sdbc/RowSet/sdbc_RowSet.xba
deleted file mode 100644
index dccad879e23f..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/RowSet/sdbc_RowSet.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_RowSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdbc.RowSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("DataSourceName")
-
-    PropertyTester.TestProperty("URL")
-
-    PropertyTester.TestProperty("Command")
-
-    PropertyTester.TestProperty("TransactionIsolation")
-
-    PropertyTester.TestProperty("TypeMap")
-
-    PropertyTester.TestProperty("EscapeProcessing")
-
-    PropertyTester.TestProperty("QueryTimeOut")
-
-    PropertyTester.TestProperty("MaxFieldSize")
-
-    PropertyTester.TestProperty("MaxRows")
-
-    PropertyTester.TestProperty("User")
-
-    PropertyTester.TestProperty("Password")
-
-    PropertyTester.TestProperty("ResultSetType")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XCloseable/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XCloseable/script.xlb
deleted file mode 100644
index 52cb7f319887..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XCloseable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XCloseable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XCloseable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XCloseable/sdbc_XCloseable.xba b/qadevOOo/tests/basic/ifc/sdbc/XCloseable/sdbc_XCloseable.xba
deleted file mode 100644
index ec09836d0b4d..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XCloseable/sdbc_XCloseable.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XCloseable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XCloseable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("close()")
-    bOK = true
-    
-    Out.Log("Checking if the object is valid before closing ...")
-    oObj.first()
-    
-    oObj.close()
-    
-    Dim bEx As Boolean
-    bEx = false
-    On Error Goto ExpectErr
-    Out.Log("Checking if the row set was closed ...")
-    oObj.first()
-    On Error Goto ErrHndl
-    
-    bOK = bEx 
-
-    Test.MethodTested("close()", bOK)
-
-    ReCreateObj()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-    
-ExpectErr:
-    Out.Log("Proper exception occurred")
-    bEx = true
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/script.xlb
deleted file mode 100644
index 735924c27e5c..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XColumnLocate" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XColumnLocate"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/sdbc_XColumnLocate.xba b/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/sdbc_XColumnLocate.xba
deleted file mode 100644
index b2570fa5238c..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XColumnLocate/sdbc_XColumnLocate.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XColumnLocate" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cExistantColumnName As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XColumnLocate
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("findColumn()")
-    bOK = true
-    iColumn = oObj.findColumn(cExistantColumnName)
-
-    bOK = bOK AND iColumn &lt;&gt; 0
-    Test.MethodTested("findColumn()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDataSource/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XDataSource/script.xlb
deleted file mode 100644
index e5ffc7e4109a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDataSource/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XDataSource" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XDataSource"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDataSource/sdbc_XDataSource.xba b/qadevOOo/tests/basic/ifc/sdbc/XDataSource/sdbc_XDataSource.xba
deleted file mode 100644
index 6596f68fc20f..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDataSource/sdbc_XDataSource.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XDataSource" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XDataSource
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getConnection()")
-    Dim connection As Object
-    connection = oObj.getConnection("", "")
-    bOK = Not IsNull(connection)
-    Test.MethodTested("getConnection()", bOK)
-
-    Test.StartMethod("getLoginTimeout()")
-    Dim timeout As Integer
-    timeout = oObj.getLoginTimeout()
-    bOK = timeout = 0
-    Test.MethodTested("getLoginTimeout()", bOK)
-
-    Test.StartMethod("setLoginTimeout()")
-    oObj.setLoginTimeout(111)
-    timeout = oObj.getLoginTimeout()
-    bOK = timeout = 111
-    Test.MethodTested("setLoginTimeout()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDriver/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XDriver/script.xlb
deleted file mode 100644
index e4f39f7430d6..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XDriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XDriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDriver/sdbc_XDriver.xba b/qadevOOo/tests/basic/ifc/sdbc/XDriver/sdbc_XDriver.xba
deleted file mode 100644
index 5e6a37c70e2e..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDriver/sdbc_XDriver.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XDriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global URL as String
-'       Global info As Variant
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XDriver
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("acceptsURL()")
-    bOK = oObj.acceptsURL(URL)
-    Out.log("acceptsURL('" + URL + "')? " + bOK)
-    Test.MethodTested("acceptsURL()", bOK)
-
-    Test.StartMethod("connect()")
-    Out.log("connecting to '" + URL + "'")
-    Dim connection As Object
-    connection = oObj.connect(URL, info)
-    bOK = Not IsNull(connection)
-    Test.MethodTested("connect()", bOK)
-
-    Test.StartMethod("getPropertyInfo()")
-    Dim dpi As Variant
-    dpi = oObj.getPropertyInfo(URL, info)
-    bOK = Not IsNull(dpi)
-    if bOK then
-        Dim i As Integer
-        for i = 0 to ubound(dpi)
-            Out.log(dpi(i).Name + ": " + dpi(i).Value)
-        next i
-    endif
-    Test.MethodTested("getPropertyInfo()", bOK)
-
-    Test.StartMethod("getMajorVersion()")
-    bOK = true
-    Dim majVer As Integer
-    majVer = oObj.getMajorVersion()
-    Out.log("Major version: " + majVer)
-    Test.MethodTested("getMajorVersion()", bOK)
-
-    Test.StartMethod("getMinorVersion()")
-    bOK = true
-    Dim minVer As Integer
-    minVer = oObj.getMinorVersion()
-    Out.log("Minor version: " + minVer)
-    Test.MethodTested("getMinorVersion()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/script.xlb
deleted file mode 100644
index e2b90a2b7f85..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XDriverManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XDriverManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/sdbc_XDriverManager.xba b/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/sdbc_XDriverManager.xba
deleted file mode 100644
index 8adf6fd5828a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XDriverManager/sdbc_XDriverManager.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XDriverManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XDriverManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getConnection()")
-    Dim connection As Object
-    connection = oObj.getConnection(dbaseUrl)
-    Out.log("getConnection('" + dbaseUrl + "')")
-    bOK = Not IsNull(connection)
-    Test.MethodTested("getConnection()", bOK)
-
-    Test.StartMethod("getConnectionWithInfo()")
-    Dim info(2) As new com.sun.star.beans.PropertyValue
-    info(0).Name = "user" : info(0).Value = jdbcUser
-    info(1).Name = "password" : info(1).Value = jdbcPassword
-    info(2).Name = "JavaDriverClass" : info(2).Value = "org.gjt.mm.mysql.Driver"
-    connection = oObj.getConnectionWithInfo(jdbcUrl, info())
-    Out.log("getConnectionWithInfo('" + jdbcUrl + "')")
-    bOK = Not IsNull(connection)
-    Test.MethodTested("getConnectionWithInfo()", bOK)
-
-    Test.StartMethod("getLoginTimeout()")
-    Dim timeout As Integer
-    timeout = oObj.getLoginTimeout()
-    Out.log("getLoginTimeout(): " + timeout)
-    bOK = true
-    Test.MethodTested("getLoginTimeout()", bOK)
-
-    Test.StartMethod("setLoginTimeout()")
-    oObj.setLoginTimeout(111)
-    Out.log("setLoginTimeout(): 111")
-    timeout = oObj.getLoginTimeout()
-    bOK = timeout = 111
-    Test.MethodTested("setLoginTimeout()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/script.xlb
deleted file mode 100644
index 93b938880d5a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XIsolatedConnection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XIsolatedConnection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/sdbc_XIsolatedConnection.xba b/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/sdbc_XIsolatedConnection.xba
deleted file mode 100644
index f491c1d99085..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XIsolatedConnection/sdbc_XIsolatedConnection.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XIsolatedConnection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' Global handler As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XIsolatedConnection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getIsolatedConnectionWithCompletion()")
-    Dim connection As Object
-    connection = oObj.getIsolatedConnectionWithCompletion(handler)
-    bOK = Not IsNull(connection)
-    Test.MethodTested("getIsolatedConnectionWithCompletion()", bOK)
-
-    Test.StartMethod("getIsolatedConnection()")
-    connection = oObj.getIsolatedConnection(handler)
-    bOK = Not IsNull(connection)
-    Test.MethodTested("getIsolatedConnection()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XParameters/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XParameters/script.xlb
deleted file mode 100644
index c2367a3e7172..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XParameters/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XParameters" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XParameters"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XParameters/sdbc_XParameters.xba b/qadevOOo/tests/basic/ifc/sdbc/XParameters/sdbc_XParameters.xba
deleted file mode 100644
index 6140ade242c1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XParameters/sdbc_XParameters.xba
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XParameters" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global paramTypes As Variant
-'       Array of Strings which describes the types of the query parameters
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XParameters
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-
-    for i = 0 to ubound(paramTypes())
-        if (paramTypes(i) = "boolean") OR (paramTypes(i) = "byte") OR (paramTypes(i) = "short") OR _
-           (paramTypes(i) = "int") OR (paramTypes(i) = "long") OR (paramTypes(i) = "float") OR _
-           (paramTypes(i) = "double") OR (paramTypes(i) = "string") OR (paramTypes(i) = "bytes") OR _
-           (paramTypes(i) = "date") OR (paramTypes(i) = "time") OR (paramTypes(i) = "timestamp") OR _
-           (paramTypes(i) = "binarystream") OR (paramTypes(i) = "characterstream") then
-           
-            bOK = true
-            oObj.setNull(i + 1, paramTypes(i))
-            Test.MethodTested("setNull()", bOK)
-        elseif paramTypes(i) = "ref" then
-            Out.Log("Don't know how to test this :(")
-'            bOK = true
-'            oObj.setObjectNull(i)
-'            Test.MethodTested("setNull()", bOK)
-        end if
-
-           
-        if paramTypes(i) = "boolean" then
-            Test.StartMethod("setBoolean()")
-            bOK = true
-            oObj.setBoolean(i + 1, true)
-            Test.MethodTested("setBoolean()", bOK)
-        elseif paramTypes(i) = "byte" then
-            Test.StartMethod("setByte()")
-            bOK = true
-            oObj.setByte(i + 1, 5)
-            Test.MethodTested("setByte()", bOK)
-        elseif paramTypes(i) = "short" then
-            Test.StartMethod("setShort()")
-            bOK = true
-            oObj.setShort(i + 1, 6)
-            Test.MethodTested("setShort()", bOK)
-        elseif paramTypes(i) = "int" then
-            Test.StartMethod("setInt()")
-            bOK = true
-            oObj.setInt(i + 1, 234)
-            Test.MethodTested("setInt()", bOK)
-        elseif paramTypes(i) = "long" then
-            Test.StartMethod("setLong()")
-            bOK = true
-            oObj.setLong(i + 1, 34656)
-            Test.MethodTested("setLong()", bOK)
-        elseif paramTypes(i) = "float" then
-            Test.StartMethod("setFloat()")
-            bOK = true
-            oObj.setFloat(i + 1, 98.765)
-            Test.MethodTested("setFloat()", bOK)
-        elseif paramTypes(i) = "double" then
-            Test.StartMethod("setDouble()")
-            bOK = true
-            oObj.setDouble(i + 1, 54.432)
-            Test.MethodTested("setDouble()", bOK)
-        elseif paramTypes(i) = "string" then
-            Test.StartMethod("setString()")
-            bOK = true
-            oObj.setString(i + 1, "XParameters")
-            Test.MethodTested("setString()", bOK)
-        elseif paramTypes(i) = "bytes" then
-            Test.StartMethod("setBytes()")
-            bOK = true
-            oObj.setBytes(i + 1, Array(1,2,3))
-            Test.MethodTested("setBytes()", bOK)
-        elseif paramTypes(i) = "date" then
-            Dim dat As new com.sun.star.util.Date
-        
-            Test.StartMethod("setDate()")
-            bOK = true
-            oObj.setDate(i + 1, dat)
-            Test.MethodTested("setDate()", bOK)
-        elseif paramTypes(i) = "time" then
-            Dim tim As new com.sun.star.util.Time
-
-            Test.StartMethod("setTime()")
-            bOK = true
-            oObj.setTime(i + 1, tim)
-            Test.MethodTested("setTime()", bOK)
-        elseif paramTypes(i) = "timestamp" then
-            Dim timstmp As new com.sun.star.util.DateTime
-
-            Test.StartMethod("setTimestamp()")
-            bOK = true
-            oObj.setTimestamp(i + 1, timstmp)
-            Test.MethodTested("setTimestamp()", bOK)
-        elseif paramTypes(i) = "binarystream" then
-            Test.StartMethod("setBinaryStream()")
-            bOK = true
-            oObj.setBinaryStream(i + 1, ceateUnoService("com.sun.star.io.Pipe"))
-            Test.MethodTested("setBinaryStream()", bOK)
-        elseif paramTypes(i) = "characterstream" then
-            Test.StartMethod("setCharacterStream()")
-            bOK = true
-            oObj.setCharacterStream(i + 1, ceateUnoService("com.sun.star.io.Pipe"))
-            Test.MethodTested("setCharacterStream()", bOK)
-        elseif paramTypes(i) = "object" then
-            Test.StartMethod("setObject()")
-            bOK = true
-            oObj.setObject(i + 1, ceateUnoService("com.sun.star.io.Pipe"))
-            Test.MethodTested("setObject()", bOK)
-        elseif paramTypes(i) = "objectwithinfo" then
-            Out.Log("Don't know how to test this type :(")
-'            Test.StartMethod("setObjectWithInfo()")
-'            bOK = true
-'            oObj.setObjectWithInfo()
-'            bOK = bOK AND false
-'            Test.MethodTested("setObjectWithInfo()", bOK)
-        elseif paramTypes(i) = "ref" then
-            Out.Log("Don't know how to test this type :(")
-'            Test.StartMethod("setRef()")
-'            bOK = true
-'            oObj.setRef()
-'            bOK = bOK AND false
-'            Test.MethodTested("setRef()", bOK)
-        elseif paramTypes(i) = "blob" then
-            Out.Log("Don't know how to test this type :(")
-'            Test.StartMethod("setBlob()")
-'            bOK = true
-'            oObj.setBlob()
-'            bOK = bOK AND false
-'            Test.MethodTested("setBlob()", bOK)
-        elseif paramTypes(i) = "clob" then
-            Out.Log("Don't know how to test this type :(")
-'            Test.StartMethod("setClob()")
-'            bOK = true
-'            oObj.setClob()
-'            bOK = bOK AND false
-'            Test.MethodTested("setClob()", bOK)
-        elseif paramTypes(i) = "array" then
-            Out.Log("Don't know how to test this type :(")
-'            Test.StartMethod("setArray()")
-'            bOK = true
-'            oObj.setArray()
-'            bOK = bOK AND false
-'            Test.MethodTested("setArray()", bOK)
-        end if
-    next i
-
-    Test.StartMethod("clearParameters()")
-    bOK = true
-    oObj.clearParameters()
-    Test.MethodTested("clearParameters()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSet/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XResultSet/script.xlb
deleted file mode 100644
index 8f24ba399ef1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XResultSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XResultSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSet/sdbc_XResultSet.xba b/qadevOOo/tests/basic/ifc/sdbc/XResultSet/sdbc_XResultSet.xba
deleted file mode 100644
index 2d694bdc3669..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSet/sdbc_XResultSet.xba
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XResultSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cXResultSetFirstRecord as String
-'       Global cXResultSetLastRecord as String
-'       Global cXResultSetRecord1 as String
-'       Global cXResultSetRecord2 as String
-'       Global cXResultSet2BeforeLastRecord as String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XResultSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Out.Log("ReCreating Object, to be shure that it is in initial state.")
-
-    Test.StartMethod("beforeFirst()")
-    Test.StartMethod("isBeforeFirst()")
-    Test.StartMethod("isFirst()")
-    Test.StartMethod("first()")
-    Test.StartMethod("next()")
-
-    Test.StartMethod("afterLast()")
-    Test.StartMethod("isAfterLast()")
-    Test.StartMethod("isLast()")
-    Test.StartMethod("last()")
-    Test.StartMethod("previous()")
-
-    Test.StartMethod("getRow()")
-
-    Dim bBeforeFirst As Boolean
-    Dim bIsBeforeFirst As Boolean
-    Dim bIsBeforeFirstLoop As Boolean
-    Dim bIsFirst As Boolean
-    Dim bFirst As Boolean
-    Dim bNext As Boolean
-    Dim bAfterLast As Boolean
-    Dim bIsAfterLast As Boolean
-    Dim bIsAfterLastLoop As Boolean
-    Dim bIsLast As Boolean
-    Dim bLast As Boolean
-    Dim bPrevious As Boolean
-    Dim bGetRow As Boolean
-    Dim bLoopError as Boolean
-
-    bLoopError = false
-    bBeforeFirst = true
-    bIsBeforeFirst = true
-    bIsFirst = true
-    bFirst = true
-    bNext = true
-    bAfterLast = true
-    bIsAfterLast = true
-    bIsLast = true
-    bLast = true
-    bPrevious = true
-    bGetRow = true
-
-    oObj.beforeFirst()
-
-    Out.Log("Initially the cursor should be before first record.")
-    Out.Log("getRow(): expected : 0, actual: " + oObj.getRow())
-    if (oObj.getRow() = 0) then
-        Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-        bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-    end if
-
-    Out.Log("Go to not first record...")
-    oObj.next
-    oObj.next
-    Out.Log("isBeforeFirst(): expected: 'false', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND NOT oObj.isBeforeFirst()
-
-    Out.Log("Go to before first record...")
-    oObj.beforeFirst()
-    Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-    bBeforeFirst = bBeforeFirst AND oObj.isBeforeFirst()
-    bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-
-    Out.Log("Go to previous position")
-    oObj.previous()
-    Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-    bPrevious = bPrevious AND oObj.isBeforeFirst()
-
-    Out.Log("Go to first record...")
-    oObj.first()
-    Out.Log("isBeforeFirst(): expected: 'false', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND NOT oObj.isBeforeFirst()
-    Out.Log("isFirst(): expected: 'true', actual '" + oObj.isFirst() + "'")
-    bIsFirst = bIsFirst AND oObj.isFirst()
-    Out.Log("getRow(): expected : 1, actual: " + oObj.getRow())
-    bIsFirst = bIsFirst AND oObj.getRow() = 1
-    Out.Log("RowDsc should contain " + cXResultSetFirstRecord)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bFirst = bFirst AND inStr(1, oObj.getString(1), cXResultSetFirstRecord)
-
-    Out.Log("Go to previous position")
-    oObj.previous()
-    Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-    bPrevious = bPrevious AND oObj.isBeforeFirst()
-    Out.Log("isFirst(): expected: 'false', actual '" + oObj.isFirst() + "'")
-    bIsFirst = bIsFirst AND NOT oObj.isFirst()
-
-    Out.Log("Go to beforeFirst()")
-    oObj.beforeFirst()
-    Out.Log("Iterate through all records form first to last")
-    Dim n As Integer
-    n = 0
-    bLoopError = false
-    bIsAfterLastLoop = oObj.isAfterLast()
-    while (n &lt; 1000 AND NOT bIsAfterLastLoop)
-        oObj.next()
-        n = n + 1
-        bIsAfterLastLoop = oObj.isAfterLast()
-        if bLoopError then
-            bLoopError = false
-            n = 1000
-        end if
-    wend
-
-    Out.Log("IsAfterLast(): expected: 'true', actual '" + oObj.IsAfterLast() + "'")
-    bIsAfterLast = bIsAfterLast AND oObj.isAfterLast()
-    Out.Log("IsLast(): expected: 'false', actual '" + oObj.IsLast() + "'")
-    bIsLast = bIsLast AND NOT oObj.isLast()
-    Out.Log("Amount of records is " + n)
-    Out.Log("Trying to go to next record")
-    oObj.next()
-    Out.Log("IsAfterLast(): expected: 'true', actual '" + oObj.IsAfterLast() + "'")
-    bIsAfterLast = bIsAfterLast AND oObj.isAfterLast()
-
-    Out.Log("Go to previous position.")
-    oObj.previous()
-    Out.Log("IsLast(): expected: 'true', actual '" + oObj.IsLast() + "'")
-    bIsLast = bIsLast AND oObj.isLast()
-    Out.Log("RowDsc should contain " + cXResultSetLastRecord)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bIsLast = bIsLast AND inStr(1, oObj.getString(1), cXResultSetLastRecord)
-
-    Out.Log("Iterate through all records form last to first")
-    bLoopError = false
-    bIsBeforeFirstLoop = oObj.isBeforeFirst()
-    while (n &gt; 0 AND NOT bIsBeforeFirstLoop)
-        oObj.previous()
-        n = n - 1
-        bIsBeforeFirstLoop = oObj.isBeforeFirst()
-        if bLoopError then
-            bLoopError = false
-            n = 0
-        end if
-    wend
-
-    Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-
-    Out.Log("Trying to go to previous record")
-    oObj.previous()
-    Out.Log("isBeforeFirst(): expected: 'true', actual '" + oObj.isBeforeFirst() + "'")
-    bIsBeforeFirst = bIsBeforeFirst AND oObj.isBeforeFirst()
-
-
-    Test.MethodTested("beforeFirst()", bBeforeFirst)
-    Test.MethodTested("isBeforeFirst()", bIsBeforeFirst)
-    Test.MethodTested("isFirst()", bIsFirst)
-    Test.MethodTested("first()", bFirst)
-    Test.MethodTested("next()", bNext)
-
-    Test.MethodTested("afterLast()", bAfterLast)
-    Test.MethodTested("isAfterLast()", bIsAfterLast)
-    Test.MethodTested("isLast()", bIsLast)
-    Test.MethodTested("last()", bLast)
-    Test.MethodTested("previous()", bPrevious)
-
-    Test.MethodTested("getRow()", bGetRow)
-
-
-    Test.StartMethod("absolute()")
-    bOK = true
-    Out.Log("Go to second record")
-    oObj.absolute(2)
-    Out.Log("RowDsc should contain " + cXResultSetRecord2)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bOK = bOK AND inStr(1, oObj.getString(1), cXResultSetRecord2)
-    Out.Log("Go to record -1")
-    oObj.absolute(-1)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    Out.Log("IsLast(): expected: 'true', actual '" + oObj.IsLast() + "'")
-    bOK = bOK AND oObj.isLast()
-    Out.Log("Go to record -2")
-    oObj.absolute(-2)
-    Out.Log("IsLast(): expected: 'false', actual '" + oObj.IsLast() + "'")
-    bOK = bOK AND NOT oObj.isLast()
-    Out.Log("RowDsc should contain " + cXResultSet2BeforeLastRecord)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bOK = bOK AND inStr(1, oObj.getString(1), cXResultSet2BeforeLastRecord)
-    Test.MethodTested("absolute()", bOK)
-
-    Test.StartMethod("relative()")
-    bOK = true
-    Out.Log("Go to before first record")
-    oObj.beforeFirst()
-    on error goto RelativeErrHndl
-        oObj.relative(1)
-        Out.Log("Exception expected!")
-        bOK = false
-    goto ContRelative
-    RelativeErrHndl:
-        Out.Log("Expected exception.")
-
-    ContRelative:
-    On Error Goto NewErrHndl
-    Out.Log("Go to first record and relative(1)")
-    oObj.next()
-    oObj.relative(1)
-    Out.Log("RowDsc should contain " + cXResultSetRecord2)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bOK = bOK AND inStr(1, oObj.getString(1), cXResultSetRecord2)
-    Out.Log("Go to relative(-1)")
-    oObj.relative(-1)
-    Out.Log("RowDsc should contain " + cXResultSetRecord1)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    bOK = bOK AND inStr(1, oObj.getString(1), cXResultSetRecord1)
-    Out.Log("RowDsc is '" + oObj.getString(1) + "'")
-    Test.MethodTested("relative()", bOK)
-
-    Test.StartMethod("refreshRow()")
-    bOK = true
-    oObj.refreshRow()
-    Test.MethodTested("refreshRow()", bOK)
-
-    Test.StartMethod("rowUpdated()")
-    bOK = true
-    Out.Log("rowUpdated() is " + oObj.rowUpdated())
-    bOK = bOK AND NOT oObj.rowUpdated()
-    Test.MethodTested("rowUpdated()", bOK)
-
-    Test.StartMethod("rowInserted()")
-    bOK = true
-    Out.Log("rowInserted() is " + oObj.rowInserted())
-    bOK = bOK AND NOT oObj.rowInserted()
-    Test.MethodTested("rowInserted()", bOK)
-
-    Test.StartMethod("rowDeleted()")
-    bOK = true
-    Out.Log("rowDeleted() is " + oObj.rowDeleted())
-    bOK = bOK AND NOT oObj.rowDeleted()
-    Test.MethodTested("rowDeleted()", bOK)
-
-    Test.StartMethod("getStatement()")
-    bOK = true
-    oStatement = oObj.getStatement()
-    bOK = bOK AND NOT isNULL(oStatement)
-    Test.MethodTested("getStatement()", bOK)
-
-Exit Sub
-NewErrHndl:
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    bLoopError = true
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/script.xlb
deleted file mode 100644
index 6e3f9179b493..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XResultSetMetaDataSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XResultSetMetaDataSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/sdbc_XResultSetMetaDataSupplier.xba b/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/sdbc_XResultSetMetaDataSupplier.xba
deleted file mode 100644
index 53301bf52e90..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSetMetaDataSupplier/sdbc_XResultSetMetaDataSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XResultSetMetaDataSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XResultSetMetaDataSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oMetaData As Object
-
-
-    Test.StartMethod("getMetaData()")
-    bOK = true
-    oMetaData = oObj.getMetaData()
-    bOK = bOK AND hasUnoInterfaces(oMetaData, "com.sun.star.sdbc.XResultSetMetaData")
-    Test.MethodTested("getMetaData()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/script.xlb
deleted file mode 100644
index 139cb18cc2f4..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XResultSetUpdate" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XResultSetUpdate"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/sdbc_XResultSetUpdate.xba b/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/sdbc_XResultSetUpdate.xba
deleted file mode 100644
index 95b3788ed51a..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XResultSetUpdate/sdbc_XResultSetUpdate.xba
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XResultSetUpdate" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global textColumn As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XResultSetUpdate
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iCount As Integer
-    Dim cString As String
-    Dim colIdx As Integer
-    
-    colIdx = oObj.findColumn(textColumn)
-
-    Test.StartMethod("insertRow()")
-    bOK = true
-    iCount = countRows()
-    Out.Log("Initially " + countRows() + " records")
-    oObj.moveToInsertRow()
-    oObj.updateString(colIdx, "New string")
-    oObj.insertRow()
-    Out.Log("After inserting " + countRows() + " records")
-    oObj.last()
-    bOK = bOK AND oObj.getString(colIdx) = "New string"
-    bOK = bOK AND iCount = countRows() - 1
-    Test.MethodTested("insertRow()", bOK)
-
-    Test.StartMethod("cancelRowUpdates()")
-    bOK = true
-    oObj.last()
-    oObj.updateString(colIdx, "Changed string")
-    oObj.cancelRowUpdates()
-    bOK = bOK AND oObj.getString(colIdx) = "New string"
-    bOK = bOK AND iCount = countRows() - 1
-    Test.MethodTested("cancelRowUpdates()", bOK)
-
-    Test.StartMethod("updateRow()")
-    bOK = true
-    oObj.last()
-    oObj.updateString(colIdx, "Changed string")
-    oObj.updateRow()
-    bOK = bOK AND oObj.getString(colIdx) = "Changed string"
-    bOK = bOK AND iCount = countRows() - 1
-    Test.MethodTested("updateRow()", bOK)
-
-    Test.StartMethod("deleteRow()")
-    Dim rowsBefore As Integer, rowsAfter As Integer
-    bOK = true
-    rowsBefore = countRows()
-    oObj.Last()
-    oObj.deleteRow()
-    rowsAfter = countRows()
-    Out.Log("Rows before: " + rowsBefore + ", rows after: " + rowsAfter)
-    bOK = bOK AND iCount = rowsAfter
-    oObj.Last()
-    Out.Log(oObj.getString(colIdx))
-    Test.MethodTested("deleteRow()", bOK)
-
-    Test.StartMethod("moveToInsertRow()")
-    bOK = true
-    oObj.moveToInsertRow()
-    bOK = bOK AND oObj.getString(colIdx) = ""
-    Test.MethodTested("moveToInsertRow()", bOK)
-
-    Test.StartMethod("moveToCurrentRow()")
-    bOK = true
-    oObj.first()
-    oObj.next()
-    cString = oObj.getString(colIdx)
-    oObj.moveToInsertRow()
-    oObj.moveToCurrentRow()
-    bOK = bOK AND oObj.getString(colIdx) = cString
-    Test.MethodTested("moveToCurrentRow()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function countRows() As Integer
-    Dim iCount As Integer
-    iCount = 0
-    oObj.first()
-    while NOT oObj.isAfterLast()
-        iCount = iCount + 1
-        oObj.next()
-    wend
-    countRows() = iCount
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRow/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XRow/script.xlb
deleted file mode 100644
index 0cda44d376bf..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XRow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XRow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRow/sdbc_XRow.xba b/qadevOOo/tests/basic/ifc/sdbc/XRow/sdbc_XRow.xba
deleted file mode 100644
index bfac0743d4b8..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRow/sdbc_XRow.xba
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XRow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global rowTypes As Variant
-'       Array of Strings with description of column types
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XRow
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-    Dim colType As String
-
-    Test.StartMethod("getBoolean()")
-    bOK = true
-    colType = "boolean"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getBoolean(i)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getBoolean()", bOK)
-
-    Test.StartMethod("getByte()")
-    bOK = true
-    colType = "byte"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getByte(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getByte()", bOK)
-
-    Test.StartMethod("getShort()")
-    bOK = true
-    colType = "short"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getShort(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getShort()", bOK)
-
-    Test.StartMethod("getInt()")
-    bOK = true
-    colType = "int"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getInt(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getInt()", bOK)
-
-    Test.StartMethod("getLong()")
-    bOK = true
-    colType = "long"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getLong(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getLong()", bOK)
-
-    Test.StartMethod("getFloat()")
-    bOK = true
-    colType = "float"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getFloat(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getFloat()", bOK)
-
-    Test.StartMethod("getDouble()")
-    bOK = true
-    colType = "double"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getDouble(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getDouble()", bOK)
-
-    Test.StartMethod("getString()")
-    bOK = true
-    colType = "string"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getString(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getString()", bOK)
-
-    Test.StartMethod("getBytes()")
-    bOK = true
-    colType = "bytes"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getBytes(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getBytes()", bOK)
-
-    Test.StartMethod("getDate()")
-    bOK = true
-    colType = "date"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getDate(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getDate()", bOK)
-
-    Test.StartMethod("getTime()")
-    bOK = true
-    colType = "time"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getTime(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getTime()", bOK)
-
-    Test.StartMethod("getTimestamp()")
-    bOK = true
-    colType = "timestamp"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getTimestamp(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getTimestamp()", bOK)
-
-    Test.StartMethod("getBinaryStream()")
-    bOK = true
-    colType = "binarystream"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getBinaryStream(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getBinaryStream()", bOK)
-
-    Test.StartMethod("getCharacterStream()")
-    bOK = true
-    colType = "characterstream"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getCharacterStream(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getCharacterStream()", bOK)
-
-    Test.StartMethod("getObject()")
-    bOK = true
-    colType = "object"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getObject(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getObject()", bOK)
-
-    Test.StartMethod("getRef()")
-    bOK = true
-    colType = "ref"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getRef(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getRef()", bOK)
-
-    Test.StartMethod("getBlob()")
-    bOK = true
-    colType = "blob"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getBlob(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getBlob()", bOK)
-
-    Test.StartMethod("getClob()")
-    bOK = true
-    colType = "clob"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getClob(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getClob()", bOK)
-
-    Test.StartMethod("getArray()")
-    bOK = true
-    colType = "array"
-    i = findColumn(colType)
-    if i >= 0 then 
-        oObj.getArray(i + 1)
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-    end if
-    Test.MethodTested("getArray()", bOK)
-
-
-    Test.StartMethod("wasNull()")
-    bOK = true
-    oObj.wasNull()
-    Test.MethodTested("wasNull()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function findColumn(cType As String) As Integer
-    Dim i As Integer
-    
-    for i = lbound(rowTypes()) to ubound(rowTypes())
-        if rowTypes(i) = cType then
-            findColumn() = rowTypesCol(i)
-            exit function
-        end if    
-    next i
-    
-    findColumn() = -1 
-End function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRowSet/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XRowSet/script.xlb
deleted file mode 100644
index 099e40a905dc..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRowSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XRowSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XRowSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRowSet/sdbc_XRowSet.xba b/qadevOOo/tests/basic/ifc/sdbc/XRowSet/sdbc_XRowSet.xba
deleted file mode 100644
index 5c7f4725cf3e..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRowSet/sdbc_XRowSet.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XRowSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XRowSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim list1 As Object, list2 As Object
-
-    bOK = true
-    Test.StartMethod("addRowSetListener()")
-
-    list1 = createUnoListener("L1_", "com.sun.star.sdbc.XRowSetListener")
-    list2 = createUnoListener("L2_", "com.sun.star.sdbc.XRowSetListener")
-    oObj.addRowSetListener(list1)
-    oObj.addRowSetListener(list2)
-
-    Test.StartMethod("removeRowSetListener()")
-    oObj.removeRowSetListener(list1)
-
-    Test.StartMethod("execute()")
-
-    l1Called = false
-    l2Called = false
-
-    oObj.execute()
-    bOK = bOK AND l2Called
-    Test.MethodTested("execute()", bOK)
-    Test.MethodTested("addRowSetListener()", bOK)
-
-    bOK = bOK AND NOT l1Called
-    Test.MethodTested("removeRowSetListener()", bOK)
-
-    oObj.removeRowSetListener(list2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim l1Called As Boolean, l2Called As Boolean
-
-Sub L1_cursorMoved()
-End Sub
-Sub L1_rowChanged()
-End Sub
-Sub L1_disposing()
-End Sub
-Sub L1_rowSetChanged()
-    l1Called = true
-    Out.Log("Listener 1 called")
-End Sub
-
-Sub L2_cursorMoved()
-End Sub
-Sub L2_rowChanged()
-End Sub
-Sub L2_disposing()
-End Sub
-Sub L2_rowSetChanged()
-    l2Called = true
-    Out.Log("Listener 2 called")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/script.xlb
deleted file mode 100644
index 7d8d5fb30e23..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XRowUpdate" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XRowUpdate"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/sdbc_XRowUpdate.xba b/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/sdbc_XRowUpdate.xba
deleted file mode 100644
index 03dab0a3ccbf..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XRowUpdate/sdbc_XRowUpdate.xba
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XRowUpdate" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global rowTypes As Variant
-'       must be an array of Strings with description of column types
-'     - Global rowTypesCol As Variant
-'       corresponding column numbers
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XRowUpdate
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean, bNullOK As Boolean
-    Dim i As Integer
-    Dim getV As Variant, newV As Variant, resV As Variant
-    Dim colType As String
-
-    if NOT hasUnoInterfaces(oObj, "com.sun.star.sdbc.XRow") then
-        Out.Log("The interface com.sun.star.sdbc.XRow isn't supported by the component.")
-        Out.Log("The test must be upgraded !!!")
-        exit Sub
-    end if
-    
-    Test.RecreateObj()
-
-    bNullOK = true
-
-    Test.StartMethod("updateBoolean()")
-    colType = "boolean"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getBoolean(i+1)
-        newV = NOT getV
-        oObj.updateBoolean(i+1, newV)
-        resV = oObj.getBoolean(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateBoolean()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getBoolean(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateBoolean()", true)
-    end if 
-            
-    Test.StartMethod("updateByte()")
-    colType = "byte"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getByte(i+1)
-        newV = getV + 1
-        oObj.updateByte(i+1, newV)
-        resV = oObj.getByte(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateByte()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getByte(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateByte()", true)
-    end if 
-
-    Test.StartMethod("updateShort()")
-    colType = "short"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getShort(i+1)
-        newV = getV + 1
-        oObj.updateShort(i+1, newV)
-        resV = oObj.getShort(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateShort()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getShort(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateShort()", true)
-    end if 
-
-    Test.StartMethod("updateInt()")
-    colType = "int"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getInt(i+1)
-        newV = getV + 1
-        oObj.updateInt(i+1, newV)
-        resV = oObj.getInt(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateInt()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getInt(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateInt()", true)
-    end if 
-        
-    Test.StartMethod("updateLong()")
-    colType = "long"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getLong(i+1)
-        newV = getV + 1
-        oObj.updateLong(i+1, newV)
-        resV = oObj.getLong(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateLong()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getLong(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateLong()", true)
-    end if 
-
-    Test.StartMethod("updateFloat()")
-    colType = "float"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getFloat(i+1)
-        newV = getV + 1.3
-        oObj.updateFloat(i+1, newV)
-        resV = oObj.getFloat(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateFloat()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getFloat(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateFloat()", true)
-    end if 
-
-    Test.StartMethod("updateDouble()")
-    colType = "double"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getDouble(i+1)
-        newV = getV + 1.5
-        oObj.updateDouble(i+1, newV)
-        resV = oObj.getDouble(i+1)
-        Out.Log("Was: " + getv + ", New: " + newV + ", Res: " + resV)
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateDouble()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getDouble(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateDouble()", true)
-    end if 
-
-    Test.StartMethod("updateString()")
-    colType = "string"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getString(i+1)
-        newV = "_" + getV
-        oObj.updateString(i+1, newV)
-        resV = oObj.getString(i+1)
-        Out.Log("Was: '" + getv + "', New: '" + newV + "', Res: '" + resV + "'")
-        bOK = bOK AND (resV = newV)
-        Test.MethodTested("updateString()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getString(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateString()", true)
-    end if 
-
-    Test.StartMethod("updateBytes()")
-    colType = "bytes"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getBytes(i+1)
-        
-        if (oObj.wasNull() OR ubound(getV()) &lt; 0) then
-            newV = Array(1,2,3)
-        else
-            newV = getV
-            newV(0) = newV(0) + 1
-        end if
-        
-        oObj.updateBytes(i+1, newV)
-        resV = oObj.getBytes(i+1)
-
-        Out.Log("Was: " + getv(0) + ", New: " + newV(0) + ", Res: " + resV(0))
-        bOK = bOK AND (resV(0) = newV(0))
-        Test.MethodTested("updateBytes()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getBytes(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateBytes()", true)
-    end if 
-
-
-    Dim dat As com.sun.star.util.Date
-    Test.StartMethod("updateDate()")
-    colType = "date"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getDate(i+1)
-        if (oObj.wasNull() OR isNull(getV)) then
-            newV = dat
-        else
-            newV = getV
-            newV.Year = newV.Year + 1
-        end if
-        
-        oObj.updateDate(i+1, newV)
-        resV = oObj.getDate(i+1)
-        Out.Log("Was: '" + getv.Year + "', New: '" + newV.Year + "', Res: '" + resV.Year + "'")
-        bOK = bOK AND (resV.Year = newV.Year)
-        Test.MethodTested("updateDate()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getDate(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateDate()", true)
-    end if 
-
-    Dim tim As com.sun.star.util.Time
-    Test.StartMethod("updateTime()")
-    colType = "time"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getTime(i+1)
-        if (oObj.wasNull() OR isNull(getV)) then
-            newV = tim
-        else
-            newV = getV
-            newV.Seconds = newV.Seconds + 1
-        end if
-        
-        oObj.updateTime(i+1, newV)
-        resV = oObj.getTime(i+1)
-        Out.Log("Was: '" + getv.Seconds + "', New: '" + newV.Seconds + "', Res: '" + resV.Seconds + "'")
-        bOK = bOK AND (resV.Seconds = newV.Seconds)
-        Test.MethodTested("updateTime()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getTime(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateTime()", true)
-    end if 
-
-    Dim dattm As com.sun.star.util.DateTime
-    Test.StartMethod("updateTimestamp()")
-    colType = "timestamp"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getTimestamp(i+1)
-        if (oObj.wasNull() OR isNull(getV)) then
-            newV = dattm
-        else
-            newV = getV
-            newV.Year = newV.Year + 1
-        end if
-        
-        oObj.updateTimestamp(i+1, newV)
-        resV = oObj.getTimestamp(i+1)
-        Out.Log("Was: '" + getv.Year + "', New: '" + newV.Year + "', Res: '" + resV.Year + "'")
-        bOK = bOK AND (resV.Year = newV.Year)
-        Test.MethodTested("updateTimestamp()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getTimestamp(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateTimestamp()", true)
-    end if 
-
-    Dim bytes As Variant, nBytes As Long
-    Test.StartMethod("updateCharacterStream()")
-    colType = "characterstream"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        newV = createUnoService("com.sun.star.io.Pipe")
-        newV.writeBytes(Array(123, 234))
-        oObj.updateCharacterStream(i+1, newV)
-        resV = oObj.getCharacterStream(i+1)
-        'Out.Log("Was: '" + getv + "', New: '" + newV + "', Res: '" + resV + "'")
-        bOK = bOK AND NOT oObj.wasNull() AND NOT isNull(resV)
-        
-        if bOK then
-            Out.Log("Testing further ...")
-            nBytes = resV.readBytes(bytes, 2)
-            bOK = bOK AND (nBytes = 2) AND (bytes(0) = 123) AND (bytes(1) = 234)
-        end if
-
-        Test.MethodTested("updateCharacterStream()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getCharacterStream(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateCharacterStream()", true)
-    end if 
-
-    Test.StartMethod("updateBinaryStream()")
-    colType = "binarystream"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        newV = createUnoService("com.sun.star.io.Pipe")
-        newV.writeBytes(Array(123, 234))
-        oObj.updateBinaryStream(i+1, newV)
-        resV = oObj.getBinaryStream(i+1)
-        'Out.Log("Was: '" + getv + "', New: '" + newV + "', Res: '" + resV + "'")
-        bOK = bOK AND NOT oObj.wasNull() AND NOT isNull(resV)
-        
-        if bOK then
-            Out.Log("Testing further ...")
-            nBytes = resV.readBytes(bytes, 2)
-            bOK = bOK AND (nBytes = 2) AND (bytes(0) = 123) AND (bytes(1) = 234)
-        end if
-
-        Test.MethodTested("updateBinaryStream()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getBinaryStream(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateBinaryStream()", true)
-    end if 
-
-    Test.StartMethod("updateObject()")
-    colType = "object"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getObject(i+1)
-        if (NOT hasUnoInterfaces(getV, "com.sun.star.io.XInputStream")) then
-            newV = createUnoService("com.sun.star.io.DataInputStream")
-        else
-            newV = createUnoService("com.sun.star.io.DataOutputStream")
-        end if
-        
-        oObj.updateObject(i+1, newV)
-        resV = oObj.getObject(i+1)
-        
-        bOK = bOK AND (hasUnoInterfaces(newV, "com.sun.star.io.XInputStream") = _
-                       hasUnoInterfaces(resV, "com.sun.star.io.XInputStream")) AND _
-                      (hasUnoInterfaces(newV, "com.sun.star.io.XOutputStream") = _
-                       hasUnoInterfaces(resV, "com.sun.star.io.XOutputStream"))
-                       
-        Test.MethodTested("updateObject()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getObject(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateObject()", true)
-    end if 
-
-    Test.StartMethod("updateNumericObject()")
-    colType = "numericobject"
-    i = findColumn(colType)
-    if i >= 0 then 
-        bOK = true
-        getV = oObj.getNumericObject(i+1)
-        if (NOT hasUnoInterfaces(getV, "com.sun.star.io.XInputStream")) then
-            newV = createUnoService("com.sun.star.io.DataInputStream")
-        else
-            newV = createUnoService("com.sun.star.io.DataOutputStream")
-        end if
-        
-        oObj.updateNumericObject(i+1, newV, 0)
-        resV = oObj.getNumericObject(i+1)
-        
-        bOK = bOK AND (hasUnoInterfaces(newV, "com.sun.star.io.XInputStream") = _
-                       hasUnoInterfaces(resV, "com.sun.star.io.XInputStream")) AND _
-                      (hasUnoInterfaces(newV, "com.sun.star.io.XOutputStream") = _
-                       hasUnoInterfaces(resV, "com.sun.star.io.XOutputStream"))
-                       
-        Test.MethodTested("updateNumericObject()", bOK)
-
-        oObj.updateNull(i+1)
-        oObj.getNumericObject(i+1)
-        bNullOK = bNullOK AND oObj.wasNull()
-    else
-        Out.Log("!!! Column of type '" + colType + "' is not found. No test performed.")
-        Out.Log("Nevertheless status is OK")
-        Test.MethodTested("updateNumericObject()", true)
-    end if 
-            
-    Test.StartMethod("updateNull()")
-    Test.MethodTested("updateNull()", bNullOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function findColumn(cType As String) As Integer
-    Dim i As Integer
-    
-    for i = lbound(rowTypes()) to ubound(rowTypes())
-        if rowTypes(i) = cType then
-            findColumn() = rowTypesCol(i) - 1
-            exit function
-        end if    
-    next i
-    
-    findColumn() = -1 
-End function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/script.xlb
deleted file mode 100644
index 20435089b7f1..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbc_XWarningsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbc_XWarningsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/sdbc_XWarningsSupplier.xba b/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/sdbc_XWarningsSupplier.xba
deleted file mode 100644
index 39ac1729e41d..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbc/XWarningsSupplier/sdbc_XWarningsSupplier.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbc_XWarningsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbc.XWarningsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("clearWarnings()")
-    bOK = true
-    oObj.clearWarnings()
-    Test.MethodTested("clearWarnings()", bOK)
-
-
-    Test.StartMethod("getWarnings()")
-    bOK = true
-    bOK = bOK AND isEmpty(oObj.getWarnings())
-    Test.MethodTested("getWarnings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/script.xlb b/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/script.xlb
deleted file mode 100644
index a9e55834fd82..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbcx_ResultSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbcx_ResultSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/sdbcx_ResultSet.xba b/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/sdbcx_ResultSet.xba
deleted file mode 100644
index c2374f8b30fe..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/ResultSet/sdbcx_ResultSet.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbcx_ResultSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sdbcx.ResultSet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("IsBookmarkable")
-
-    PropertyTester.TestProperty("CanUpdateInsertedRows")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/script.xlb
deleted file mode 100644
index 0d8eeef2548c..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbcx_XColumnsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbcx_XColumnsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/sdbcx_XColumnsSupplier.xba b/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/sdbcx_XColumnsSupplier.xba
deleted file mode 100644
index 1dae513a0754..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XColumnsSupplier/sdbcx_XColumnsSupplier.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbcx_XColumnsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbcx.XColumnsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getColumns()")
-    bOK = true
-    oCols = oObj.getColumns()
-    bOK = bOK AND hasUnoInterfaces(oCols, "com.sun.star.container.XNameAccess")
-    if (bOK) then
-        cNames = oCols.getElementNames()
-        Out.Log("Following columns were found:")
-        for i = 0 to ubound(cNames)
-            Out.Log("'" &amp; cNames(i) &amp; "'")
-        next i
-    end if
-    Test.MethodTested("getColumns()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/script.xlb
deleted file mode 100644
index 39e76d8ad1fd..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbcx_XDataDefinitionSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbcx_XDataDefinitionSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/sdbcx_XDataDefinitionSupplier.xba b/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/sdbcx_XDataDefinitionSupplier.xba
deleted file mode 100644
index 37aae87150f8..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XDataDefinitionSupplier/sdbcx_XDataDefinitionSupplier.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbcx_XDataDefinitionSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' Global URL as String
-' Global info As Variant
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbcx.XDataDefinitionSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim tableSupl As Object
-    Dim oConnection As Object
-    oConnection = oObj.connect(URL, info())
-
-    Test.StartMethod("getDataDefinitionByConnection()")
-    tableSupl = oObj.getDataDefinitionByConnection(oConnection)
-    Test.MethodTested("getDataDefinitionByConnection()", Not isNull(tableSupl))
-
-    Test.StartMethod("getDataDefinitionByURL()")
-    tableSupl = oObj.getDataDefinitionByURL(URL, info())
-    Test.MethodTested("getDataDefinitionByURL()", Not isNull(tableSupl))
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/script.xlb b/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/script.xlb
deleted file mode 100644
index aa38554c685f..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbcx_XDeleteRows" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbcx_XDeleteRows"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/sdbcx_XDeleteRows.xba b/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/sdbcx_XDeleteRows.xba
deleted file mode 100644
index deafb4e55ad2..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XDeleteRows/sdbcx_XDeleteRows.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbcx_XDeleteRows" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbcx.XDeleteRows
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bkmrk As Variant
-    Dim rowsBefore As Variant, rowsAfter As Variant
-
-
-    if NOT (hasUnoInterfaces(oObj, "com.sun.star.sdbcx.XRowLocate") AND _
-            hasUnoInterfaces(oObj, "com.sun.star.sdbc.XResultSet")) then
-            
-        Out.Log("The component doesn't support one of the required interfaces.")
-        Out.Log("The test must be modified according to component testcase.")
-        Exit Sub
-    end if
-        
-    Test.StartMethod("deleteRows()")
-    bOK = true
-    
-    oObj.last()
-    rowsBefore = oObj.getRow()
-    oObj.first()
-    bkmrk = oObj.getBookmark()
-    
-    oObj.deleteRows(Array(bkmrk))
-
-    oObj.last()
-    rowsAfter = oObj.getRow()
-
-    Out.Log("Rows before: " + rowsBefore + ", after: " + rowsAfter)
-    bOK = bOK AND (rowsBefore - 1 = rowsAfter)
-    Test.MethodTested("deleteRows()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/script.xlb b/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/script.xlb
deleted file mode 100644
index 519516b9ec25..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sdbcx_XRowLocate" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sdbcx_XRowLocate"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/sdbcx_XRowLocate.xba b/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/sdbcx_XRowLocate.xba
deleted file mode 100644
index 2c25b4400324..000000000000
--- a/qadevOOo/tests/basic/ifc/sdbcx/XRowLocate/sdbcx_XRowLocate.xba
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sdbcx_XRowLocate" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sdbcx.XRowLocate
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oBM1 As Variant
-    Dim oBM2 As Variant
-    Dim oBM3 As Variant
-    Dim oBM4 As Variant
-    Dim cDscr1 As String
-    Dim cDscr2 As String
-
-    ReCreateObj()
-
-    oObj.first()
-
-    Test.StartMethod("getBookmark()")
-    bOK = true
-    oBM1 = oObj.getBookmark()
-    cDscr1 = oObj.getString(1)
-    Out.Log("Set bookmark to row " + cDscr1)
-    bOK = bOK AND NOT isNULL(oBM1)
-    Test.MethodTested("getBookmark()", bOK)
-
-    Test.StartMethod("moveToBookmark()")
-    bOK = true
-    oObj.next()
-    cDscr2 = oObj.getString(1)
-    Out.Log("Now on " + cDscr2)
-    oObj.moveToBookmark(oBM1)
-    Out.Log("After movment on " + oObj.getString(1))
-    bOK = bOK AND oObj.getString(1) = cDscr1
-    Test.MethodTested("moveToBookmark()", bOK)
-
-    Test.StartMethod("moveRelativeToBookmark()")
-    bOK = true
-    oObj.moveRelativeToBookmark(oBM1, 1)
-    Out.Log("After movment on " + oObj.getString(1))
-    bOK = bOK AND oObj.getString(1) = cDscr2
-    Test.MethodTested("moveRelativeToBookmark()", bOK)
-
-    oBM2 = oObj.getBookmark()
-
-    Test.StartMethod("compareBookmarks()")
-    bOK = true
-    ' if database driver supports ordered marks then
-    ' compareBookmarks should return values CompareBookmark::LESS or
-    ' CompareBookmark::GREATER in case when bookmarks are not equal
-    ' otherwise this method returnes only CompareBookmark::NOT_EQUAL
-
-    if (oObj.hasOrderedBookmarks()) then
-        bOK = bOK AND oObj.compareBookmarks(oBM1, oBM1) = com.sun.star.sdbcx.CompareBookmark.EQUAL
-        bOK = bOK AND oObj.compareBookmarks(oBM1, oBM2) = com.sun.star.sdbcx.CompareBookmark.LESS
-        bOK = bOK AND oObj.compareBookmarks(oBM2, oBM1) = com.sun.star.sdbcx.CompareBookmark.GREATER
-    else
-        bOK = bOK AND oObj.compareBookmarks(oBM1, oBM1) = com.sun.star.sdbcx.CompareBookmark.EQUAL
-        bOK = bOK AND oObj.compareBookmarks(oBM1, oBM2) = com.sun.star.sdbcx.CompareBookmark.NOT_EQUAL
-        bOK = bOK AND oObj.compareBookmarks(oBM2, oBM1) = com.sun.star.sdbcx.CompareBookmark.NOT_EQUAL
-    end if
-    Test.MethodTested("compareBookmarks()", bOK)
-
-    Test.StartMethod("hasOrderedBookmarks()")
-    bOK = true
-    bOK = bOK AND oObj.hasOrderedBookmarks()
-    Test.MethodTested("hasOrderedBookmarks()", bOK)
-
-    Test.StartMethod("hashBookmark()")
-    bOK = true
-
-    oObj.last()
-    oBM3 = oObj.getBookmark()
-    oObj.first()
-    oBM4 = oObj.getBookmark()
-
-    bOK = bOK AND oObj.hashBookmark(oBM1) &lt;&gt; oObj.hashBookmark(oBM2)
-    bOK = bOK AND oObj.hashBookmark(oBM1) &lt;&gt; oObj.hashBookmark(oBM3)
-    bOK = bOK AND oObj.hashBookmark(oBM3) &lt;&gt; oObj.hashBookmark(oBM2)
-    bOK = bOK AND oObj.hashBookmark(oBM1) = oObj.hashBookmark(oBM4)
-    Test.MethodTested("hashBookmark()", bOK)
-    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/script.xlb b/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/script.xlb
deleted file mode 100644
index c731910c87be..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_CellAreaLink" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_CellAreaLink"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/sheet_CellAreaLink.xba b/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/sheet_CellAreaLink.xba
deleted file mode 100644
index 71b64f1f89f1..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/CellAreaLink/sheet_CellAreaLink.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_CellAreaLink" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.CellAreaLink
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim aURLs(1) As String
-    aURLs(0) = utils.Path2URL(cTestDocsDir)
-    aURLs(1) = utils.Path2URL(cTestDocsDir &amp; "/temp.txt")
-    PropertyTester.TestProperty("Url", aURLs())
-
-    PropertyTester.TestProperty("Filter")
-
-    PropertyTester.TestProperty("FilterOptions")
-
-    PropertyTester.TestProperty("RefreshDelay")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/DataPilotField/script.xlb b/qadevOOo/tests/basic/ifc/sheet/DataPilotField/script.xlb
deleted file mode 100644
index ff63efd2cb23..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/DataPilotField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_DataPilotField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_DataPilotField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/DataPilotField/sheet_DataPilotField.xba b/qadevOOo/tests/basic/ifc/sheet/DataPilotField/sheet_DataPilotField.xba
deleted file mode 100644
index 5ce59de61b8e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/DataPilotField/sheet_DataPilotField.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_DataPilotField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.DataPilotField
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("Orientation")
-
-    oObj.setPropertyValue("Orientation", com.sun.star.sheet.DataPilotFieldOrientation.COLUMN)
-    PropertyTester.TestProperty("Function")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/script.xlb
deleted file mode 100644
index 74e74df5975c..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_DatabaseRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_DatabaseRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/sheet_DatabaseRange.xba b/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/sheet_DatabaseRange.xba
deleted file mode 100644
index 956ce9af08b6..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/DatabaseRange/sheet_DatabaseRange.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_DatabaseRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.DatabaseRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("MoveCells")
-
-    PropertyTester.TestProperty("KeepFormats")
-
-    PropertyTester.TestProperty("StripData")
-
-    PropertyTester.TestProperty("AutoFilter")
-
-    PropertyTester.TestProperty("UseFilterCriteriaSource")
-
-    PropertyTester.TestProperty("FilterCriteriaSource")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/script.xlb b/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/script.xlb
deleted file mode 100644
index 2b471754b704..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_GlobalSheetSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_GlobalSheetSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/sheet_GlobalSheetSettings.xba b/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/sheet_GlobalSheetSettings.xba
deleted file mode 100644
index db041b57b210..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/GlobalSheetSettings/sheet_GlobalSheetSettings.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_GlobalSheetSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.GlobalSheetSettings
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("MoveSelection")
-
-    PropertyTester.TestProperty("MoveDirection")
-
-    PropertyTester.TestProperty("EnterEdit")
-
-    PropertyTester.TestProperty("ExtendFormat")
-
-    PropertyTester.TestProperty("RangeFinder")
-
-    PropertyTester.TestProperty("ExpandReferences")
-
-    PropertyTester.TestProperty("MarkHeader")
-
-    PropertyTester.TestProperty("UseTabCol")
-
-    PropertyTester.TestProperty("Metric")
-
-    PropertyTester.TestProperty("Scale")
-
-    PropertyTester.TestProperty("DoAutoComplete")
-
-    PropertyTester.TestProperty("StatusBarFunction")
-
-    PropertyTester.TestProperty("UserLists")
-
-   PropertyTester.TestProperty("LinkUpdateMode")
-
-    PropertyTester.TestProperty("PrintAllSheets")
-
-    PropertyTester.TestProperty("PrintEmptyPages")
-
-    PropertyTester.TestProperty("UsePrinterMetrics")
-
-    PropertyTester.TestProperty("ReplaceCellsWarning")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCell/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SheetCell/script.xlb
deleted file mode 100644
index e5ddf6444cc6..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SheetCell" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sheet_SheetCell"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCell/sheet_SheetCell.xba b/qadevOOo/tests/basic/ifc/sheet/SheetCell/sheet_SheetCell.xba
deleted file mode 100644
index 605351a25d57..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCell/sheet_SheetCell.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SheetCell" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.SheetCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("Position")
-
-    PropertyTester.TestProperty("Size")
-
-    PropertyTester.TestProperty("FormulaLocal")
-
-    PropertyTester.TestProperty("FormulaResultType")
-
-    PropertyTester.TestProperty("ConditionalFormat")
-
-    PropertyTester.TestProperty("ConditionalFormatLocal")
-
-    PropertyTester.TestProperty("Validation")
-
-    PropertyTester.TestProperty("ValidationLocal")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/script.xlb
deleted file mode 100644
index cccdd3d6113c..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SheetCellRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SheetCellRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/sheet_SheetCellRange.xba b/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/sheet_SheetCellRange.xba
deleted file mode 100644
index bd5acf56ce60..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCellRange/sheet_SheetCellRange.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SheetCellRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SheetCellRange
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("Position")
-    PropertyTester.TestProperty("Size")
-
-    PropertyTester.TestProperty("Validation")
-
-    PropertyTester.TestProperty("ValidationLocal")
-
-    PropertyTester.TestProperty("ConditionalFormat")
-
-    PropertyTester.TestProperty("ConditionalFormatLocal")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/script.xlb
deleted file mode 100644
index 2c9622791cf5..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SheetCellRanges" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sheet_SheetCellRanges"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/sheet_SheetCellRanges.xba b/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/sheet_SheetCellRanges.xba
deleted file mode 100644
index dc51f0fae055..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetCellRanges/sheet_SheetCellRanges.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SheetCellRanges" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.SheetCellRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("ConditionalFormat")
-
-    PropertyTester.TestProperty("ConditionalFormatLocal")
-
-    PropertyTester.TestProperty("Validation")
-
-    PropertyTester.TestProperty("ValidationLocal")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/script.xlb
deleted file mode 100644
index e82850021381..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SheetFilterDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SheetFilterDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/sheet_SheetFilterDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/sheet_SheetFilterDescriptor.xba
deleted file mode 100644
index 3d865a931836..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetFilterDescriptor/sheet_SheetFilterDescriptor.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SheetFilterDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SheetFilterDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("IsCaseSensitive")
-
-    PropertyTester.TestProperty("SkipDuplicates")
-
-    PropertyTester.TestProperty("UseRegularExpressions")
-
-    PropertyTester.TestProperty("SaveOutputPosition")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("ContainsHeader")
-
-    PropertyTester.TestProperty("CopyOutputData")
-
-    PropertyTester.TestProperty("OutputPosition")
-
-    PropertyTester.TestProperty("MaxFieldCount")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetLink/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SheetLink/script.xlb
deleted file mode 100644
index 30fbc310593b..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetLink/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SheetLink" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SheetLink"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SheetLink/sheet_SheetLink.xba b/qadevOOo/tests/basic/ifc/sheet/SheetLink/sheet_SheetLink.xba
deleted file mode 100644
index 48ac50f08318..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SheetLink/sheet_SheetLink.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SheetLink" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SheetLink
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim aURLs(1) As String
-    aURLs(0) = utils.Path2URL(cTestDocsDir)
-    aURLs(1) = utils.Path2URL(cTestDocsDir &amp; "/temp.txt")
-    
-    PropertyTester.TestProperty("Url", aURLs())
-
-    Dim aFilters(1) As String
-    aFilters(0) = "StarCalc 4.0"
-    aFilters(1) = "StarCalc 5.0"
-    
-    PropertyTester.TestProperty("Filter", aFilters())
-
-    PropertyTester.TestProperty("FilterOptions")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/script.xlb b/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/script.xlb
deleted file mode 100644
index 54d523870d7e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_Spreadsheet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_Spreadsheet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/sheet_Spreadsheet.xba b/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/sheet_Spreadsheet.xba
deleted file mode 100644
index 98435657a745..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/Spreadsheet/sheet_Spreadsheet.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_Spreadsheet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global sStyleName As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.Spreadsheet
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("IsVisible")
-    Dim aStyles(1) As String
-    aStyles(0) = sStyleName
-    aStyles(1) = "Default"
-    PropertyTester.TestProperty("PageStyle", aStyles())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/script.xlb
deleted file mode 100644
index 870d40c0204f..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SpreadsheetDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SpreadsheetDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/sheet_SpreadsheetDocument.xba b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/sheet_SpreadsheetDocument.xba
deleted file mode 100644
index 6706c1f00d49..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocument/sheet_SpreadsheetDocument.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SpreadsheetDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SpreadsheetDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("NamedRanges")
-
-    PropertyTester.TestProperty("DatabaseRanges")
-
-    PropertyTester.TestProperty("ColumnLabelRanges")
-
-    PropertyTester.TestProperty("RowLabelRanges")
-
-    PropertyTester.TestProperty("SheetLinks")
-
-    PropertyTester.TestProperty("AreaLinks")
-
-    PropertyTester.TestProperty("DDELinks")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/script.xlb
deleted file mode 100644
index 351347139143..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SpreadsheetDocumentSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SpreadsheetDocumentSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/sheet_SpreadsheetDocumentSettings.xba b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/sheet_SpreadsheetDocumentSettings.xba
deleted file mode 100644
index e0a761901887..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetDocumentSettings/sheet_SpreadsheetDocumentSettings.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SpreadsheetDocumentSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SpreadsheetDocumentSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("IsIterationEnabled")
-    PropertyTester.TestProperty("IterationCount")
-    PropertyTester.TestProperty("IterationEpsilon")
-    PropertyTester.TestProperty("StandardDecimals")
-    PropertyTester.TestProperty("NullDate")
-    PropertyTester.TestProperty("DefaultTabStop")
-    PropertyTester.TestProperty("IgnoreCase")
-    PropertyTester.TestProperty("CalcAsShown")
-    PropertyTester.TestProperty("MatchWholeCell")
-    PropertyTester.TestProperty("SpellOnline")
-    PropertyTester.TestProperty("LookUpLabels")
-    PropertyTester.TestProperty("RegularExpressions")
-    PropertyTester.TestProperty("ForbiddenCharacters")
-    PropertyTester.TestProperty("HasDrawPages")
-
-'
-    PropertyTester.TestProperty("CharLocale")
-
-    PropertyTester.TestProperty("CharLocaleAsian")
-
-    PropertyTester.TestProperty("CharLocaleComplex")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/script.xlb
deleted file mode 100644
index d9f23cd17d45..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SpreadsheetViewSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SpreadsheetViewSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/sheet_SpreadsheetViewSettings.xba b/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/sheet_SpreadsheetViewSettings.xba
deleted file mode 100644
index 54505745b541..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SpreadsheetViewSettings/sheet_SpreadsheetViewSettings.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SpreadsheetViewSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SpreadsheetViewSettings
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("ShowFormulas")
-
-    PropertyTester.TestProperty("ShowZeroValues")
-
-    PropertyTester.TestProperty("IsValueHighlightingEnabled")
-
-    PropertyTester.TestProperty("ShowNotes")
-
-    PropertyTester.TestProperty("HasVerticalScrollBar")
-
-    PropertyTester.TestProperty("HasHorizontalScrollBar")
-
-    PropertyTester.TestProperty("HasSheetTabs")
-
-    PropertyTester.TestProperty("IsOutlineSymbolsSet")
-
-    PropertyTester.TestProperty("HasColumnRowHeaders")
-
-    PropertyTester.TestProperty("ShowGrid")
-
-    PropertyTester.TestProperty("GridColor")
-
-    PropertyTester.TestProperty("ShowHelpLines")
-
-    PropertyTester.TestProperty("ShowAnchor")
-
-    PropertyTester.TestProperty("ShowPageBreaks")
-
-    PropertyTester.TestProperty("ShowObjects")
-
-    PropertyTester.TestProperty("ShowCharts")
-
-    PropertyTester.TestProperty("ShowDrawing")
-
-    PropertyTester.TestProperty("HideSpellMarks")
-
-    PropertyTester.TestProperty("ZoomType")
-
-    PropertyTester.TestProperty("ZoomValue")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/script.xlb
deleted file mode 100644
index ec784755fab0..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_SubTotalDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_SubTotalDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/sheet_SubTotalDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/sheet_SubTotalDescriptor.xba
deleted file mode 100644
index bb9810addb02..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/SubTotalDescriptor/sheet_SubTotalDescriptor.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_SubTotalDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.SubTotalDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("InsertPageBreaks")
-
-    PropertyTester.TestProperty("IsCaseSensitive")
-
-    PropertyTester.TestProperty("EnableUserSortList")
-
-    PropertyTester.TestProperty("UserSortListIndex")
-
-    PropertyTester.TestProperty("BindFormatsToContent")
-
-    PropertyTester.TestProperty("SortAscending")
-
-    PropertyTester.TestProperty("MaxFieldCount")
-
-    PropertyTester.TestProperty("EnableSort")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/script.xlb b/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/script.xlb
deleted file mode 100644
index 43d45faccf0d..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_TableAutoFormat" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_TableAutoFormat"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/sheet_TableAutoFormat.xba b/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/sheet_TableAutoFormat.xba
deleted file mode 100644
index 9c1fe4e521ec..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormat/sheet_TableAutoFormat.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_TableAutoFormat" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.TableAutoFormat
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("IncludeFont")
-
-    PropertyTester.TestProperty("IncludeJustify")
-
-    PropertyTester.TestProperty("IncludeBorder")
-
-    PropertyTester.TestProperty("IncludeBackground")
-
-    PropertyTester.TestProperty("IncludeNumberFormat")
-
-    PropertyTester.TestProperty("IncludeWidthAndHeight")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/script.xlb b/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/script.xlb
deleted file mode 100644
index a82bd1a1a653..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_TableAutoFormatField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_TableAutoFormatField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/sheet_TableAutoFormatField.xba b/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/sheet_TableAutoFormatField.xba
deleted file mode 100644
index f66727fb5da4..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableAutoFormatField/sheet_TableAutoFormatField.xba
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_TableAutoFormatField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.TableAutoFormatField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("CharFontName")
-
-    Dim aHeightArray(3) As Double
-    aHeightArray(0) = 10
-    aHeightArray(1) = 20.1
-    aHeightArray(2) = 25.2
-    aHeightArray(3) = 30.3
-    PropertyTester.TestProperty("CharHeight",aHeightArray())
-
-    Dim aWeightArray(9) As Integer
-    with com.sun.star.awt.FontWeight
-        aWeightArray(0) = .DONTKNOW
-        aWeightArray(1) = .THIN
-        aWeightArray(2) = .ULTRALIGHT
-        aWeightArray(3) = .LIGHT
-        aWeightArray(4) = .SEMILIGHT
-        aWeightArray(5) = .NORMAL
-        aWeightArray(6) = .SEMIBOLD
-        aWeightArray(7) = .BOLD
-        aWeightArray(8) = .ULTRABOLD
-        aWeightArray(9) = .BLACK
-    end with
-    PropertyTester.TestProperty("CharWeight", aWeightArray())
-
-    PropertyTester.TestProperty("CharPosture")
-
-    PropertyTester.TestProperty("CharUnderline")
-
-    PropertyTester.TestProperty("CharCrossedOut")
-
-    PropertyTester.TestProperty("CharContoured")
-
-    PropertyTester.TestProperty("CharShadowed")
-
-    PropertyTester.TestProperty("CharColor")
-
-' ### The following property was not found in correspond IDL file! ###
-    PropertyTester.TestProperty("CharLocale")
-
-    PropertyTester.TestProperty("CellBackColor")
-
-    PropertyTester.TestProperty("IsCellBackgroundTransparent")
-
-    PropertyTester.TestProperty("ShadowFormat")
-
-    PropertyTester.TestProperty("ParaRightMargin")
-
-    PropertyTester.TestProperty("ParaLeftMargin")
-
-    PropertyTester.TestProperty("ParaBottomMargin")
-
-    PropertyTester.TestProperty("ParaTopMargin")
-
-    PropertyTester.TestProperty("RotateReference")
-
-    PropertyTester.TestProperty("RotateAngle")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("IsTextWrapped")
-
-    PropertyTester.TestProperty("VertJustify")
-
-    PropertyTester.TestProperty("HoriJustify")
-
-    PropertyTester.TestProperty("CharPostureComplex")
-
-    PropertyTester.TestProperty("CharPostureAsian")
-
-    PropertyTester.TestProperty("CharWeightComplex", aWeightArray())
-
-    PropertyTester.TestProperty("CharWeightAsian", aWeightArray())
-
-    PropertyTester.TestProperty("CharHeightComplex", aHeightArray())
-
-    PropertyTester.TestProperty("CharHeightAsian", aHeightArray())
-
-    PropertyTester.TestProperty("CharFontPitchComplex")
-
-    PropertyTester.TestProperty("CharFontPitchAsian")
-
-    PropertyTester.TestProperty("CharFontPitch")
-
-    PropertyTester.TestProperty("CharFontFamilyComplex")
-
-    PropertyTester.TestProperty("CharFontFamilyAsian")
-
-    PropertyTester.TestProperty("CharFontFamily")
-
-    PropertyTester.TestProperty("CharFontCharSetComplex")
-
-    PropertyTester.TestProperty("CharFontCharSetAsian")
-
-    PropertyTester.TestProperty("CharFontCharSet")
-
-    PropertyTester.TestProperty("CharFontStyleNameComplex")
-
-    PropertyTester.TestProperty("CharFontStyleNameAsian")
-
-    PropertyTester.TestProperty("CharFontStyleName")
-
-    PropertyTester.TestProperty("CharFontNameComplex")
-
-    PropertyTester.TestProperty("CharFontNameAsian")
-
-
-'
-    PropertyTester.TestProperty("TableBorder")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableValidation/script.xlb b/qadevOOo/tests/basic/ifc/sheet/TableValidation/script.xlb
deleted file mode 100644
index b5a1217ee934..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableValidation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_TableValidation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_TableValidation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/TableValidation/sheet_TableValidation.xba b/qadevOOo/tests/basic/ifc/sheet/TableValidation/sheet_TableValidation.xba
deleted file mode 100644
index 100c51fa0397..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/TableValidation/sheet_TableValidation.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_TableValidation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.sheet.TableValidation
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("Type")
-
-    PropertyTester.TestProperty("ShowInputMessage")
-
-    PropertyTester.TestProperty("InputTitle")
-
-    PropertyTester.TestProperty("InputMessage")
-
-    PropertyTester.TestProperty("ShowErrorMessage")
-
-    PropertyTester.TestProperty("ErrorTitle")
-
-    PropertyTester.TestProperty("ErrorMessage")
-
-    PropertyTester.TestProperty("IgnoreBlankCells")
-
-    PropertyTester.TestProperty("ErrorAlertStyle")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XAreaLink/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XAreaLink/script.xlb
deleted file mode 100644
index 47d6b97b9722..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XAreaLink/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XAreaLink" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XAreaLink"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XAreaLink/sheet_XAreaLink.xba b/qadevOOo/tests/basic/ifc/sheet/XAreaLink/sheet_XAreaLink.xba
deleted file mode 100644
index 6f3315327c25..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XAreaLink/sheet_XAreaLink.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XAreaLink" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XAreaLink
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getSourceArea()")
-    bOK = true
-    Dim cArea As String
-    cArea = oObj.getSourceArea()
-    bOK = bOK AND NOT isNULL(cArea)
-    Test.MethodTested("getSourceArea()", bOK)
-
-
-    Test.StartMethod("setSourceArea()")
-    bOK = true
-    Dim oldArea As String
-    Dim newArea As String
-    oldArea = oObj.getSourceArea()
-    newArea = "Sheet0.I6:G8"
-    Out.Log("Set SourceArea to '" &amp; newArea &amp; "'")
-    oObj.setSourceArea(newArea)
-    newArea = oObj.getSourceArea()
-    Out.Log("SourceArea is '" &amp; newArea &amp; "'")
-    bOK = bOK AND oldArea &lt;&gt; newArea
-    oObj.setSourceArea(oldArea)
-    Test.MethodTested("setSourceArea()", bOK)
-
-    Test.StartMethod("getDestArea()")
-    Dim oArea As Object
-    bOK = true
-    oArea = oObj.getDestArea()
-    bOK = bOK AND NOT isNULL(oArea)
-    Test.MethodTested("getDestArea()", bOK)
-
-    Test.StartMethod("setDestArea()")
-    Dim sNewArea As New com.sun.star.table.CellRangeAddress
-    Dim sOldArea As Object
-
-    bOK = true
-    sOldArea = oObj.getDestArea()
-
-    sNewArea.Sheet = sOldArea.Sheet
-    sNewArea.StartRow = sOldArea.StartRow + 1
-    sNewArea.StartColumn = sOldArea.StartColumn + 1
-    sNewArea.EndRow = sOldArea.EndRow + 1
-    sNewArea.EndColumn = sOldArea.EndColumn + 1
-
-    oObj.setDestArea(sNewArea)
-
-    bOK = bOK AND NOT isNULL(oObj.getDestArea())
-    if (bOK) then
-        bOK = bOK AND (sOldArea.Sheet = oObj.getDestArea.Sheet)
-        bOK = bOK AND (sOldArea.StartRow = oObj.getDestArea.StartRow - 1)
-        bOK = bOK AND (sOldArea.StartColumn = oObj.getDestArea.StartColumn - 1)
-        bOK = bOK AND (sOldArea.EndRow = oObj.getDestArea.EndRow - 1)
-        bOK = bOK AND (sOldArea.EndColumn = oObj.getDestArea.EndColumn - 1)
-    end if
-
-    oObj.setDestArea(sOldArea)
-
-    Test.MethodTested("setDestArea()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/script.xlb
deleted file mode 100644
index 430bf9a3a93e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XAreaLinks" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XAreaLinks"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/sheet_XAreaLinks.xba b/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/sheet_XAreaLinks.xba
deleted file mode 100644
index 3e8d9d11354a..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XAreaLinks/sheet_XAreaLinks.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XAreaLinks" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XAreaLinks
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("insertAtPosition()")
-    bOK = true
-    'remembering amount of elements
-    Dim m_startAmount as Integer
-    m_startAmount = oObj.Count()
-
-    Dim addr As New com.sun.star.table.CellAddress
-    addr.Sheet = 0
-    addr.Row = 0
-    addr.Column = 2
-
-    Dim mSrcFileName as String
-    mSrcFileName = utils.Path2URL(cTestDocsDir + "/" + "calcshapes.sxc")
-    Dim amdstAddresss as String
-    mdstAddress = "a2:b4"
-    Dim asmFilter  as String
-    mFilter = ""
-    Dim mFilterOpts as String
-    mFilterOpts = ""
-    oObj.insertAtPosition(addr, mSrcFileName, mdstAddress, mFilter, mFilterOpts)
-
-    bOK = bOK AND (m_startAmount + 1 = oObj.Count)
-    Test.MethodTested("insertAtPosition()", bOK)
-
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(0)
-    bOK = bOK AND (oObj.Count = m_startAmount)
-    Test.MethodTested("removeByIndex()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/script.xlb
deleted file mode 100644
index 301683569797..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XArrayFormulaRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XArrayFormulaRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/sheet_XArrayFormulaRange.xba b/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/sheet_XArrayFormulaRange.xba
deleted file mode 100644
index 120aa4b65033..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XArrayFormulaRange/sheet_XArrayFormulaRange.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XArrayFormulaRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XArrayFormulaRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bExpectedException As Boolean
-
-    Test.StartMethod("setArrayFormula()")
-    Test.StartMethod("getArrayFormula()")
-    bOK = true
-
-    if (cObjectName = "sc.ScTableSheetObj") then
-        bExpectedException = true
-        oObj.setArrayFormula("=1+2")
-        wait(1) ' additional operator should exists here to avoid 
-                ' resuming on 'else' after exception handling  
-    else
-        oObj.setArrayFormula("=1+2")
-        bOK = bOK AND (oObj.getArrayFormula() = "{=1+2}")
-        Out.Log("2")
-    end if
-
-    ' Setting of _empty_ formula should work for all objects.
-    bExpectedException = false
-    oObj.setArrayFormula("")
-    bOK = bOK AND (oObj.getArrayFormula() = "")
-
-    Test.MethodTested("getArrayFormula()", bOK)
-    Test.MethodTested("setArrayFormula()", bOK)
-
-Exit Sub
-ErrHndl:
-    if (bExpectedException) then
-        Out.Log("It doesn't make sense to set formula over whole page.")
-        Out.Log("Expected exception: " &amp; error)
-    else
-        Test.Exception()
-        bOK = false
-    end if
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/script.xlb
deleted file mode 100644
index 892840f8d8e2..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellAddressable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XCellAddressable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/sheet_XCellAddressable.xba b/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/sheet_XCellAddressable.xba
deleted file mode 100644
index 7f00430ae466..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellAddressable/sheet_XCellAddressable.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellAddressable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellAddressable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim vCellAddress As Variant
-    
-    Test.StartMethod("getCellAddress()")
-    bOK = true
-    vCellAddress = oObj.getCellAddress()
-    bOK = bOK AND isNumeric(vCellAddress.Row)
-    Test.MethodTested("getCellAddress()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/script.xlb
deleted file mode 100644
index e72e1f1f4a52..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellRangeAddressable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XCellRangeAddressable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/sheet_XCellRangeAddressable.xba b/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/sheet_XCellRangeAddressable.xba
deleted file mode 100644
index d5f063b3c7e4..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeAddressable/sheet_XCellRangeAddressable.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellRangeAddressable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellRangeAddressable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oAddress As Variant
-
-    Test.StartMethod("getRangeAddress()")
-    bOK = true
-    oAddress = oObj.getRangeAddress()
-    bOK = bOK AND isNumeric(oAddress.Sheet)
-    bOK = bOK AND isNumeric(oAddress.StartColumn)
-    bOK = bOK AND isNumeric(oAddress.EndColumn)
-    bOK = bOK AND isNumeric(oAddress.StartRow)
-    bOK = bOK AND isNumeric(oAddress.EndRow)
-    Test.MethodTested("getRangeAddress()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/script.xlb
deleted file mode 100644
index 9112c7c9b7f2..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellRangeData" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XCellRangeData"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/sheet_XCellRangeData.xba b/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/sheet_XCellRangeData.xba
deleted file mode 100644
index f6114d09437a..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeData/sheet_XCellRangeData.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellRangeData" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global newData As Variant
-
-'*************************************************************************
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellRangeData
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim data As Variant
-    Dim myNewData as Variant
-
-    Test.StartMethod("getDataArray()")
-    data = oObj.getDataArray()
-    bOK = Not IsEmpty(data) AND ubound(data) > 0
-    Test.MethodTested("getDataArray()", bOK)
-
-    Test.StartMethod("setDataArray()")
-    oObj.setDataArray(createUnoValue("[][]any",newData))
-    data = oObj.getDataArray()
-    bOK = equals(data, newData)
-    Test.MethodTested("setDataArray()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/script.xlb
deleted file mode 100644
index ae74228d9729..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellRangeMovement" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XCellRangeMovement"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/sheet_XCellRangeMovement.xba b/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/sheet_XCellRangeMovement.xba
deleted file mode 100644
index 8d420350ce38..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeMovement/sheet_XCellRangeMovement.xba
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellRangeMovement" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellRangeMovement
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Out.Log("Prepearing test...")
-    for i = 0 to 5
-        for j = 0 to 5
-            oObj.getCellByPosition(j, i).Value = i * 6 + j
-        next j
-    next i
-
-    Test.StartMethod("insertCells()")
-    bOK = true
-    Dim newCellAddress As New com.sun.star.table.CellRangeAddress
-    newCellAddress.Sheet = 0
-    newCellAddress.StartColumn = 1
-    newCellAddress.StartRow = 1
-    newCellAddress.EndColumn = 1
-    newCellAddress.EndRow = 1
-    oObj.insertCells(newCellAddress, com.sun.star.sheet.CellInsertMode.DOWN)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(2, 2).Value = 14
-    bOK = bOK AND oObj.getCellByPosition(1, 2).Value = 7
-    bOK = bOK AND oObj.getCellByPosition(0, 2).Value = 12
-
-    oObj.insertCells(newCellAddress, com.sun.star.sheet.CellInsertMode.RIGHT)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(3, 0).Value = 3
-    bOK = bOK AND oObj.getCellByPosition(3, 1).Value = 8
-    bOK = bOK AND oObj.getCellByPosition(3, 2).Value = 15
-
-    oObj.insertCells(newCellAddress, com.sun.star.sheet.CellInsertMode.ROWS)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(4, 0).Value = 4
-    bOK = bOK AND oObj.getCellByPosition(4, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(4, 2).Value = 9
-
-    oObj.insertCells(newCellAddress, com.sun.star.sheet.CellInsertMode.COLUMNS)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(0, 5).Value = 24
-    bOK = bOK AND oObj.getCellByPosition(1, 5).String = ""
-    bOK = bOK AND oObj.getCellByPosition(2, 5).Value = 19
-
-    Test.MethodTested("insertCells()", bOK)
-
-    Test.StartMethod("removeRange()")
-    bOK = true
-    oObj.removeRange(newCellAddress, com.sun.star.sheet.CellDeleteMode.ROWS)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(4, 0).Value = 3
-    bOK = bOK AND oObj.getCellByPosition(4, 1).Value = 8
-    bOK = bOK AND oObj.getCellByPosition(4, 2).Value = 15
-
-    oObj.removeRange(newCellAddress, com.sun.star.sheet.CellDeleteMode.COLUMNS)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(4, 0).Value = 4
-    bOK = bOK AND oObj.getCellByPosition(4, 1).Value = 9
-    bOK = bOK AND oObj.getCellByPosition(4, 2).Value = 16
-
-    oObj.removeRange(newCellAddress, com.sun.star.sheet.CellDeleteMode.UP)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).Value = 7
-    bOK = bOK AND oObj.getCellByPosition(1, 2).Value = 13
-    bOK = bOK AND oObj.getCellByPosition(1, 3).Value = 19
-    bOK = bOK AND oObj.getCellByPosition(0, 3).Value = 18
-
-    oObj.removeRange(newCellAddress, com.sun.star.sheet.CellDeleteMode.LEFT)
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(0, 1).Value = 6
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(2, 1).Value = 8
-
-    Test.MethodTested("removeRange()", bOK)
-
-    Test.StartMethod("moveRange()")
-    bOK = true
-    newCellAddress.Sheet = 0
-    newCellAddress.StartColumn = 0
-    newCellAddress.StartRow = 0
-    newCellAddress.EndColumn = 1
-    newCellAddress.EndRow = 1
-    Dim sCell As New com.sun.star.table.CellAddress
-    sCell.Sheet = 0
-    sCell.Column = 3
-    sCell.Row = 3
-    oObj.moveRange(sCell, newCellAddress)
-
-    bOK = bOK AND oObj.getCellByPosition(0, 0).String = ""
-    bOK = bOK AND oObj.getCellByPosition(1, 0).String = ""
-    bOK = bOK AND oObj.getCellByPosition(0, 1).String = ""
-    bOK = bOK AND oObj.getCellByPosition(1, 1).String = ""
-
-    bOK = bOK AND oObj.getCellByPosition(3, 3).Value = 0
-    bOK = bOK AND oObj.getCellByPosition(3, 4).Value = 6
-    bOK = bOK AND oObj.getCellByPosition(4, 3).Value = 1
-    bOK = bOK AND oObj.getCellByPosition(4, 4).String = ""
-
-    Test.MethodTested("moveRange()", bOK)
-
-    Test.StartMethod("copyRange()")
-    bOK = true
-    newCellAddress.Sheet = 0
-    newCellAddress.StartColumn = 2
-    newCellAddress.StartRow = 2
-    newCellAddress.EndColumn = 3
-    newCellAddress.EndRow = 3
-    sCell.Sheet = 0
-    sCell.Column = 0
-    sCell.Row = 0
-
-    oObj.copyRange(sCell, newCellAddress)
-
-    bOK = bOK AND oObj.getCellByPosition(0, 0).Value = oObj.getCellByPosition(2, 2).Value
-    bOK = bOK AND oObj.getCellByPosition(0, 1).Value = oObj.getCellByPosition(2, 3).Value
-    bOK = bOK AND oObj.getCellByPosition(1, 0).Value = oObj.getCellByPosition(3, 2).Value
-    bOK = bOK AND oObj.getCellByPosition(1, 1).Value = oObj.getCellByPosition(3, 3).Value
-
-    Test.MethodTested("copyRange()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/script.xlb
deleted file mode 100644
index 579888e295a3..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellRangeReferrer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XCellRangeReferrer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/sheet_XCellRangeReferrer.xba b/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/sheet_XCellRangeReferrer.xba
deleted file mode 100644
index 7a41e77309c5..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellRangeReferrer/sheet_XCellRangeReferrer.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellRangeReferrer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oReferredCells As New com.sun.star.table.CellRangeAddress
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellRangeReferrer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim refCells As Object
-
-    Test.StartMethod("getReferredCells()")
-    bOK = true
-    refCells = oObj.ReferredCells.getRangeAddress()
-    bOK = NOT isNULL(refCells)
-    bOK = bOK AND refCells.Sheet = oReferredCells.Sheet
-    bOK = bOK AND refCells.StartRow = oReferredCells.StartRow
-    bOK = bOK AND refCells.EndRow = oReferredCells.EndRow
-    bOK = bOK AND refCells.StartColumn = oReferredCells.StartColumn
-    bOK = bOK AND refCells.EndColumn = oReferredCells.EndColumn
-
-    if NOT(bOK) then
-        Out.Log("Global oReferredCells var is: (" &amp; oReferredCells.Sheet &amp; "," _
-                                  &amp; oReferredCells.StartRow &amp; "," _
-                                  &amp; oReferredCells.StartColumn &amp; "," _
-                                  &amp; oReferredCells.EndRow &amp; "," _
-                                  &amp; oReferredCells.EndColumn &amp; ")")
-        Out.Log("Local var is: (" &amp; refCells.Sheet &amp; "," _
-                                  &amp; refCells.StartRow &amp; "," _
-                                  &amp; refCells.StartColumn &amp; "," _
-                                  &amp; refCells.EndRow &amp; "," _
-                                  &amp; refCells.EndColumn &amp; ")")
-    end if
-    Test.MethodTested("getReferredCells()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellSeries/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XCellSeries/script.xlb
deleted file mode 100644
index b75c980df466..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellSeries/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XCellSeries" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sheet_XCellSeries"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XCellSeries/sheet_XCellSeries.xba b/qadevOOo/tests/basic/ifc/sheet/XCellSeries/sheet_XCellSeries.xba
deleted file mode 100644
index 7005d9886b6f..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XCellSeries/sheet_XCellSeries.xba
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XCellSeries" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' - Global aCellSeries(1) As Integer
-'           aCellSeries(0) = amount of rows of range
-'           aCellSeries(1) = amount of columns of range
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XCellSeries
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim startValue as Integer
-    Dim nStep as Integer
-    Dim shouldValue as Integer
-    Dim filledValue as Integer
-    Dim endCell(2) as Integer
-    Dim n as Integer, m as Integer
-    
-	startValue = 5
-    nStep = 2
-    
-    ' if 'nStep' is not a divisor of 'aCellSeries' it must be calculated
-    ' the last filled cell
-    for n = 0 to 1
-        if (aCellSeries(n) mod nStep) &lt;&gt; 0 then
-            endCell(n) = aCellSeries(n) - (nStep-1)
-        else
-            endCell(n) = aCellSeries(n)
-        end if
-    next n
-    'make clean cells
-    for n = 0 to endCell(0)
-        for m = 0 to endCell(1)
-            oObj.getCellByPosition(n,m).setString("")
-        next
-    next
-    'set defined start value
-    oObj.getCellByPosition(0,0).setValue(startValue)
-    Test.StartMethod("fillAuto()")
-    bOK = TRUE
-    oObj.fillAuto(com.sun.star.sheet.FillDirection.TO_BOTTOM, nStep)
-    shouldValue = endCell(0) / nStep + startValue
-    filledValue = oObj.getCellByPosition(0,endCell(0)).getValue()
- 	bOK = bOK AND ( shouldValue = filledValue ) 
-    out.log("" + shouldValue + ":" + filledValue)
-    Test.MethodTested("fillAuto()", bOK)
-
-
-    Test.StartMethod("fillSeries()")
-    bOK = TRUE
-    out.log("fillSeries() 1/3")
-    oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, _
-    com.sun.star.sheet.FillMode.LINEAR, _
-    com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, nStep, 20000000)
-    shouldValue = endCell(0) * nStep + startValue
-    filledValue = oObj.getCellByPosition(0,endCell(0)).getValue()
- 	bOK = bOK and (shouldValue = filledValue) 
-
-    out.log("fillSeries() 2/3")
-    oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_RIGHT, _
-    com.sun.star.sheet.FillMode.LINEAR, _
-    com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, nStep, 20000000)
-    shouldValue = endCell(1) * nStep + startValue
-    filledValue = oObj.getCellByPosition(endCell(1),0).getValue()
- 	bOK = bOK and (shouldValue = filledValue) 
- 	
- 	
-    out.log("fillSeries() 3/3")
-    oObj.fillSeries(com.sun.star.sheet.FillDirection.TO_BOTTOM, _
-    com.sun.star.sheet.FillMode.GROWTH, _
-    com.sun.star.sheet.FillDateMode.FILL_DATE_DAY, nStep, 20000000)
-    shouldValue = startValue * nStep ^ endCell(0)
-    filledValue = oObj.getCellByPosition(0,endCell(0)).getValue()
- 	bOK = bOK and (shouldValue = filledValue) 
-
-    Test.MethodTested("fillSeries()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/script.xlb
deleted file mode 100644
index c5f0520146ca..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XConsolidationDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XConsolidationDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/sheet_XConsolidationDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/sheet_XConsolidationDescriptor.xba
deleted file mode 100644
index 426050dedc32..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XConsolidationDescriptor/sheet_XConsolidationDescriptor.xba
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XConsolidationDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XConsolidationDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim mStartPos, objpos As Variant
-    Dim bUseCols, bUseRows, bUsed, bLinks As Boolean
-    Dim src(0) As New com.sun.star.table.CellRangeAddress
-    Dim outpos As New com.sun.star.table.CellAddress
-    Dim objSrc() As Variant
-
-    Test.StartMethod("getFunction()")
-    bOK = true
-    bOK = bOK AND NOT IsNULL(oObj.Function)
-    Test.MethodTested("getFunction()", bOK)
-
-    Test.StartMethod("getSources()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getSources())
-    Test.MethodTested("getSources()", bOK)
-
-    Test.StartMethod("getStartOutputPosition()")
-    bOK = true
-    mStartPos = oObj.getStartOutputPosition()
-    bOK = mStartPos.Row &gt;= 0 ' Checking that returned type is correct
-                             ' (if Object has such field)
-    Test.MethodTested("getStartOutputPosition()", bOK)
-
-    Test.StartMethod("getUseRowHeaders()")
-    Test.StartMethod("setUseRowHeaders()")
-    bOK = true
-    bUsed = oObj.getUseRowHeaders
-    oObj.setUseRowHeaders(NOT bUsed)
-    bOK = bOK AND (oObj.getUseRowHeaders &lt;&gt; bUsed)
-    Test.MethodTested("getUseRowHeaders()", bOK)
-    Test.MethodTested("setUseRowHeaders()", bOK)
-
-    Test.StartMethod("setFunction()")
-    bOK = true
-    oObj.setFunction(com.sun.star.sheet.GeneralFunction.MAX)
-    bOK = bOK AND (oObj.getFunction = com.sun.star.sheet.GeneralFunction.MAX)
-    Test.MethodTested("setFunction()", bOK)
-
-    Test.StartMethod("getInsertLinks()")
-    Test.StartMethod("setInsertLinks()")
-    bOK = true
-    bLinks = oObj.getInsertLinks
-    oObj.setInsertLinks(NOT bLinks)
-    bOK = bOK AND (oObj.getInsertLinks &lt;&gt; bLinks)
-    Test.MethodTested("getInsertLinks()", bOK)
-    Test.MethodTested("setInsertLinks()", bOK)
-
-    Test.StartMethod("setSources()")
-    bOK = true
-    src(0).Sheet = 0
-    src(0).StartRow = 5
-    src(0).StartColumn = 5
-    src(0).EndRow = 10
-    src(0).EndColumn = 10
-    oObj.setSources(src())
-    objSrc() = oObj.getSources
-    bOK = bOK AND ((objSrc(0).Sheet  = src(0).Sheet) AND _
-                   (objSrc(0).StartRow = src(0).StartRow) AND _
-                   (objSrc(0).EndRow = src(0).EndRow) AND _
-                   (objSrc(0).StartColumn = src(0).StartColumn) AND _
-                   (objSrc(0).EndColumn = src(0).EndColumn))
-    Test.MethodTested("setSources()", bOK)
-
-    Test.StartMethod("setStartOutputPosition()")
-    bOK = true
-    outpos.Sheet = 0
-    outpos.Row = 2
-    outpos.Column = 2
-    oObj.setStartOutputPosition(outpos)
-    objpos = oObj.getStartOutputPosition
-    bOK = bOK AND ((objpos(0).Sheet  = outpos(0).Sheet) AND _
-                   (objpos(0).Row = outpos(0).Row) AND _
-                   (objpos(0).Column = outpos(0).Column))
-    Test.MethodTested("setStartOutputPosition()", bOK)
-
-    Test.StartMethod("getUseColumnHeaders()")
-    bOK = true
-    bUseCols = oObj.getUseColumnHeaders()
-    oObj.setUseColumnHeaders(NOT bUseCols)
-    bOK = bOK AND (oObj.getUseColumnHeaders() &lt;&gt; bUseCols)
-    Test.MethodTested("getUseColumnHeaders()", bOK)
-
-    Test.StartMethod("setUseColumnHeaders()")
-    bOK = true
-    bUseRows = oObj.getUseRowHeaders
-    oObj.setUseRowHeaders(NOT bUseRows)
-    bOK = bOK AND (oObj.getUseRowHeaders &lt;&gt; bUseRows)
-    Test.MethodTested("setUseColumnHeaders()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDDELink/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDDELink/script.xlb
deleted file mode 100644
index b045e20e2e69..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDDELink/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDDELink" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDDELink"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDDELink/sheet_XDDELink.xba b/qadevOOo/tests/basic/ifc/sheet/XDDELink/sheet_XDDELink.xba
deleted file mode 100644
index 9b0f8e94fa82..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDDELink/sheet_XDDELink.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDDELink" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global DDETopic As String
-'     - Global DDEApplication As String
-'     - Global DDEItem As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDDELink
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getApplication()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getApplication) AND (oObj.getApplication = DDEApplication)
-    Test.MethodTested("getApplication()", bOK)
-
-    Test.StartMethod("getTopic()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getTopic) AND (oObj.getTopic = DDETopic)
-    Test.MethodTested("getTopic()", bOK)
-
-    Test.StartMethod("getItem()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getItem) AND (oObj.getItem = DDEItem)
-    Test.MethodTested("getItem()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/script.xlb
deleted file mode 100644
index 303178ad2b29..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDataPilotDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDataPilotDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/sheet_XDataPilotDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/sheet_XDataPilotDescriptor.xba
deleted file mode 100644
index 97fecf3af2e4..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotDescriptor/sheet_XDataPilotDescriptor.xba
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDataPilotDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDataPilotDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK, bOK1 As Boolean
-    Dim Tag, oldTag As String
-    Dim oldRange, newRange, FD As Object
-    Dim Range As New com.sun.star.table.CellRangeAddress
-    Dim Fields() As Object
-
-    Test.StartMethod("getTag()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getTag())
-    Test.MethodTested("getTag()", bOK)
-
-    Test.StartMethod("setTag()")
-    bOK = true
-    Tag = cIfcShortName
-    oldTag = oObj.getTag()
-    oObj.SetTag(Tag)
-    bOK = bOK AND (oldTag &lt;&gt; oObj.getTag())
-    oObj.setTag(oldTag)
-    Test.MethodTested("setTag()", bOK)
-
-    Test.StartMethod("getSourceRange()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getSourceRange())
-    Test.MethodTested("getSourceRange()", bOK)
-
-    Test.StartMethod("setSourceRange()")
-    bOK = true
-    Range.Sheet = 0
-    Range.StartColumn = 1
-    Range.StartRow = 1
-    Range.EndColumn = 4
-    Range.EndRow = 4
-
-    oldRange = oObj.getSourceRange
-    oObj.setSourceRange(Range)
-    newRange = oObj.getSourceRange
-    bOK1 = false
-    bOK1 = bOK1 OR newRange.Sheet &lt;&gt; oldRange.Sheet
-    bOK1 = bOK1 OR newRange.StartColumn &lt;&gt; oldRange.StartColumn
-    bOK1 = bOK1 OR newRange.EndColumn &lt;&gt; oldRange.EndColumn
-    bOK1 = bOK1 OR newRange.StartRow &lt;&gt; oldRange.StartRow
-    bOK1 = bOK1 OR newRange.EndRow &lt;&gt; oldRange.EndRow
-    bOK = bOK AND bOK1
-
-    oObj.setSourceRange(oldRange)
-    Test.MethodTested("setSourceRange()", bOK)
-
-    Test.StartMethod("getFilterDescriptor()")
-    bOK = true
-    FD = oObj.getFilterDescriptor
-    bOK = (NOT isNULL(FD)) AND (ubound(FD.getFilterFields) &gt; 0)
-    Test.MethodTested("getFilterDescriptor()", bOK)
-    
-    Test.StartMethod("getDataPilotFields()")
-    bOK = true
-    Fields = oObj.getDataPilotFields
-    bOK = NOT isNULL(Fields)
-    Test.MethodTested("getDataPilotFields()", bOK)
-
-    Test.StartMethod("getColumnFields()")
-    bOK = true
-    Fields = oObj.getColumnFields
-    bOK = NOT isNULL(Fields)
-    Test.MethodTested("getColumnFields()", bOK)
-
-    Test.StartMethod("getRowFields()")
-    bOK = true
-    Fields = oObj.getRowFields
-    bOK = NOT isNULL(Fields)
-    Test.MethodTested("getRowFields()", bOK)
-
-    Test.StartMethod("getPageFields()")
-    bOK = true
-    Fields = oObj.getPageFields()
-    bOK = NOT isNULL(Fields)
-    Test.MethodTested("getPageFields()", bOK)
-
-    Test.StartMethod("getDataFields()")
-    bOK = true
-    Fields = oObj.getDataFields
-    bOK = bOK AND NOT isNULL(Fields)
-    Test.MethodTested("getDataFields()", bOK)
-
-    Test.StartMethod("getHiddenFields()")
-    bOK = true
-    Fields = oObj.getHiddenFields()
-    bOK = NOT isNULL(Fields)
-    Test.MethodTested("getHiddenFields()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/script.xlb
deleted file mode 100644
index 5edf552cd579..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDataPilotTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDataPilotTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/sheet_XDataPilotTable.xba b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/sheet_XDataPilotTable.xba
deleted file mode 100644
index e2d7d1c517eb..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTable/sheet_XDataPilotTable.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDataPilotTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oOutputRange As New com.sun.star.table.CellAddress
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDataPilotTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Range, oSheet As Object
-    Dim oldData, newData, CellRow, CellCol As Integer
-    
-    Test.StartMethod("getOutputRange()")
-    bOK = true
-    Range = oObj.getOutputRange()
-    bOK = bOK AND NOT isNULL(Range)
-    if (bOK) then
-        bOK = bOK AND Range.Sheet = oOutputRange.Sheet
-        bOK = bOK AND Range.StartRow = oOutputRange.Row
-        bOK = bOK AND Range.StartColumn = oOutputRange.Column
-    end if
-    Test.MethodTested("getOutputRange()", bOK)
-
-    Test.StartMethod("refresh()")
-    bOK = true
-    CellRow = oObj.getSourceRange.EndRow
-    CellCol = oObj.getSourceRange.EndColumn
-    oSheet = oDoc.Sheets.getByIndex(0)
-    oSheet.getCellByPosition(CellCol, CellRow).Value = 5
-    oldData = oSheet.getCellByPosition(oOutputRange.Column, oOutputRange.Row+3).Value   
-    oObj.refresh()
-    newData = oSheet.getCellByPosition(oOutputRange.Column, oOutputRange.Row+3).Value
-    bOK = bOK AND (oldData &lt;&gt; newData)
-    Test.MethodTested("refresh()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/script.xlb
deleted file mode 100644
index 2e5439e882be..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDataPilotTables" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDataPilotTables"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/sheet_XDataPilotTables.xba b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/sheet_XDataPilotTables.xba
deleted file mode 100644
index fb343083c4fe..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTables/sheet_XDataPilotTables.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDataPilotTables" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDataPilotTables
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim DSC As Object
-    Dim DSCcreated As Boolean
-    Dim count As Long
-
-    Test.StartMethod("createDataPilotDescriptor()")
-    bOK = true
-    DSC = oObj.createDataPilotDescriptor()
-    bOK = bOK AND not isNull(DSC)
-    DSCcreated = bOK
-    Test.MethodTested("createDataPilotDescriptor()", bOK)
-
-    Test.StartMethod("insertNewByName()")
-    bOK = true
-    if (DSCcreated) then
-        count = oObj.Count
-        Dim Address As New com.sun.star.table.CellAddress
-        Address.Sheet = 0
-        Address.Column = 10
-        Address.Row = 10
-        oObj.insertNewByName(cIfcShortName &amp; "insertNewByName", Address, DSC)
-        bOK = bOK AND oObj.Count = count + 1
-    end if
-    Test.MethodTested("insertNewByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    if (DSCcreated) then
-        count = oObj.Count
-        oObj.removeByName(cIfcShortName &amp; "insertNewByName")
-        bOK = oObj.Count = count - 1
-    end if
-    Test.MethodTested("removeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/script.xlb
deleted file mode 100644
index 9bc02996a2a8..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDataPilotTablesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDataPilotTablesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/sheet_XDataPilotTablesSupplier.xba b/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/sheet_XDataPilotTablesSupplier.xba
deleted file mode 100644
index fd7bb7476312..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDataPilotTablesSupplier/sheet_XDataPilotTablesSupplier.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDataPilotTablesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDataPilotTablesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getDataPilotTables()")
-    bOK = true
-    oDPT = oObj.getDataPilotTables()
-    bOK = bOK AND hasUnoInterfaces(oDPT, "com.sun.star.sheet.XDataPilotTables")
-    Test.MethodTested("getDataPilotTables()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/script.xlb
deleted file mode 100644
index 0211247cd414..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDatabaseRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDatabaseRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/sheet_XDatabaseRange.xba b/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/sheet_XDatabaseRange.xba
deleted file mode 100644
index be1d5b906306..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRange/sheet_XDatabaseRange.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDatabaseRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDatabaseRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldDA, oSD, oFD, oID, oSTD As Object
-    Dim newDA As New com.sun.star.table.CellRangeAddress
-
-    Test.StartMethod("getDataArea()")
-    Test.StartMethod("setDataArea()")
-    bOK = true
-    oldDA = oObj.getDataArea()
-    newDA.Sheet = 0
-    newDA.StartColumn = 5
-    newDA.StartRow = 6
-    newDA.EndColumn = 10
-    newDA.EndRow = 8
-    oObj.setDataArea(newDA)
-    bOK = bOK AND oObj.getDataArea().Sheet = newDA.Sheet
-    bOK = bOK AND oObj.getDataArea().StartColumn = newDA.StartColumn
-    bOK = bOK AND oObj.getDataArea().StartRow = newDA.StartRow
-    bOK = bOK AND oObj.getDataArea().EndColumn = newDA.EndColumn
-    bOK = bOK AND oObj.getDataArea().EndRow = newDA.EndRow
-    oObj.setDataArea(oldDA)
-    Test.MethodTested("getDataArea()", bOK)
-    Test.MethodTested("setDataArea()", bOK)
-
-    Test.StartMethod("getSortDescriptor()")
-    bOK = true
-    oSD = oObj.getSortDescriptor()
-    bOK = bOK AND isArray(oSD)
-    Test.MethodTested("getSortDescriptor()", bOK)
-
-    Test.StartMethod("getFilterDescriptor()")
-    bOK = true
-    oFD = oObj.getFilterDescriptor()
-    bOK = bOK AND hasUnoInterfaces(oFD, "com.sun.star.sheet.XSheetFilterDescriptor")
-    Test.MethodTested("getFilterDescriptor()", bOK)
-
-    Test.StartMethod("getSubTotalDescriptor()")
-    bOK = true
-    oSTD = oObj.getSubTotalDescriptor()
-    bOK = bOK AND hasUnoInterfaces(oSTD, "com.sun.star.sheet.XSubTotalDescriptor")
-    Test.MethodTested("getSubTotalDescriptor()", bOK)
-
-    Test.StartMethod("getImportDescriptor()")
-    bOK = true
-    oID = oObj.getImportDescriptor()
-    bOK = bOK AND isArray(oID)
-    Test.MethodTested("getImportDescriptor()", bOK)
-
-    Test.StartMethod("refresh()")
-    bOK = true
-    oObj.refresh()
-    Test.MethodTested("refresh()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/script.xlb
deleted file mode 100644
index 19f153f7d2f3..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XDatabaseRanges" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XDatabaseRanges"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/sheet_XDatabaseRanges.xba b/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/sheet_XDatabaseRanges.xba
deleted file mode 100644
index c3d645b8f486..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XDatabaseRanges/sheet_XDatabaseRanges.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XDatabaseRanges" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XDatabaseRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCount As Integer
-    Dim aRange As New com.sun.star.table.CellRangeAddress
-
-    Test.StartMethod("addNewByName()")
-    bOK = true
-    nCount = oObj.Count
-    aRange.Sheet = 0
-    aRange.StartRow = 3
-    aRange.StartColumn = 4
-    aRange.EndRow = 10
-    aRange.EndColumn = 7
-    oObj.addNewByName(cIfcShortName, aRange)
-    bOK = bOK AND oObj.Count = nCount + 1
-    Test.MethodTested("addNewByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName(cIfcShortName)
-    bOK = bOK AND oObj.Count = nCount
-    Test.MethodTested("removeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/script.xlb
deleted file mode 100644
index 62b8a0e946bc..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XFunctionDescriptions" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XFunctionDescriptions"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/sheet_XFunctionDescriptions.xba b/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/sheet_XFunctionDescriptions.xba
deleted file mode 100644
index 3499cf8146ef..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XFunctionDescriptions/sheet_XFunctionDescriptions.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XFunctionDescriptions" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XFunctionDescriptions
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim fId,count As Long
-    Dim fName As String
-    Dim funct As Object
-    Dim i,j As Long
-
-    Test.StartMethod("getById()")
-    bOK = true
-    count = oObj.count
-    Dim retfunct() As Variant
-    for i = 0 to count - 1
-        funct = oObj.getByIndex(i)
-        for j = 0 to ubound(funct)
-            if funct(j).Name = "Name" then fName = funct(j).Value
-            if funct(j).Name = "Id" then fId = funct(j).Value
-        next j
-        Out.Log("Function " &amp; i &amp; ") " &amp; fName &amp; " has Id = " &amp; fId)
-        retfunct = oObj.getById(fId)
-        for j = 0 to ubound(retfunct)
-            if retfunct(j).Name = "Name" then bOK = bOK AND retfunct(j).Value = fName
-        next j
-    next i
-    Test.MethodTested("getById()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/script.xlb
deleted file mode 100644
index f1b385ebbd9b..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XHeaderFooterContent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XHeaderFooterContent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/sheet_XHeaderFooterContent.xba b/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/sheet_XHeaderFooterContent.xba
deleted file mode 100644
index e280923d62b0..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XHeaderFooterContent/sheet_XHeaderFooterContent.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XHeaderFooterContent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cLeftText As String
-'     - Global cCenterText As String
-'     - Global cRightText As String
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XHeaderFooterContent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oText As Object
-
-    Test.StartMethod("getLeftText()")
-    bOK = true
-    oText = oObj.getLeftText()
-    bOK = bOK AND hasUnoInterfaces(oText, "com.sun.star.text.XText")
-    Out.Log("Text is '" &amp; oText.String &amp; "'")
-    bOK = bOK AND oText.String = cLeftText
-    Test.MethodTested("getLeftText()", bOK)
-
-    Test.StartMethod("getCenterText()")
-    bOK = true
-    oText = oObj.getCenterText()
-    bOK = bOK AND hasUnoInterfaces(oText, "com.sun.star.text.XText")
-    Out.Log("Text is '" &amp; oText.String &amp; "'")
-    bOK = bOK AND oText.String = cCenterText
-    Test.MethodTested("getCenterText()", bOK)
-
-    Test.StartMethod("getRightText()")
-    bOK = true
-    oText = oObj.getRightText()
-    bOK = bOK AND hasUnoInterfaces(oText, "com.sun.star.text.XText")
-    Out.Log("Text is '" &amp; oText.String &amp; "'")
-    bOK = bOK AND oText.String = cRightText
-    Test.MethodTested("getRightText()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XLabelRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XLabelRange/script.xlb
deleted file mode 100644
index 8c8d2b1bc8b5..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XLabelRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XLabelRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XLabelRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XLabelRange/sheet_XLabelRange.xba b/qadevOOo/tests/basic/ifc/sheet/XLabelRange/sheet_XLabelRange.xba
deleted file mode 100644
index 312cc52aef76..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XLabelRange/sheet_XLabelRange.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XLabelRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XLabelRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK, bAllOK As Boolean
-    Dim oldArea, newArea As Object
-    Dim Area As New com.sun.star.table.CellRangeAddress
-
-    Test.StartMethod("getLabelArea()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getLabelArea())
-    Test.MethodTested("getLabelArea()", bOK)
-
-    bAllOK = bAllOK AND bOK
-
-    Test.StartMethod("setLabelArea()")
-    bOK = true
-
-    Area.Sheet = 0
-    Area.StartColumn = 1
-    Area.StartRow = 1
-    Area.EndColumn = 5
-    Area.EndRow = 5
-
-    oldArea = oObj.getLabelArea()
-    oObj.setLabelArea(Area)
-    newArea = oObj.getLabelArea()
-    bOK = bOK AND NOT isNULL(newArea)
-
-    bOK = bOK AND newArea.Sheet = Area.Sheet
-    bOK = bOK AND newArea.StartColumn = Area.StartColumn
-    bOK = bOK AND newArea.StartRow = Area.StartRow
-    bOK = bOK AND newArea.EndColumn = Area.EndColumn
-    bOK = bOK AND newArea.EndRow = Area.EndRow
-
-    oObj.setLabelArea(oldArea)
-    Test.MethodTested("setLabelArea()", bOK)
-
-    Test.StartMethod("getDataArea()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getDataArea())
-    Test.MethodTested("getDataArea()", bOK)
-
-    Test.StartMethod("setDataArea()")
-    bOK = true
-
-    Area.Sheet = 0
-    Area.StartColumn = 1
-    Area.StartRow = 1
-    Area.EndColumn = 5
-    Area.EndRow = 5
-
-    oldArea = oObj.getDataArea()
-    oObj.setDataArea(Area)
-    newArea = oObj.getDataArea()
-    bOK = bOK AND NOT isNULL(newArea)
-
-    bOK = bOK AND newArea.Sheet = Area.Sheet
-    bOK = bOK AND newArea.StartColumn = Area.StartColumn
-    bOK = bOK AND newArea.StartRow = Area.StartRow
-    bOK = bOK AND newArea.EndColumn = Area.EndColumn
-    bOK = bOK AND newArea.EndRow = Area.EndRow
-
-    oObj.setDataArea(oldArea)
-    Test.MethodTested("setDataArea()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/script.xlb
deleted file mode 100644
index d465b388bf8e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XLabelRanges" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XLabelRanges"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/sheet_XLabelRanges.xba b/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/sheet_XLabelRanges.xba
deleted file mode 100644
index bd8b9b817ece..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XLabelRanges/sheet_XLabelRanges.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XLabelRanges" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XLabelRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim count As Integer
-    Dim RangeAddress1 As New com.sun.star.table.CellRangeAddress
-    Dim RangeAddress2 As New com.sun.star.table.CellRangeAddress
-
-    Test.StartMethod("addNew()")
-    bOK = true
-
-    count = oObj.count
-    RangeAddress1.Sheet = 0
-    RangeAddress1.StartColumn = 2
-    RangeAddress1.StartRow = 3
-    RangeAddress1.EndColumn = 4
-    RangeAddress1.EndRow = 5
-
-    RangeAddress2.Sheet = 0
-    RangeAddress2.StartColumn = 6
-    RangeAddress2.StartRow = 7
-    RangeAddress2.EndColumn = 8
-    RangeAddress2.EndRow = 9
-    oObj.AddNew(RangeAddress1, RangeAddress2)
-
-    bOK = bOK AND count = oObj.count - 1
-    Test.MethodTested("addNew()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-
-    count = oObj.count
-    oObj.removeByIndex(count - 1)
-
-    bOK = bOK AND (count = oObj.count + 1)
-    Test.MethodTested("removeByIndex()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XNamedRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XNamedRange/script.xlb
deleted file mode 100644
index 85dfce8cddf2..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XNamedRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XNamedRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XNamedRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XNamedRange/sheet_XNamedRange.xba b/qadevOOo/tests/basic/ifc/sheet/XNamedRange/sheet_XNamedRange.xba
deleted file mode 100644
index 69ef24c93c5c..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XNamedRange/sheet_XNamedRange.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XNamedRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XNamedRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldContent, newContent As String
-    Dim position, oldPosition As Object
-    Dim newPosition As New com.sun.star.table.CellAddress
-    Dim oldType, newType As Long
-
-    Test.StartMethod("getContent()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getContent())
-    Test.MethodTested("getContent()", bOK)
-
-    Test.StartMethod("setContent()")
-    bOK = true
-    oldContent = oObj.getContent
-    newContent = cIfcShortName
-    oObj.setContent(newContent)
-    bOK = bOK AND (oldContent &lt;&gt; oObj.getContent)
-    oObj.setContent(oldContent)
-    Test.MethodTested("setContent()", bOK)
-
-    Test.StartMethod("getReferencePosition()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getReferencePosition())
-    Test.MethodTested("getReferencePosition()", bOK)
-
-    Test.StartMethod("setReferencePosition()")
-    bOK = true
-    oldPosition = oObj.getReferencePosition()
-
-    newPosition.sheet = oldPosition.sheet
-    newPosition.row = oldPosition.row + 1
-    newPosition.column = oldPosition.column + 1
-    oObj.setReferencePosition(newPosition)
-    position = oObj.getReferencePosition()
-
-    bOK = bOK AND NOT isNULL(position)
-    bOK = bOK AND position.Row &lt;&gt; oldPosition.row
-    bOK = bOK AND position.Column &lt;&gt; oldPosition.Column
-
-    oObj.setReferencePosition(oldPosition)
-    Test.MethodTested("setReferencePosition()", bOK)
-
-    Test.StartMethod("getType()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getType)
-    Test.MethodTested("getType()", bOK)
-
-    Test.StartMethod("setType()")
-    bOK = true
-    oldType = oObj.getType()
-    newType = oldType XOR com.sun.star.sheet.NamedRangeFlag.PRINT_AREA
-    oObj.setType(newType)
-    bOK = bOK AND (oldType &lt;&gt; oObj.getType())
-    oObj.setType(oldType)
-    Test.MethodTested("setType()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/script.xlb
deleted file mode 100644
index fc871518b603..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XNamedRanges" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XNamedRanges"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/sheet_XNamedRanges.xba b/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/sheet_XNamedRanges.xba
deleted file mode 100644
index e7da70d5be52..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XNamedRanges/sheet_XNamedRanges.xba
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XNamedRanges" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XNamedRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim count As Integer
-    Dim outRange As New com.sun.star.table.CellAddress
-    Dim range As New com.sun.star.table.CellRangeAddress
-    Dim i As Integer
-
-    Test.StartMethod("addNewByName()")
-    bOK = true
-    outRange.Sheet = 0
-    outRange.Row = 1
-    outRange.Column = 1
-    count = oObj.Count
-    oObj.addNewByName(cIfcShortName, "T4:Y7", outRange, 0)
-    bOK = bOK AND oObj.count = count + 1
-    bOK = bOK AND oObj.hasByName(cIfcShortName)
-    Test.MethodTested("addNewByName()", bOK)
-
-    Test.StartMethod("addNewFromTitles()")
-    bOK = true
-    count = oObj.count
-
-    range.Sheet = 0
-    range.StartRow = 1
-    range.StartColumn = 2
-    range.EndRow = 3
-    range.EndColumn = 4
-
-    for i = 1 to 5
-        oDoc.Sheets(0).getCellByPosition(i, 1).String = "Col" &amp; i
-    next i
-
-    oObj.addNewFromTitles(range, com.sun.star.sheet.Border.TOP)
-
-    bOK = bOK AND (oObj.count = count + 3)
-
-    bOK = bOK AND NOT oObj.hasByName("Col1")
-    bOK = bOK AND oObj.hasByName("Col2")
-    bOK = bOK AND oObj.hasByName("Col3")
-    bOK = bOK AND oObj.hasByName("Col4")
-    bOK = bOK AND NOT oObj.hasByName("Col5")
-    Test.MethodTested("addNewFromTitles()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    count = oObj.Count
-    oObj.removeByName(cIfcShortName)
-    bOK = bOK AND (count = oObj.count + 1)
-    bOK = bOK AND NOT oObj.hasByName(cIfcShortName)
-    Test.MethodTested("removeByName()", bOK)
-
-    Test.StartMethod("outputList()")
-    bOK = true
-    outRange.Sheet = 0
-    outRange.Row = 5
-    outRange.Column = 5
-
-    count = oObj.count
-    for i = 4 to 5 + count
-        oDoc.Sheets(0).getCellByPosition(5, i).String = "a"
-        oDoc.Sheets(0).getCellByPosition(6, i).String = "b"
-    next i
-
-    oObj.outputList(outRange)
-
-    bOK = bOK AND oDoc.Sheets(0).getCellByPosition(5, 4).String = "a"
-    bOK = bOK AND oDoc.Sheets(0).getCellByPosition(6, 4).String = "b"
-    bOK = bOK AND oDoc.Sheets(0).getCellByPosition(5, 5 + count).String = "a"
-    bOK = bOK AND oDoc.Sheets(0).getCellByPosition(6, 5 + count).String = "b"
-
-    for i = 5 to 4 + count
-        bOK = bOK AND oDoc.Sheets(0).getCellByPosition(5, i).String &lt;&gt; "a"
-        bOK = bOK AND oDoc.Sheets(0).getCellByPosition(6, i).String &lt;&gt; "b"
-        bOK = bOK AND oObj.hasByName(oDoc.Sheets(0).getCellByPosition(5, i).String)
-    next i
-
-    Test.MethodTested("outputList()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/script.xlb
deleted file mode 100644
index 3ae59e9d0b50..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XRecentFunctions" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XRecentFunctions"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/sheet_XRecentFunctions.xba b/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/sheet_XRecentFunctions.xba
deleted file mode 100644
index dbc114a848e4..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XRecentFunctions/sheet_XRecentFunctions.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XRecentFunctions" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global AllFunctions As Variant
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XRecentFunctions
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim recentFunctions As Variant
-    Dim i, j As Integer
-    Dim props As Variant
-
-
-    Test.StartMethod("getRecentFunctionIds()")
-    bOK = true
-    recentFunctions = oObj.getRecentFunctionIds()
-    bOK = bOK AND NOT isNULL(recentFunctions)
-    bOK = bOK AND ubound(recentFunctions) &lt;= oObj.getMaxRecentFunctions
-    for i = 0 to ubound(recentFunctions) - 1
-        for j = i + 1 to ubound(recentFunctions)
-            if recentFunctions(i) = recentFunctions(j) then bOK = false
-        next j
-    next i
-    Test.MethodTested("getRecentFunctionIds()", bOK)
-
-    Test.StartMethod("setRecentFunctionIds()")
-    bOK = true
-    Dim Max As Integer
-    Max = oObj.getMaxRecentFunctions
-    Dim newList(Max) As Integer
-
-    for i = 0 to ubound(newList())
-        props = AllFunctions.getByIndex(i)
-        for j = 0 to ubound(props())
-            if props(j).Name = "Id" then
-                newList(i) = props(j).Value
-                exit for
-            end if
-        next j
-    next i
-
-    oObj.setRecentFunctionIds(newList())
-    bOK = bOK AND (Max = oObj.getMaxRecentFunctions)
-    Test.MethodTested("setRecentFunctionIds()", bOK)
-
-    Test.StartMethod("getMaxRecentFunctions()")
-    bOK = true
-    Max = oObj.getMaxRecentFunctions
-    Out.Log("MaxRecentFunctions = " &amp; Max)
-    bOK = bOK AND Max &gt; 0
-    Test.MethodTested("getMaxRecentFunctions()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XScenarios/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XScenarios/script.xlb
deleted file mode 100644
index 27edd15fbc85..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XScenarios/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XScenarios" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XScenarios"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XScenarios/sheet_XScenarios.xba b/qadevOOo/tests/basic/ifc/sheet/XScenarios/sheet_XScenarios.xba
deleted file mode 100644
index f700d2c2bf7c..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XScenarios/sheet_XScenarios.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XScenarios" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XScenarios
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCount As Integer
-    Dim aCRA(1) As New com.sun.star.table.CellRangeAddress
-
-    aCRA(0).Sheet = 0       : aCRA(1).Sheet = 0
-    aCRA(0).StartColumn = 3 : aCRA(1).StartColumn = 13
-    aCRA(0).StartRow = 4    : aCRA(1).StartRow = 14
-    aCRA(0).EndColumn = 8   : aCRA(1).EndColumn = 18
-    aCRA(0).EndRow = 9      : aCRA(1).EndRow = 19
-
-    Test.StartMethod("addNewByName()")
-    bOK = true
-    nCount = oObj.getCount()
-    Out.Log("Initialy there are " &amp; nCount &amp; " scenarios.")
-    oObj.addNewByName("NewScenario", aCRA(), "New comment")
-    Out.Log("After inserting there are " &amp; oObj.getCount() &amp; " scenarios.")
-    bOK = bOK AND oObj.getCount() = nCount + 1
-    Test.MethodTested("addNewByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName("NewScenario")
-    Out.Log("After removing there are " &amp; oObj.getCount() &amp; " scenarios.")
-    bOK = bOK AND oObj.getCount() = nCount
-    Test.MethodTested("removeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/script.xlb
deleted file mode 100644
index 51fbaf29311e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XScenariosSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XScenariosSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/sheet_XScenariosSupplier.xba b/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/sheet_XScenariosSupplier.xba
deleted file mode 100644
index 678b06532a20..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XScenariosSupplier/sheet_XScenariosSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XScenariosSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XScenariosSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getScenarios()")
-    bOK = true
-    oScen = oObj.getScenarios()
-    bOK = bOK AND NOT isNULL(oScen)
-    bOK = bOK AND hasUnoInterfaces(oScen, "com.sun.star.sheet.XScenarios")
-    Test.MethodTested("getScenarios()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/script.xlb
deleted file mode 100644
index a00e77a3e5c5..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetAnnotation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetAnnotation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/sheet_XSheetAnnotation.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/sheet_XSheetAnnotation.xba
deleted file mode 100644
index 2278f4bb7d0d..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotation/sheet_XSheetAnnotation.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetAnnotation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetAnnotation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal, newVal, valToSet As Boolean
-    Dim vPos As Variant
-
-    Test.StartMethod("getAuthor()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getAuthor()) = 8)
-    Test.MethodTested("getAuthor()", bOK)
-
-    Test.StartMethod("getDate()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getDate()) = 8)
-    Test.MethodTested("getDate()", bOK)
-
-    Test.StartMethod("getIsVisible()")
-    Test.StartMethod("setIsVisible()")
-    bOK = true
-    oldVal = oObj.getIsVisible()
-    Out.Log("value before: " + oldVal)
-    if oldVal then 
-        valToSet = false
-    else
-        valToSet = true
-    endif
-    Out.Log("setting value: " + valToSet)
-    oObj.setIsVisible(valToSet)
-    newVal = oObj.getIsVisible()
-    Out.Log("value after: " + newVal)
-    bOK = bOK AND (oObj.getIsVisible() = valToSet)
-    Test.MethodTested("getIsVisible()", bOK)
-    Test.MethodTested("setIsVisible()", bOK)
-
-    Test.StartMethod("getPosition()")
-    bOK = true
-    vPos = oObj.getPosition()
-    bOK = bOK AND isNumeric(vPos.Column)
-    Test.MethodTested("getPosition()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/script.xlb
deleted file mode 100644
index 6625ff875cc8..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetAnnotations" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetAnnotations"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/sheet_XSheetAnnotations.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/sheet_XSheetAnnotations.xba
deleted file mode 100644
index 8c2a3a05eeec..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotations/sheet_XSheetAnnotations.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetAnnotations" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetAnnotations
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aPos As New com.sun.star.table.CellAddress
-    Dim nCount As Integer    
-
-    Test.StartMethod("insertNew()")
-    bOK = true
-    nCount = oObj.Count
-    aPos.Sheet = 1
-    aPos.Row = 2
-    aPos.Column = 3
-    oObj.insertNew(aPos, cIfcShortName)
-    bOK = bOK AND (oObj.Count = nCount + 1)
-    Test.MethodTested("insertNew()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(0)
-    bOK = bOK AND (oObj.Count = nCount)
-    Test.MethodTested("removeByIndex()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/script.xlb
deleted file mode 100644
index 405fe71bf16a..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetAnnotationsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetAnnotationsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/sheet_XSheetAnnotationsSupplier.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/sheet_XSheetAnnotationsSupplier.xba
deleted file mode 100644
index 226b12b238ec..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetAnnotationsSupplier/sheet_XSheetAnnotationsSupplier.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetAnnotationsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetAnnotationsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getAnnotations()")
-    bOK = true
-    oAnno = oObj.getAnnotations()
-    bOK = bOK AND hasUnoInterfaces(oAnno, "com.sun.star.sheet.XSheetAnnotations")
-    Test.MethodTested("getAnnotations()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/script.xlb
deleted file mode 100644
index 9d3c2f6875fd..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetCellCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetCellCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/sheet_XSheetCellCursor.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/sheet_XSheetCellCursor.xba
deleted file mode 100644
index 436e88fc983b..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellCursor/sheet_XSheetCellCursor.xba
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetCellCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetCellCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCols As Integer, nRows As Long
-    Dim ResetCols As Integer, ResetRows As Long
-    Dim oRange As Variant
-
-    ResetCols = oObj.getColumns().getCount()
-    ResetRows = oObj.getRows().getCount()
-
-    Test.StartMethod("collapseToCurrentRegion()")
-    bOK = true
-    oObj.collapseToCurrentRegion()
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols &gt; 0) AND (nRows &gt; 0)
-    Out.Log("collapseToCurrentRegion(): nCols = " &amp; nCols &amp; "(&gt;0) nRows = " &amp; nRows &amp; "(&gt;0)")
-    Test.MethodTested("collapseToCurrentRegion()", bOK)
-
-    'collapseToMergedArea goes into the area. But you must be insite
-    ' of one cell of these area
-    Test.StartMethod("collapseToMergedArea()")
-    bOK = true
-    oObj.collapseToSize(5,6)
-    oRange = oObj.getCellRangeByPosition(0,0,2,2)
-    oRange.merge(true)
-    oObj.gotoStart()
-    oObj.collapseToMergedArea()
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols = 3) AND (nRows = 3)
-    Out.Log("collapseToMergedArea(): nCols = " &amp; nCols &amp; "(3) nRows = " &amp; nRows &amp; "(3)")
-    Test.MethodTested("collapseToMergedArea()", bOK)
-    oRange.merge(false)
-
-
-    Test.StartMethod("collapseToSize()")
-    bOK = true
-    oObj.collapseToSize(5,6)
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols = 5 ) AND (nRows = 6)
-    Out.Log("collapseToSize(): nCols = " &amp; nCols &amp; "(5) nRows = " &amp; nRows &amp; "(6)")
-    Test.MethodTested("collapseToSize()", bOK)
-
-    Test.StartMethod("collapseToCurrentArray()")
-    oObj.collapseToSize(5,6)
-    oRange = oObj.getCellRangeByPosition(0,0,2,3)
-    oRange.setArrayFormula("A1:A3")
-    bOK = true
-    oObj.collapseToCurrentArray()
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols = 3) AND (nRows = 4)
-    Out.Log("collapseToCurrentArray(): nCols = " &amp; nCols &amp; "(3) nRows = " &amp; nRows &amp; "(4)")
-    Test.MethodTested("collapseToCurrentArray()", bOK)
-    oRange.setArrayFormula("")
-
-
-    Test.StartMethod("expandToEntireColumns()")
-    bOK = true
-    oObj.collapseToSize(1,1)
-    oObj.expandToEntireColumns()
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols = 1) AND (nRows &gt;= 32000)
-    Out.Log("expandToEntireColumns(): nCols = " &amp; nCols &amp; "(1) nRows = " &amp; nRows &amp; "(&gt;=32000)")
-    Test.MethodTested("expandToEntireColumns()", bOK)
-
-    Test.StartMethod("expandToEntireRows()")
-    bOK = true
-    oObj.collapseToSize(1,1)
-    oObj.expandToEntireRows()
-    nCols = oObj.getColumns().getCount()
-    nRows = oObj.getRows().getCount()
-    bOK = bOK AND (nCols &gt;= 256) AND (nRows = 1)
-    Out.Log("expandToEntireRows(): nCols = " &amp; nCols &amp; "(&gt;=256) nRows = " &amp; nRows &amp; "(1)")
-    Test.MethodTested("expandToEntireRows()", bOK)
-
-
-    Out.Log("Reset to old range: " &amp; ResetCols &amp; "," &amp; ResetRows)
-    oObj.collapseToSize(ResetCols, ResetRows)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/script.xlb
deleted file mode 100644
index c161cc4a0128..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetCellRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetCellRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/sheet_XSheetCellRange.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/sheet_XSheetCellRange.xba
deleted file mode 100644
index abfb9155ad5b..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRange/sheet_XSheetCellRange.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetCellRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetCellRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet As Object
-
-    Test.StartMethod("getSpreadsheet()")
-    bOK = true
-    oSheet = oObj.getSpreadsheet()
-    bOK = bOK AND hasUnoInterfaces(oSheet, "com.sun.star.sheet.XSpreadsheet")
-    Test.MethodTested("getSpreadsheet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/script.xlb
deleted file mode 100644
index 77b18f7f6f93..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetCellRangeContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetCellRangeContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/sheet_XSheetCellRangeContainer.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/sheet_XSheetCellRangeContainer.xba
deleted file mode 100644
index 18def92467cd..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRangeContainer/sheet_XSheetCellRangeContainer.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetCellRangeContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetCellRangeContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim newAddress As New com.sun.star.table.CellRangeAddress
-    Dim newAddress1 As New com.sun.star.table.CellRangeAddress
-    Dim newAddresses(1) As Variant
-    Dim nCount As Integer
-
-    Test.StartMethod("addRangeAddress()")
-    Test.StartMethod("removeRangeAddress()")
-    bOK = true
-    nCount = oObj.getCount()
-    newAddress.Sheet = 0
-    newAddress.StartColumn = 15 : newAddress.EndColumn = 18
-    newAddress.StartRow    = 15 : newAddress.EndRow    = 16
-    oObj.addRangeAddress(newAddress, false)
-    bOK = bOK AND oObj.getCount() = nCount + 1
-    oObj.removeRangeAddress(newAddress)
-    bOK = bOK AND oObj.getCount() = nCount
-    Test.MethodTested("addRangeAddress()", bOK)
-    Test.MethodTested("removeRangeAddress()", bOK)
-
-
-    Test.StartMethod("addRangeAddresses()")
-    Test.StartMethod("removeRangeAddresses()")
-    bOK = true
-    newAddress1.Sheet = 0
-    newAddress1.StartColumn = 20 : newAddress1.EndColumn = 30
-    newAddress1.StartRow    = 20 : newAddress1.EndRow    = 20
-    newAddresses(0) = newAddress
-    newAddresses(1) = newAddress1
-    oObj.addRangeAddresses(newAddresses(), false)
-    bOK = bOK AND oObj.getCount() = nCount + 2
-    oObj.removeRangeAddresses(newAddresses())
-    bOK = bOK AND oObj.getCount() = nCount
-    Test.MethodTested("removeRangeAddresses()", bOK)
-    Test.MethodTested("addRangeAddresses()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/script.xlb
deleted file mode 100644
index 46814879c917..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetCellRanges" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetCellRanges"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/sheet_XSheetCellRanges.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/sheet_XSheetCellRanges.xba
deleted file mode 100644
index 2f1b076933ed..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCellRanges/sheet_XSheetCellRanges.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetCellRanges" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetCellRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCells, oRanges As Variant
-    Dim cRanges As String
-
-    Test.StartMethod("getCells()")
-    bOK = true
-    oCells = oObj.getCells()
-    bOK = bOK AND hasUnoInterfaces(oCells, "com.sun.star.container.XEnumerationAccess")
-    Test.MethodTested("getCells()", bOK)
-
-    Test.StartMethod("getRangeAddressesAsString()")
-    bOK = true
-    cRanges = oObj.getRangeAddressesAsString()
-    Out.Log("Returned ranges are : '" &amp; cRanges &amp; "'")
-    bOK = bOK AND inStr(1, cRanges, "Sheet")
-    Test.MethodTested("getRangeAddressesAsString()", bOK)
-
-    Test.StartMethod("getRangeAddresses()")
-    bOK = true
-    oRanges = oObj.getRangeAddresses()
-    bOK = bOK AND (oRanges(ubound(oRanges)).StartColumn &lt;&gt; 0 OR _
-                   oRanges(ubound(oRanges)).StartRow &lt;&gt; 0 OR _
-                   oRanges(ubound(oRanges)).EndRow &lt;&gt; 0 OR _
-                   oRanges(ubound(oRanges)).EndColumn &lt;&gt; 0 OR _
-                   oRanges(ubound(oRanges)).Sheet &lt;&gt; 0)
-    Test.MethodTested("getRangeAddresses()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/script.xlb
deleted file mode 100644
index 9d983d5cf384..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetCondition" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetCondition"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/sheet_XSheetCondition.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/sheet_XSheetCondition.xba
deleted file mode 100644
index 9215c1e80c1e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetCondition/sheet_XSheetCondition.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetCondition" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetCondition
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldOperator As Variant
-    Dim oldFormula As String
-    Dim oPos As com.sun.star.table.CellAddress
-    Dim newPos As New com.sun.star.table.CellAddress
-
-    Test.StartMethod("setOperator()")
-    Test.StartMethod("getOperator()")
-    bOK = true
-    oldOperator = oObj.getOperator()
-    oObj.setOperator(com.sun.star.sheet.ConditionOperator.LESS)
-    bOK = bOK AND oObj.getOperator() &lt;&gt; oldOperator
-    oObj.setOperator(oldOperator)
-    Test.MethodTested("getOperator()", bOK)
-    Test.MethodTested("setOperator()", bOK)
-
-    Test.StartMethod("getFormula1()")
-    Test.StartMethod("setFormula1()")
-    bOK = true
-    oldFormula = oObj.getFormula1()
-    oObj.setFormula1("1")
-    bOK = bOK AND oObj.getFormula1() = "1"
-    oObj.setFormula1(oldFormula)
-    Test.MethodTested("getFormula1()", bOK)
-    Test.MethodTested("setFormula1()", bOK)
-
-    Test.StartMethod("getFormula2()")
-    Test.StartMethod("setFormula2()")
-    bOK = true
-    oldFormula = oObj.getFormula2()
-    oObj.setFormula2("2")
-    bOK = bOK AND oObj.getFormula2() = "2"
-    oObj.setFormula2(oldFormula)
-    Test.MethodTested("getFormula2()", bOK)
-    Test.MethodTested("setFormula2()", bOK)
-
-    Test.StartMethod("getSourcePosition()")
-    Test.StartMethod("setSourcePosition()")
-    bOK = true
-    oPos = oObj.getSourcePosition()
-    bOK = bOK AND oPos.Column &gt;= 0
-    newPos.Sheet = oPos.Sheet
-    newPos.Column = oPos.Column + 1
-    newPos.Row = oPos.Row + 1
-    oObj.setSourcePosition(newPos)
-    bOK = bOK AND oObj.getSourcePosition().Column = oPos.Column + 1
-    Test.MethodTested("getSourcePosition()", bOK)
-    Test.MethodTested("setSourcePosition()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/script.xlb
deleted file mode 100644
index 098e6c0ffc95..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetConditionalEntries" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetConditionalEntries"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/sheet_XSheetConditionalEntries.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/sheet_XSheetConditionalEntries.xba
deleted file mode 100644
index 88be1a8e4d6f..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntries/sheet_XSheetConditionalEntries.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetConditionalEntries" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetConditionalEntries
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nNum As Integer
-    Dim aConditionalEntry(0) As New com.sun.star.beans.PropertyValue
-
-    Test.StartMethod("addNew()")
-    bOK = true
-    nNum = oObj.Count
-    oObj.addNew(aConditionalEntry())
-    bOK = bOK AND nNum = oObj.Count - 1
-    Test.MethodTested("addNew()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(0)
-    bOK = bOK AND nNum = oObj.Count
-    Test.MethodTested("removeByIndex()", bOK)
-
-    Test.StartMethod("clear()")
-    bOK = true
-    oObj.clear()
-    bOK = bOK AND oObj.Count = 0
-    Test.MethodTested("clear()", bOK)
-
-    ReCreateObj()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/script.xlb
deleted file mode 100644
index b4e0c725f364..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetConditionalEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetConditionalEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/sheet_XSheetConditionalEntry.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/sheet_XSheetConditionalEntry.xba
deleted file mode 100644
index 334657127ec1..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetConditionalEntry/sheet_XSheetConditionalEntry.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetConditionalEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetConditionalEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cName, cName1 As String
-
-    Test.StartMethod("getStyleName()")
-    Test.StartMethod("setStyleName()")
-    bOK = true
-    cName = oObj.getStyleName()
-    Out.Log("Style name is '" &amp; cName &amp; "'")
-    oObj.setStyleName(cIfcShortName)
-    cName1 = oObj.getStyleName()
-    Out.Log("Style name is '" &amp; cName1 &amp; "'")
-    bOK = bOK AND cName1 &lt;&gt; cName
-    oObj.setStyleName(cName)
-    Test.MethodTested("getStyleName()", bOK)
-    Test.MethodTested("setStyleName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/script.xlb
deleted file mode 100644
index c3f3a5da4331..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetFilterDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetFilterDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/sheet_XSheetFilterDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/sheet_XSheetFilterDescriptor.xba
deleted file mode 100644
index 6b2824138913..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetFilterDescriptor/sheet_XSheetFilterDescriptor.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetFilterDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetFilterDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal, objVal As Object
-    Dim newVal(0) As New com.sun.star.sheet.TableFilterField
-    
-
-    Test.StartMethod("getFilterFields()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getFilterFields())
-    Test.MethodTested("getFilterFields()", bOK)
-
-    Test.StartMethod("setFilterFields()")
-    bOK = true
-    oldVal = oObj.getFilterFields()
-    newVal(0).Field = 0
-    newVal(0).isNumeric = true
-    newVal(0).Operator = com.sun.star.sheet.FilterOperator.GREATER_EQUAL
-    newVal(0).NumericValue = 99
-    newVal(0).Connection = com.sun.star.sheet.FilterConnection.AND
-    oObj.setFilterFields(newVal())
-    objVal = oObj.getFilterFields()
-    bOK = bOK AND (ubound(objVal) = 0) AND (objVal(0).NumericValue = 99)
-    Test.MethodTested("setFilterFields()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/script.xlb
deleted file mode 100644
index aa560324cc77..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetOperation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetOperation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/sheet_XSheetOperation.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/sheet_XSheetOperation.xba
deleted file mode 100644
index 65df94719702..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetOperation/sheet_XSheetOperation.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetOperation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetOperation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCompute As Long
-
-    Test.StartMethod("computeFunction()")
-    bOK = true
-    nCompute = oObj.computeFunction(com.sun.star.sheet.GeneralFunction.COUNT)
-    bOK = bOK AND (nCompute &gt;= 0)
-    Test.MethodTested("computeFunction()", bOK)
-
-    Test.StartMethod("clearContents()")
-    bOK = true
-    oObj.clearContents(com.sun.star.sheet.CellFlags.VALUE)
-    nCompute= oObj.computeFunction(com.sun.star.sheet.GeneralFunction.COUNT)
-    bOK = bOK AND (nCompute = 0)
-    Test.MethodTested("clearContents()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/script.xlb
deleted file mode 100644
index 4894c78c3242..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSheetPageBreak" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSheetPageBreak"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/sheet_XSheetPageBreak.xba b/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/sheet_XSheetPageBreak.xba
deleted file mode 100644
index 493557926c14..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSheetPageBreak/sheet_XSheetPageBreak.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSheetPageBreak" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSheetPageBreak
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nColsBreaks As Integer
-    Dim nRowsBreaks As Integer
-    Dim oColumn As Object
-    Dim oRow As Object
-    Dim oPBs As Variant
-    Dim iRowsBefore As Integer
-    Dim iColsBefore As Integer
-
-    iColsBefore = ubound(oObj.getColumnPageBreaks()) - 1
-    iRowsBefore = ubound(oObj.getRowPageBreaks()) - 1
-
-    Out.Log("Before test: colBreaks: " &amp; iColsBefore &amp; _
-                        " rowBreaks: " &amp; iRowsBefore)
-
-    Out.Log("Inserting new PageBreaks.")
-    oColumn = oObj.Columns.getByIndex(5)
-    oColumn.SetPropertyValue("IsStartOfNewPage", true)
-    oRow = oObj.Rows.getByIndex(15)
-    oRow.SetPropertyValue("IsStartOfNewPage", true)
-
-    Test.StartMethod("getColumnPageBreaks()")
-    bOK = true
-    oPBs = oObj.getColumnPageBreaks()
-    nColsBreaks = uBound(oPBs)
-    Out.Log("There are " &amp; nColsBreaks &amp; " column breaks.")
-    bOK = bOK AND nColsBreaks &gt; 0
-    bOK = bOK AND oPBs(0).Position &gt;= 0
-    Test.MethodTested("getColumnPageBreaks()", bOK)
-
-    Test.StartMethod("getRowPageBreaks()")
-    bOK = true
-    oPBs = oObj.getRowPageBreaks()
-    nRowsBreaks = uBound(oPBs)
-    Out.Log("There are " &amp; nRowsBreaks &amp; " row breaks.")
-    bOK = bOK AND nRowsBreaks &gt; 0
-    bOK = bOK AND oPBs(0).Position &gt;= 0
-    Test.MethodTested("getRowPageBreaks()", bOK)
-
-    Test.StartMethod("removeAllManualPageBreaks()")
-    bOK = true
-    oObj.removeAllManualPageBreaks()
-    Out.Log("After test: colBreaks: " &amp; ubound(oObj.getColumnPageBreaks()) - 1 &amp; _
-                       " rowBreaks: " &amp; ubound(oObj.getRowPageBreaks()) - 1)
-
-    bOK = bOK AND ubound(oObj.getRowPageBreaks()) - 1 = iRowsBefore
-    bOK = bOK AND ubound(oObj.getColumnPageBreaks()) - 1= iColsBefore
-    Test.MethodTested("removeAllManualPageBreaks()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/script.xlb
deleted file mode 100644
index 629d421c08c1..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSpreadsheet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSpreadsheet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/sheet_XSpreadsheet.xba b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/sheet_XSpreadsheet.xba
deleted file mode 100644
index 2ada541ca50e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheet/sheet_XSpreadsheet.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSpreadsheet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSpreadsheet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createCursor()")
-    bOK = true
-    oCur = oObj.createCursor()
-    bOK = bOK AND hasUnoInterfaces(oCur, "com.sun.star.sheet.XSheetCellCursor")
-    Test.MethodTested("createCursor()", bOK)
-
-    Test.StartMethod("createCursorByRange()")
-    bOK = true
-    oCur = oObj.createCursorByRange(oObj)
-    bOK = bOK AND hasUnoInterfaces(oCur, "com.sun.star.sheet.XSheetCellCursor")
-    Test.MethodTested("createCursorByRange()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/script.xlb
deleted file mode 100644
index 7a9f4d13b24e..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSpreadsheetDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSpreadsheetDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/sheet_XSpreadsheetDocument.xba b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/sheet_XSpreadsheetDocument.xba
deleted file mode 100644
index 1624ad932211..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetDocument/sheet_XSpreadsheetDocument.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSpreadsheetDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSpreadsheetDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheets As Object
-
-    Test.StartMethod("getSheets()")
-    bOK = true
-    oSheets = oObj.getSheets
-    bOK = bOK AND ((NOT isNULL(oSheets)) AND (oSheets.count &gt; 0))
-    Test.MethodTested("getSheets()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/script.xlb
deleted file mode 100644
index 57b477800e29..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSpreadsheetView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSpreadsheetView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/sheet_XSpreadsheetView.xba b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/sheet_XSpreadsheetView.xba
deleted file mode 100644
index 55dac404bf79..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheetView/sheet_XSpreadsheetView.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSpreadsheetView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oActivableSheet As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSpreadsheetView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oActiveSheet, oNewSheet, oNewActiveSheet As Object
-    Dim cString As String
-
-    Test.StartMethod("getActiveSheet()")
-    bOK = true
-    oActiveSheet = oObj.getActiveSheet()
-    bOK = bOK AND NOT isNULL(oActiveSheet)
-    Test.MethodTested("getActiveSheet()", bOK)
-
-    Test.StartMethod("setActiveSheet()")
-    bOK = true
-    oNewSheet = oDoc.createInstance("com.sun.star.sheet.Spreadsheet")
-    oDoc.Sheets.insertByName("ActiveSheet", oNewSheet)
-
-    oActiveSheet = oObj.getActiveSheet()
-
-    cString = oActiveSheet.getCellByPosition(1, 1).String &amp; " on New Sheet"
-    oNewSheet.getCellByPosition(1, 1).String = cString
-    oObj.setActiveSheet(oNewSheet)
-
-    oNewActiveSheet = oObj.getActiveSheet()
-
-    bOK = bOK AND oNewActiveSheet.Name = "ActiveSheet"
-    bOK = bOK AND oNewActiveSheet.getCellByPosition(1, 1).String = cString
-
-    oDoc.Sheets.removeByName("ActiveSheet")
-
-    Test.MethodTested("setActiveSheet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/script.xlb
deleted file mode 100644
index c51159812739..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSpreadsheets" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSpreadsheets"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/sheet_XSpreadsheets.xba b/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/sheet_XSpreadsheets.xba
deleted file mode 100644
index 2391c87df0c1..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSpreadsheets/sheet_XSpreadsheets.xba
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSpreadsheets" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global nGlobalLong As Long the number of sheets
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSpreadsheets
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim l As Integer
-    Dim sname As String
-    Dim oSheet1, oSheet2 As Object
-
-
-    Test.StartMethod("insertNewByName()")
-    bOK = true
-    for l = 1 to nGlobalLong
-        sname = cIfcShortName &amp; CStr(l)
-        oObj.insertNewByName(sname, l)
-        oSheet1 = oObj.getByName(sname)
-        oSheet2 = oObj.getByIndex(l)
-        bOK = bOK AND NOT isNull(oSheet1)
-        bOK = bOK AND NOT isNull(oSheet2)
-        if (bOK) then
-            bOK = bOK and oSheet1.name = oSheet2.name
-        end if
-    next l
-    Test.MethodTested("insertNewByName()", bOK)
-
-    Test.StartMethod("copyByName()")
-    bOK = true
-    l = 1
-    sname = cIfcShortName &amp; "COPY"
-    oObj.copyByName(cIfcShortName &amp; CStr(l), sname, l )
-    oSheet1 = oObj.getByName(sname)
-    oSheet2 = oObj.getByIndex(l)
-    bOK = bOK AND NOT isNull(oSheet1)
-    bOK = bOK AND NOT isNull(oSheet2)
-    if (bOK) then
-        bOK = bOK AND oSheet1.name = oSheet2.name
-    end if
-    Test.MethodTested("copyByName()", bOK)
-
-    Test.StartMethod("moveByName()")
-    bOK = true
-    l = 1
-    sname = cIfcShortName &amp; "2"
-    oObj.moveByName(sname, l)
-    oSheet1 = oObj.getByName(sname)
-    oSheet2 = oObj.getByIndex(l)
-    bOK = bOK AND NOT isNull(oSheet1)
-    bOK = bOK AND NOT isNull(oSheet2)
-    if (bOK) then
-        bOK = bOK AND oSheet1.name = oSheet2.name
-    end if
-    Out.Log(cIfcShortName &amp; ":" &amp; "#1 - " &amp; bOK)
-
-    sname = cIfcShortName &amp; "COPY"
-    l = nGlobalLong + 1
-    oObj.moveByName(sname, l)
-    l = l - 1
-    oSheet1 = oObj.getByName(sname)
-    oSheet2 = oObj.getByIndex(l)
-    bOK = bOK AND NOT isNull(oSheet1)
-    bOK = bOK AND NOT isNull(oSheet2)
-    if (bOK) then
-        bOK = bOK and oSheet1.name =oSheet2.name
-    end if
-    Test.MethodTested("moveByName()", bOK)
-
-    nGlobalLong = nGlobalLong * 2 + 1 ' nGlobalLong : 3 default sheets where already there
-                                      ' nGlobalLong have been inserted
-                                      ' + 1 has been created by Copy
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/script.xlb
deleted file mode 100644
index 537bf6eddab9..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSubTotalDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSubTotalDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/sheet_XSubTotalDescriptor.xba b/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/sheet_XSubTotalDescriptor.xba
deleted file mode 100644
index 907b6299de86..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSubTotalDescriptor/sheet_XSubTotalDescriptor.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSubTotalDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSubTotalDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim count As Integer
-
-    Test.StartMethod("addNew()")
-    bOK = true
-    count = oObj.Count
-
-    Out.Log("Before addNew() there are " &amp; count &amp; " elements")
-
-    Dim SubTotalCol(0) As New com.sun.star.sheet.SubTotalColumn
-    SubTotalCol(0).Column = 7
-    SubTotalCol(0).Function = com.sun.star.sheet.GeneralFunction.SUM
-
-    oObj.addNew(SubTotalCol(), 1)
-
-    bOK = bOK AND oObj.count = count + 1
-    Out.Log("After addNew() there are " &amp; oObj.Count &amp; " elements")
-    Test.MethodTested("addNew()", bOK)
-
-    Test.StartMethod("clear()")
-    bOK = true
-    oObj.clear()
-    bOK = bOK AND oObj.Count = 0
-    Test.MethodTested("clear()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/script.xlb
deleted file mode 100644
index b938a580a566..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XSubTotalField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XSubTotalField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/sheet_XSubTotalField.xba b/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/sheet_XSubTotalField.xba
deleted file mode 100644
index 9e5c0324dfee..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XSubTotalField/sheet_XSubTotalField.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XSubTotalField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XSubTotalField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldCol, newCol As Integer
-    Dim SubTotalCol(1) As New com.sun.star.sheet.SubTotalColumn
-
-    Test.StartMethod("getGroupColumn()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getGroupColumn())
-    Test.MethodTested("getGroupColumn()", bOK)
-
-    Test.StartMethod("setGroupColumn()")
-    bOK = true
-    oldCol = oObj.getGroupColumn()
-    newCol = oldCol + 1
-    oObj.setGroupColumn(newCol)
-    bOK = bOK AND (oldCol &lt;&gt; oObj.getGroupColumn())
-    oObj.setGroupColumn(oldCol)
-    Test.MethodTested("setGroupColumn()", bOK)
-
-    Test.StartMethod("getSubTotalColumns()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getSubTotalColumns())
-    Test.MethodTested("getSubTotalColumns()", bOK)
-
-    Test.StartMethod("setSubTotalColumns()")
-    bOK = true
-    SubTotalCol(0).Column = 1
-    SubTotalCol(0).Function = com.sun.star.sheet.GeneralFunction.AVERAGE
-    SubTotalCol(1).Column = 2
-    SubTotalCol(1).Function = com.sun.star.sheet.GeneralFunction.SUM
-    oObj.setSubTotalColumns(SubTotalCol())
-    bOK = bOK AND ubound(oObj.getSubTotalColumns()) = 1
-    Test.MethodTested("setSubTotalColumns()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/script.xlb
deleted file mode 100644
index b2e8ad029c89..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XUsedAreaCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XUsedAreaCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/sheet_XUsedAreaCursor.xba b/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/sheet_XUsedAreaCursor.xba
deleted file mode 100644
index 4ac4e48941f6..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XUsedAreaCursor/sheet_XUsedAreaCursor.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XUsedAreaCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XUsedAreaCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nStartSCol, nStartECol As Integer
-    Dim nStartSRow, nStartERow As Long
-    Dim nEndSCol, nEndECol As Integer
-    Dim nEndSRow, nEndERow As Long
-    Dim oAddress As Object
-
-    Test.StartMethod("gotoStartOfUsedArea()")
-    bOK = true
-    oObj.gotoStartOfUsedArea(true)
-    oAddress = oObj.getRangeAddress()
-    nStartSCol = oAddress.StartColumn
-    nStartECol = oAddress.EndColumn
-    nStartSRow = oAddress.StartRow
-    nStartERow = oAddress.EndRow
-
-    Test.StartMethod("gotoEndOfUsedArea()")
-    bOK = true
-    oObj.gotoEndOfUsedArea(true)
-    oAddress = oObj.getRangeAddress()
-    nEndSCol = oAddress.StartColumn
-    nEndECol = oAddress.EndColumn
-    nEndSRow = oAddress.StartRow
-    nEndERow = oAddress.EndRow
-
-    'get the results
-    bOK = bOK AND ((nStartSCol &lt;&gt; nEndSCol) OR (nStartECol &lt;&gt; nEndECol) OR _
-                     (nStartSRow &lt;&gt; nEndSRow) OR (nStartERow &lt;&gt; nEndERow))
-
-    Test.MethodTested("gotoStartOfUsedArea()", bOK)
-    Test.MethodTested("gotoEndOfUsedArea()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/script.xlb
deleted file mode 100644
index 251284d32141..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XViewFreezable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XViewFreezable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/sheet_XViewFreezable.xba b/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/sheet_XViewFreezable.xba
deleted file mode 100644
index f1b48399ed44..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewFreezable/sheet_XViewFreezable.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XViewFreezable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XViewFreezable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("freezeAtPosition()")
-    bOK = true
-    ' Only one of XViewSplitable::getIsWindowSplit() and
-    '             XViewFreezable::hasFrozenPanes() can be true
-
-    oObj.SplitAtPosition(100, 100)
-    bOK = bOK AND oObj.getIsWindowSplit()
-    oObj.freezeAtPosition(0, 10)
-    bOK = bOK AND NOT oObj.getIsWindowSplit()
-    Test.MethodTested("freezeAtPosition()", bOK)
-
-    Test.StartMethod("hasFrozenPanes()")
-    bOK = true
-    oObj.freezeAtPosition(3, 0)
-    bOK = bOK AND oObj.hasFrozenPanes()
-    oObj.SplitAtPosition(100, 100)
-    bOK = bOK AND NOT oObj.hasFrozenPanes()
-    Test.MethodTested("hasFrozenPanes()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewPane/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XViewPane/script.xlb
deleted file mode 100644
index 59b8e6c28258..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewPane/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XViewPane" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XViewPane"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewPane/sheet_XViewPane.xba b/qadevOOo/tests/basic/ifc/sheet/XViewPane/sheet_XViewPane.xba
deleted file mode 100644
index 86be1f937a3c..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewPane/sheet_XViewPane.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XViewPane" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XViewPane
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nCol, nRow As Integer
-    Dim oRange As Object
-
-    Test.StartMethod("getFirstVisibleColumn()")
-    Test.StartMethod("setFirstVisibleColumn()")
-    bOK = true
-    nCol = oObj.getFirstVisibleColumn()
-    oObj.setFirstVisibleColumn(nCol + 4)
-    bOK = bOK AND nCol = oObj.getFirstVisibleColumn() - 4
-    Test.MethodTested("getFirstVisibleColumn()", bOK)
-    Test.MethodTested("setFirstVisibleColumn()", bOK)
-
-    Test.StartMethod("getFirstVisibleRow()")
-    Test.StartMethod("setFirstVisibleRow()")
-    bOK = true
-    nRow = oObj.getFirstVisibleRow()
-    oObj.setFirstVisibleRow(nRow + 4)
-    bOK = bOK AND nRow = oObj.getFirstVisibleRow() - 4
-    Test.MethodTested("getFirstVisibleRow()", bOK)
-    Test.MethodTested("setFirstVisibleRow()", bOK)
-
-    Test.StartMethod("getVisibleRange()")
-    bOK = true
-    oRange = oObj.getVisibleRange()
-    bOK = bOK AND NOT isNULL(oRange)
-    bOK = bOK AND oRange.StartColumn = nCol + 4
-    bOK = bOK AND oRange.StartRow = nRow + 4
-    Test.MethodTested("getVisibleRange()", bOK)
-
-    ' We have to re-create object, as it's was referred range was changed here.
-    DisposeObj()
-    CreateObj()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/script.xlb b/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/script.xlb
deleted file mode 100644
index 62ab086ba658..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sheet_XViewSplitable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sheet_XViewSplitable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/sheet_XViewSplitable.xba b/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/sheet_XViewSplitable.xba
deleted file mode 100644
index b9d25b417916..000000000000
--- a/qadevOOo/tests/basic/ifc/sheet/XViewSplitable/sheet_XViewSplitable.xba
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sheet_XViewSplitable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Dim XSplitPos As Long
-Dim YSplitPos As Long
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.sheet.XViewSplitable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("splitAtPosition()")
-    bOK = true
-    ' Only one of XViewSplitable::getIsWindowSplit() and
-    '             XViewFreezable::hasFrozenPanes() can be true
-
-    oObj.freezeAtPosition(10, 10)
-    bOK = bOK AND oObj.hasFrozenPanes()
-    SplitAt(100, 200)
-    bOK = bOK AND NOT oObj.hasFrozenPanes()
-    Test.MethodTested("splitAtPosition()", bOK)
-
-    Test.StartMethod("getIsWindowSplit()")
-    bOK = true
-    SplitAt(0, 0)
-    bOK = bOK AND NOT oObj.getIsWindowSplit()
-    SplitAt(50, 50)
-    bOK = bOK AND oObj.getIsWindowSplit()
-
-    Test.MethodTested("getIsWindowSplit()", bOK)
-
-    Test.StartMethod("getSplitHorizontal()")
-    bOK = true
-    SplitAt(0, 0)
-    bOK = bOK AND oObj.getSplitHorizontal() = XSplitPos
-    SplitAt(0, 100)
-    bOK = bOK AND oObj.getSplitHorizontal() = XSplitPos
-    SplitAt(100, 0)
-    bOK = bOK AND oObj.getSplitHorizontal() = XSplitPos
-    SplitAt(100, 100)
-    bOK = bOK AND oObj.getSplitHorizontal() = XSplitPos
-    Test.MethodTested("getSplitHorizontal()", bOK)
-
-    Test.StartMethod("getSplitVertical()")
-    bOK = true
-    SplitAt(0, 0)
-    bOK = bOK AND oObj.getSplitVertical() = YSplitPos
-    SplitAt(100, 0)
-    bOK = bOK AND oObj.getSplitVertical() = YSplitPos
-    SplitAt(100, 100)
-    bOK = bOK AND oObj.getSplitVertical() = YSplitPos
-    SplitAt(0, 100)
-    bOK = bOK AND oObj.getSplitVertical() = YSplitPos
-    Test.MethodTested("getSplitVertical()", bOK)
-
-    Test.StartMethod("getSplitColumn()")
-    bOK = true
-    SplitAt(0, 0)
-    bOK = bOK AND oObj.getSplitColumn() = 0
-    SplitAt(0, 100)
-    bOK = bOK AND oObj.getSplitColumn() = 0
-    SplitAt(100, 100)
-    bOK = bOK AND oObj.getSplitColumn() &lt;&gt; 0
-    SplitAt(100, 0)
-    bOK = bOK AND oObj.getSplitColumn() &lt;&gt; 0
-    Test.MethodTested("getSplitColumn()", bOK)
-
-    Test.StartMethod("getSplitRow()")
-    bOK = true
-    SplitAt(0, 0)
-    bOK = bOK AND oObj.getSplitRow() = 0
-    SplitAt(100, 0)
-    bOK = bOK AND oObj.getSplitRow() = 0
-    SplitAt(100, 100)
-    bOK = bOK AND oObj.getSplitRow() &lt;&gt; 0
-    SplitAt(0, 100)
-    bOK = bOK AND oObj.getSplitRow() &lt;&gt; 0
-    Test.MethodTested("getSplitRow()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub SplitAt(x As Long, y As Long)
-    Out.Log("Spliting At position (" &amp; x &amp; ", " &amp; y &amp; ")")
-    oObj.SplitAtPosition(x, y)
-    XSplitPos = x
-    YSplitPos = y
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterProperties/script.xlb b/qadevOOo/tests/basic/ifc/style/CharacterProperties/script.xlb
deleted file mode 100644
index 8fba4931cf47..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_CharacterProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_CharacterProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterProperties/style_CharacterProperties.xba b/qadevOOo/tests/basic/ifc/style/CharacterProperties/style_CharacterProperties.xba
deleted file mode 100644
index 48805b3691ed..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterProperties/style_CharacterProperties.xba
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_CharacterProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.CharacterProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oStyleFamilies, oCharStyles As Variant
-
-    PropertyTester.TestProperty("CharFontName")
-
-    PropertyTester.TestProperty("CharFontStyleName")
-
-    Dim aFamilys(6) As Integer
-    with com.sun.star.awt.FontFamily
-        aFamilys(0) = .DONTKNOW
-        aFamilys(1) = .DECORATIVE
-        aFamilys(2) = .MODERN
-        aFamilys(3) = .ROMAN
-        aFamilys(4) = .SCRIPT
-        aFamilys(5) = .SWISS
-        aFamilys(6) = .SYSTEM
-    end with
-    PropertyTester.TestProperty("CharFontFamily",aFamilys())
-
-    Dim aCharSetArray(10) As Integer
-    with com.sun.star.awt.CharSet
-        aCharSetArray(0) = .DONTKNOW
-        aCharSetArray(1) = .ANSI
-        aCharSetArray(2) = .MAC
-        aCharSetArray(3) = .IBMPC_437
-        aCharSetArray(4) = .IBMPC_850
-        aCharSetArray(5) = .IBMPC_860
-        aCharSetArray(6) = .IBMPC_861
-        aCharSetArray(7) = .IBMPC_863
-        aCharSetArray(8) = .IBMPC_865
-        aCharSetArray(9) = .SYSTEM
-        aCharSetArray(10) = .SYMBOL
-    end with
-
-    PropertyTester.TestProperty("CharFontCharSet",aCharSetArray())
-
-    Dim aFontPitchArray(3) As Integer
-    with com.sun.star.awt.FontPitch
-        aFontPitchArray(0) = .DONTKNOW
-        aFontPitchArray(1) = .FIXED
-        aFontPitchArray(2) = .VARIABLE
-    end with
-    PropertyTester.TestProperty("CharFontPitch",aFontPitchArray())
-
-    PropertyTester.TestProperty("CharColor")
-
-    Dim vCharEsc (0 to 4) As Integer
-    vCharEsc(0) = -100
-    vCharEsc(1) = 100
-    vCharEsc(2) = -63
-    vCharEsc(3) = 76
-    vCharEsc(4) = 0
-    PropertyTester.TestProperty("CharEscapement",vCharEsc())
-
-    Dim aHeightArray(3) As Double
-    aHeightArray(0) = 10
-    aHeightArray(1) = 20.1
-    aHeightArray(2) = 25.2
-    aHeightArray(3) = 30.3
-    PropertyTester.TestProperty("CharHeight",aHeightArray())
-
-    Dim aUnderlineArray(18) As Integer
-    with com.sun.star.awt.FontUnderline
-        aUnderlineArray(0) = .NONE
-        aUnderlineArray(1) = .SINGLE
-        aUnderlineArray(2) = .DOUBLE
-        aUnderlineArray(3) = .DOTTED
-        aUnderlineArray(4) = .DONTKNOW
-        aUnderlineArray(5) = .DASH
-        aUnderlineArray(6) = .LONGDASH
-        aUnderlineArray(7) = .DASHDOT
-        aUnderlineArray(8) = .DASHDOTDOT
-        aUnderlineArray(9) = .SMALLWAVE
-        aUnderlineArray(10) = .WAVE
-        aUnderlineArray(11) = .DOUBLEWAVE
-        aUnderlineArray(12) = .BOLD
-        aUnderlineArray(13) = .BOLDDOTTED
-        aUnderlineArray(14) = .BOLDDASH
-        aUnderlineArray(15) = .BOLDLONGDASH
-        aUnderlineArray(16) = .BOLDDASHDOT
-        aUnderlineArray(17) = .BOLDDASHDOTDOT
-        aUnderlineArray(18) = .BOLDWAVE
-    end with
-    PropertyTester.TestProperty("CharUnderline",aUnderlineArray())
-
-    Dim aWeightArray(9) As Integer
-    with com.sun.star.awt.FontWeight
-        aWeightArray(0) = .DONTKNOW
-        aWeightArray(1) = .THIN
-        aWeightArray(2) = .ULTRALIGHT
-        aWeightArray(3) = .LIGHT
-        aWeightArray(4) = .SEMILIGHT
-        aWeightArray(5) = .NORMAL
-        aWeightArray(6) = .SEMIBOLD
-        aWeightArray(7) = .BOLD
-        aWeightArray(8) = .ULTRABOLD
-        aWeightArray(9) = .BLACK
-    end with
-
-    PropertyTester.TestProperty("CharWeight",aWeightArray())
-
-    PropertyTester.TestProperty("CharPosture")
-
-    PropertyTester.TestProperty("CharAutoKerning")
-
-    PropertyTester.TestProperty("CharBackColor")
-
-    PropertyTester.TestProperty("CharBackTransparent")
-
-    Dim aCaseMaps(4) As Integer
-    with com.sun.star.style.CaseMap
-        aCaseMaps(0) = .NONE
-        aCaseMaps(1) = .UPPERCASE
-        aCaseMaps(2) = .LOWERCASE
-        aCaseMaps(3) = .TITLE
-        aCaseMaps(4) = .SMALLCAPS
-    end with
-    PropertyTester.TestProperty("CharCaseMap",aCaseMaps())
-
-    PropertyTester.TestProperty("CharCrossedOut")
-
-    PropertyTester.TestProperty("CharFlash")
-
-    Dim aStrikeoutArray(6) As Integer
-    with com.sun.star.awt.FontStrikeout
-        aStrikeoutArray(0) = .NONE
-        aStrikeoutArray(1) = .SINGLE
-        aStrikeoutArray(2) = .DOUBLE
-        aStrikeoutArray(3) = .DONTKNOW
-        aStrikeoutArray(4) = .BOLD
-        aStrikeoutArray(5) = .SLASH
-        aStrikeoutArray(6) = .X
-    end with
-    PropertyTester.TestProperty("CharStrikeout",aStrikeoutArray())
-
-    PropertyTester.TestProperty("CharWordMode")
-
-    PropertyTester.TestProperty("CharKerning")
-
-    PropertyTester.TestProperty("CharLocale")
-
-    PropertyTester.TestProperty("CharKeepTogether")
-
-    PropertyTester.TestProperty("CharNoLineBreak")
-
-    PropertyTester.TestProperty("CharShadowed")
-
-    PropertyTester.TestProperty("CharFontType")
-
-    PropertyTester.TestProperty("CharContoured")
-
-    PropertyTester.TestProperty("CharCombineIsOn")
-
-    oObj.setPropertyValue("CharCombineIsOn", true)
-    Dim aPrifixes(1) As String
-    aPrifixes(0) = "("
-    aPrifixes(1) = "["
-    PropertyTester.TestProperty("CharCombinePrefix", aPrifixes())
-
-    Dim aSuffixes(1) As String
-    aSuffixes(0) = ")"
-    aSuffixes(1) = "]"
-    PropertyTester.TestProperty("CharCombineSuffix", aSuffixes())
-
-    Dim aCharEmphasizeArr(8) As Integer
-    with com.sun.star.text.FontEmphasis
-        aCharEmphasizeArr(0) = .NONE
-        aCharEmphasizeArr(1) = .DOT_ABOVE
-        aCharEmphasizeArr(2) = .CIRCLE_ABOVE
-        aCharEmphasizeArr(3) = .DISK_ABOVE
-        aCharEmphasizeArr(4) = .ACCENT_ABOVE
-        aCharEmphasizeArr(5) = .DOT_BELOW
-        aCharEmphasizeArr(6) = .CIRCLE_BELOW
-        aCharEmphasizeArr(7) = .DISK_BELOW
-        aCharEmphasizeArr(8) = .ACCENT_BELOW
-    end with
-    PropertyTester.TestProperty("CharEmphasize",aCharEmphasizeArr())
-
-    Dim aReliefs(2) As Integer
-    with com.sun.star.text.FontRelief
-        aReliefs(0) = .NONE
-        aReliefs(1) = .EMBOSSED
-        aReliefs(2) = .ENGRAVED
-    end with
-    PropertyTester.TestProperty("CharRelief",aReliefs())
-
-    PropertyTester.TestProperty("CharRotationIsFitToLine")
-
-    PropertyTester.TestProperty("CharScaleWidth")
-
-    Dim aRotat(2) As Integer
-    aRotat(0) = 900
-    aRotat(1) = 2700
-    aRotat(2) = 0
-    PropertyTester.TestProperty("CharRotation",aRotat())
-
-    PropertyTester.TestProperty("RubyText")
-
-    PropertyTester.TestProperty("RubyIsAbove")
-
-    Dim aAdjusts(5) As Integer
-    aAdjusts(0) = com.sun.star.text.RubyAdjust.LEFT
-    aAdjusts(1) = com.sun.star.text.RubyAdjust.CENTER
-    aAdjusts(2) = com.sun.star.text.RubyAdjust.RIGHT
-    aAdjusts(3) = com.sun.star.text.RubyAdjust.LEFT
-    aAdjusts(4) = com.sun.star.text.RubyAdjust.BLOCK
-    aAdjusts(5) = com.sun.star.text.RubyAdjust.INDENT_BLOCK
-    PropertyTester.TestProperty("RubyAdjust", aAdjusts())
-
-    Dim aCharStyleNames() As String
-    oStyleFamilies = oDoc.StyleFamilies
-    oCharStyles = oStyleFamilies.getByIndex(0)
-    aCharStyleNames() = oCharStyles.Elementnames()
-    aCharStyleNames(0) = aCharStyleNames(2) ' "Standard" the same as "", exclude it...
-
-    PropertyTester.TestProperty("RubyCharStyleName",aCharStyleNames())
-
-    PropertyTester.TestProperty("CharStyleName",aCharStyleNames())
-
-    PropertyTester.TestProperty("CharRotationIsFitToLine")
-    PropertyTester.TestProperty("CharScaleWidth")
-    PropertyTester.TestProperty("HyperLinkURL")
-    PropertyTester.TestProperty("HyperLinkTarget")
-    PropertyTester.TestProperty("HyperLinkName")
-
-	Dim nHeight(0 to 2) as Integer
-		nHeight(0)=1
-		nHeight(1)=33
-		nHeight(2)=100
-	PropertyTester.TestProperty("CharEscapementHeight", nHeight())
-
-    PropertyTester.TestProperty("CharNoHyphenation")
-    PropertyTester.TestProperty("CharUnderlineHasColor")
-	oObj.CharUnderlineHasColor = TRUE
-    PropertyTester.TestProperty("CharUnderlineColor")
-
-    ReCreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/script.xlb b/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/script.xlb
deleted file mode 100644
index 55654ebf43b4..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_CharacterPropertiesAsian" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_CharacterPropertiesAsian"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/style_CharacterPropertiesAsian.xba b/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/style_CharacterPropertiesAsian.xba
deleted file mode 100644
index 956cfe025e24..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesAsian/style_CharacterPropertiesAsian.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_CharacterPropertiesAsian" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.CharacterPropertiesAsian
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim charHeightAsian(3) As Double
-    charHeightAsian(0) = 12.3
-    charHeightAsian(1) = 16.2
-    charHeightAsian(2) = 26.6
-    charHeightAsian(3) = 42.8
-
-    Dim charWeightAsian(9) As Integer
-    with com.sun.star.awt.FontWeight
-        charWeightAsian(0) = .DONTKNOW
-        charWeightAsian(1) = .THIN
-        charWeightAsian(2) = .ULTRALIGHT
-        charWeightAsian(3) = .LIGHT
-        charWeightAsian(4) = .SEMILIGHT
-        charWeightAsian(5) = .NORMAL
-        charWeightAsian(6) = .SEMIBOLD
-        charWeightAsian(7) = .BOLD
-        charWeightAsian(8) = .ULTRABOLD
-        charWeightAsian(9) = .BLACK
-    end with
-
-    PropertyTester.TestProperty("CharHeightAsian",charHeightAsian())
-
-    PropertyTester.TestProperty("CharWeightAsian",charWeightAsian())
-
-    PropertyTester.TestProperty("CharFontNameAsian")
-
-    PropertyTester.TestProperty("CharFontStyleNameAsian")
-
-    PropertyTester.TestProperty("CharFontFamilyAsian")
-
-    PropertyTester.TestProperty("CharFontCharSetAsian")
-
-    PropertyTester.TestProperty("CharFontPitchAsian")
-
-    PropertyTester.TestProperty("CharPostureAsian")
-
-    PropertyTester.TestProperty("CharLocaleAsian")
-
-    PropertyTester.TestProperty("ParaIsCharacterDistance")
-
-    PropertyTester.TestProperty("ParaIsForbiddenRules")
-
-    PropertyTester.TestProperty("ParaIsHangingPunctuation")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/script.xlb b/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/script.xlb
deleted file mode 100644
index 47d057ab617b..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_CharacterPropertiesComplex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_CharacterPropertiesComplex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/style_CharacterPropertiesComplex.xba b/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/style_CharacterPropertiesComplex.xba
deleted file mode 100644
index 6ff647853299..000000000000
--- a/qadevOOo/tests/basic/ifc/style/CharacterPropertiesComplex/style_CharacterPropertiesComplex.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_CharacterPropertiesComplex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.CharacterPropertiesComplex
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim charHeightComplex(3) As Double
-    charHeightComplex(0) = 12.3
-    charHeightComplex(1) = 16.2
-    charHeightComplex(2) = 26.6
-    charHeightComplex(3) = 42.8
-
-    Dim charWeightComplex(9) As Integer
-    with com.sun.star.awt.FontWeight
-        charWeightComplex(0) = .DONTKNOW
-        charWeightComplex(1) = .THIN
-        charWeightComplex(2) = .ULTRALIGHT
-        charWeightComplex(3) = .LIGHT
-        charWeightComplex(4) = .SEMILIGHT
-        charWeightComplex(5) = .NORMAL
-        charWeightComplex(6) = .SEMIBOLD
-        charWeightComplex(7) = .BOLD
-        charWeightComplex(8) = .ULTRABOLD
-        charWeightComplex(9) = .BLACK
-    end with
-
-    PropertyTester.TestProperty("CharHeightComplex",charHeightComplex())
-
-    PropertyTester.TestProperty("CharWeightComplex",charWeightComplex())
-
-    PropertyTester.TestProperty("CharFontNameComplex")
-
-    PropertyTester.TestProperty("CharFontStyleNameComplex")
-
-    PropertyTester.TestProperty("CharFontFamilyComplex")
-
-    PropertyTester.TestProperty("CharFontCharSetComplex")
-
-    PropertyTester.TestProperty("CharFontPitchComplex")
-
-    PropertyTester.TestProperty("CharPostureComplex")
-
-    PropertyTester.TestProperty("CharLocaleComplex")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphProperties/script.xlb b/qadevOOo/tests/basic/ifc/style/ParagraphProperties/script.xlb
deleted file mode 100644
index 9a6f2064f777..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_ParagraphProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_ParagraphProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphProperties/style_ParagraphProperties.xba b/qadevOOo/tests/basic/ifc/style/ParagraphProperties/style_ParagraphProperties.xba
deleted file mode 100644
index 922c6fcec0a9..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphProperties/style_ParagraphProperties.xba
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_ParagraphProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.ParagraphProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    if hasUnoInterfaces(oObj, "com.sun.star.text.XTextRange") then
-        oObj.String = "This is an example string from ParagraphProperties..."
-    end if
-
-    Dim nParaAdjust(3) As Integer
-    nParaAdjust(0) = com.sun.star.style.ParagraphAdjust.LEFT
-    nParaAdjust(1) = com.sun.star.style.ParagraphAdjust.RIGHT
-    nParaAdjust(2) = com.sun.star.style.ParagraphAdjust.BLOCK
-    nParaAdjust(3) = com.sun.star.style.ParagraphAdjust.CENTER
-    ' STRETCH????
-
-    Dim nLastLineAdjust(2) As Integer
-    nLastLineAdjust(0) = com.sun.star.style.ParagraphAdjust.LEFT
-    nLastLineAdjust(1) = com.sun.star.style.ParagraphAdjust.BLOCK
-    nLastLineAdjust(2) = com.sun.star.style.ParagraphAdjust.CENTER
-    ' STRETCH????
-
-    Out.Log("Starting ...")
-
-    PropertyTester.TestProperty("ParaAdjust",nParaAdjust())
-
-    PropertyTester.TestProperty("ParaLineSpacing")
-
-    PropertyTester.TestProperty("ParaBackColor")
-
-    PropertyTester.TestProperty("ParaBackTransparent")
-
-    PropertyTester.TestProperty("ParaBackGraphicURL")
-
-    PropertyTester.TestProperty("ParaBackGraphicFilter")
-
-    PropertyTester.TestProperty("ParaBackGraphicLocation")
-
-    Out.Log("set ParaAdjust to com.sun.star.style.ParagraphAdjust.BLOCK")
-    oObj.ParaAdjust = com.sun.star.style.ParagraphAdjust.BLOCK
-    PropertyTester.TestProperty("ParaLastLineAdjust",nLastLineAdjust())
-    oObj.ParaAdjust = com.sun.star.style.ParagraphAdjust.LEFT
-
-    PropertyTester.TestProperty("ParaExpandSingleWord")
-
-    Dim margins(2) As Integer
-    margins(0) = 0
-    margins(1) = 50
-    margins(2) = 100
-
-    PropertyTester.TestProperty("ParaLeftMargin",margins())
-
-    PropertyTester.TestProperty("ParaRightMargin",margins())
-
-    PropertyTester.TestProperty("ParaTopMargin",margins())
-
-    PropertyTester.TestProperty("ParaBottomMargin",margins())
-
-    PropertyTester.TestProperty("ParaLineNumberCount")
-
-    PropertyTester.TestProperty("ParaLineNumberStartValue")
-
-    Dim cPageDescName(0 To 1) As String
-    cPageDescName(0) = "HTML"
-    cPageDescName(1) = "Standard"
-    PropertyTester.TestProperty("PageDescName",cPageDescName())
-
-    PropertyTester.TestProperty("PageNumberOffset")
-
-    PropertyTester.TestProperty("ParaRegisterModeActive")
-
-    PropertyTester.TestProperty("ParaTabStops")
-
-    Dim cParaStyleName(0 to 3) As String
-    cParaStyleName(0) = "Heading 1"
-    cParaStyleName(1) = "First line indent"
-    cParaStyleName(2) = "Text body"
-    cParaStyleName(3) = "Standard"
-    PropertyTester.TestProperty("ParaStyleName",cParaStyleName())
-
-    PropertyTester.TestProperty("DropCapFormat")
-
-    PropertyTester.TestProperty("DropCapWholeWord")
-
-    PropertyTester.TestProperty("ParaKeepTogether")
-
-    PropertyTester.TestProperty("ParaSplit")
-
-    Dim nLevel(0 to 1) As Integer
-    nLevel(0) = 3
-    nLevel(1) = 0
-    Out.Log("Set NumberingStyleName to 'List 2' "
-    if PropertyTester.isAvailable("NumberingStyleName") then
-        oObj.NumberingStyleName = "List 2"
-    end if
-    PropertyTester.TestProperty("NumberingLevel",nLevel())
-
-    PropertyTester.TestProperty("NumberingRules")
-
-    PropertyTester.TestProperty("NumberingStartValue")
-
-    PropertyTester.TestProperty("ParaIsNumberingRestart")
-
-    Dim cStyleName(0 to 1) As String
-    cStyleName(0) = "List 1"
-    cStyleName(1) = "Numbering 2"
-    PropertyTester.TestProperty("NumberingStyleName",cStyleName())
-
-    PropertyTester.TestProperty("ParaOrphans")
-
-    PropertyTester.TestProperty("ParaWidows")
-
-    PropertyTester.TestProperty("ParaShadowFormat")
-
-    PropertyTester.TestProperty("LeftBorder")
-
-    PropertyTester.TestProperty("RightBorder")
-
-    PropertyTester.TestProperty("TopBorder")
-
-    PropertyTester.TestProperty("BottomBorder")
-
-    PropertyTester.TestProperty("BorderDistance")
-
-    PropertyTester.TestProperty("LeftBorderDistance")
-
-    PropertyTester.TestProperty("RightBorderDistance")
-
-    PropertyTester.TestProperty("TopBorderDistance")
-
-    PropertyTester.TestProperty("BottomBorderDistance")
-
-    PropertyTester.TestProperty("BreakType")
-
-	Dim cCharStyles(1) as String
-	cCharStyles(0) = "Emphasis"
-	CCharStyles(1) = "Teletype"
-
-    PropertyTester.TestProperty("DropCapCharStyleName",cCharStyles())
-
-    PropertyTester.TestProperty("ParaFirstLineIndent")
-
-    PropertyTester.TestProperty("ParaIsAutoFirstLineIndent")
-
-    PropertyTester.TestProperty("ParaHyphenationMaxHyphens")
-
-    PropertyTester.TestProperty("ParaHyphenationMaxLeadingChars")
-
-    PropertyTester.TestProperty("ParaHyphenationMaxTrailingChars")
-
-	Dim VertAlign(0 to 4) as Integer
-	Dim nCount as Integer
-	for nCount = 0 to uBound(VertAlign())
-		VertAlign(nCount) = nCount
-	next nCount
-    PropertyTester.TestProperty("ParaVertAlignment", VertAlign())
-
-    PropertyTester.TestProperty("ParaUserDefinedAttributes")
-
-    PropertyTester.TestProperty("ParaIsHyphenation")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/script.xlb b/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/script.xlb
deleted file mode 100644
index 38149c374b1f..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_ParagraphPropertiesAsian" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="style_ParagraphPropertiesAsian"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/style_ParagraphPropertiesAsian.xba b/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/style_ParagraphPropertiesAsian.xba
deleted file mode 100644
index 887375db02b2..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesAsian/style_ParagraphPropertiesAsian.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_ParagraphPropertiesAsian" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.style.ParagraphPropertiesAsian
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-'
-    PropertyTester.TestProperty("ParaIsHangingPunctuation")
-
-    PropertyTester.TestProperty("ParaIsCharacterDistance")
-
-    PropertyTester.TestProperty("ParaIsForbiddenRules")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/script.xlb b/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/script.xlb
deleted file mode 100644
index e9f33ed0a38e..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_ParagraphPropertiesComplex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_ParagraphPropertiesComplex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/style_ParagraphPropertiesComplex.xba b/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/style_ParagraphPropertiesComplex.xba
deleted file mode 100644
index 45c0e719955b..000000000000
--- a/qadevOOo/tests/basic/ifc/style/ParagraphPropertiesComplex/style_ParagraphPropertiesComplex.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_ParagraphPropertiesComplex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.ParagraphPropertiesComplex
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim newVals As Variant
-    newVals = Array(0, 1, 2, 3, 4)
-    PropertyTester.TestProperty("WritingMode", newVals())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/Style/script.xlb b/qadevOOo/tests/basic/ifc/style/Style/script.xlb
deleted file mode 100644
index e38e0da873aa..000000000000
--- a/qadevOOo/tests/basic/ifc/style/Style/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_Style" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_Style"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/Style/style_Style.xba b/qadevOOo/tests/basic/ifc/style/Style/style_Style.xba
deleted file mode 100644
index e1e8f67685d9..000000000000
--- a/qadevOOo/tests/basic/ifc/style/Style/style_Style.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_Style" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.style.Style
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("IsPhysical")
-
-    PropertyTester.TestProperty("FollowStyle")
-
-    PropertyTester.TestProperty("DisplayName")
-
-    PropertyTester.TestProperty("IsAutoUpdate")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/XStyle/script.xlb b/qadevOOo/tests/basic/ifc/style/XStyle/script.xlb
deleted file mode 100644
index 359a7b3efb62..000000000000
--- a/qadevOOo/tests/basic/ifc/style/XStyle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_XStyle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_XStyle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/XStyle/style_XStyle.xba b/qadevOOo/tests/basic/ifc/style/XStyle/style_XStyle.xba
deleted file mode 100644
index 0e8b9c872be8..000000000000
--- a/qadevOOo/tests/basic/ifc/style/XStyle/style_XStyle.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_XStyle" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oStandartStyle As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.style.XStyle
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cName, cObjName As String
-
-    Test.StartMethod("isUserDefined()")
-    bOK = true
-    bOK = bOK AND oObj.isUserDefined() AND NOT oStandartStyle.isUserDefined()
-    Test.MethodTested("isUserDefined()", bOK)
-
-    Test.StartMethod("isInUse()")
-    bOK = true
-    bOK = bOK AND oObj.isInUse()
-    Test.MethodTested("isInUse()", bOK)
-
-    Test.StartMethod("setParentStyle()")
-    Test.StartMethod("getParentStyle()")
-    bOK = true
-    cName = oStandartStyle.Name
-    Out.Log("setting name to '" &amp; cName &amp; "'")
-    oObj.setParentStyle(cName)
-    cObjName = oObj.getParentStyle()
-    Out.Log("name is '" &amp; cObjName &amp; "'")
-    bOK = bOK AND cObjName = cName
-    Test.MethodTested("getParentStyle()", bOK)
-    Test.MethodTested("setParentStyle()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/script.xlb
deleted file mode 100644
index 3f55b2fa6d90..000000000000
--- a/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="style_XStyleFamiliesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="style_XStyleFamiliesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/style_XStyleFamiliesSupplier.xba b/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/style_XStyleFamiliesSupplier.xba
deleted file mode 100644
index 27ea60e95a47..000000000000
--- a/qadevOOo/tests/basic/ifc/style/XStyleFamiliesSupplier/style_XStyleFamiliesSupplier.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="style_XStyleFamiliesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.style.XStyleFamiliesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oFam As Object
-
-
-    Test.StartMethod("getStyleFamilies()")
-    bOK = true
-    oFam = oObj.getStyleFamilies()
-    bOK = NOT isNULL(oFam)
-    bOK = bOK AND hasUnoInterfaces(oFam, "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getStyleFamilies()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/system/XProxySettings/script.xlb b/qadevOOo/tests/basic/ifc/system/XProxySettings/script.xlb
deleted file mode 100644
index 8163d6b3f6db..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XProxySettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="system_XProxySettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="system_XProxySettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/system/XProxySettings/system_XProxySettings.xba b/qadevOOo/tests/basic/ifc/system/XProxySettings/system_XProxySettings.xba
deleted file mode 100644
index eef8f15c67de..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XProxySettings/system_XProxySettings.xba
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="system_XProxySettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.system.XProxySettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getFtpProxyAddress()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getFtpProxyAddress()) = 8)
-    Test.MethodTested("getFtpProxyAddress()", bOK)
-
-    Test.StartMethod("getFtpProxyPort()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getFtpProxyAddress()) = 8)
-    Test.MethodTested("getFtpProxyPort()", bOK)
-
-    Test.StartMethod("getGopherProxyAddress()")
-    bOK = true
-    bOK = bOK AND  (VarType(oObj.getGopherProxyAddress()) = 8)
-    Test.MethodTested("getGopherProxyAddress()", bOK)
-
-    Test.StartMethod("getGopherProxyPort()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getGopherProxyPort()) = 8)
-    Test.MethodTested("getGopherProxyPort()", bOK)
-
-    Test.StartMethod("getHttpProxyAddress()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getHttpProxyAddress()) = 8)
-    Test.MethodTested("getHttpProxyAddress()", bOK)
-
-    Test.StartMethod("getHttpProxyPort()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getHttpProxyPort()) = 8)
-    Test.MethodTested("getHttpProxyPort()", bOK)
-
-    Test.StartMethod("getHttpsProxyAddress()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getHttpsProxyAddress()) = 8)
-    Test.MethodTested("getHttpsProxyAddress()", bOK)
-
-    Test.StartMethod("getHttpsProxyPort()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getHttpsProxyPort()) = 8)
-    Test.MethodTested("getHttpsProxyPort()", bOK)
-
-    Test.StartMethod("getSocksProxyAddress()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getSocksProxyAddress()) = 8)
-    Test.MethodTested("getSocksProxyAddress()", bOK)
-
-    Test.StartMethod("getSocksProxyPort()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getSocksProxyPort()) = 8)
-    Test.MethodTested("getSocksProxyPort()", bOK)
-
-    Test.StartMethod("getProxyBypassAddress()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.getProxyBypassAddress()) = 8)
-    Test.MethodTested("getProxyBypassAddress()", bOK)
-
-    Test.StartMethod("isProxyEnabled()")
-    bOK = true
-    bOK = bOK AND (VarType(oObj.isProxyEnabled()) = 11)
-    Test.MethodTested("isProxyEnabled()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/script.xlb b/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/script.xlb
deleted file mode 100644
index f8c67fe40fa3..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="system_XSimpleMailClientSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="system_XSimpleMailClientSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/system_XSimpleMailClientSupplier.xba b/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/system_XSimpleMailClientSupplier.xba
deleted file mode 100644
index 4a0c280b014d..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XSimpleMailClientSupplier/system_XSimpleMailClientSupplier.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="system_XSimpleMailClientSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.system.XSimpleMailClientSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oClient As Object
-
-    Test.StartMethod("querySimpleMailClient()")
-    if (GetGuiType() = GUI_TYPE_WINDOWS) then
-        Out.Log("OS is Win : trying to query mail client ...")
-        bOK = isObject(oObj.querySimpleMailClient())
-    else
-        Out.Log("OS is not Win : service is not available.")
-        bOK = true
-    endif
-    Test.MethodTested("querySimpleMailClient()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/script.xlb b/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/script.xlb
deleted file mode 100644
index 92aa06663c82..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="system_XSystemShellExecute" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="system_XSystemShellExecute"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/system_XSystemShellExecute.xba b/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/system_XSystemShellExecute.xba
deleted file mode 100644
index 28ebd069b35a..000000000000
--- a/qadevOOo/tests/basic/ifc/system/XSystemShellExecute/system_XSystemShellExecute.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="system_XSystemShellExecute" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - java existing in PATH system var and 
-'       SystemShellExecute.class file in docs dir
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.system.XSystemShellExecute
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cResFile As String, cResURL As String, cClassPath As String
-    Dim oFacc As Object
-    Dim bExist As Boolean, i As Integer
-    Dim cArgs As String
-
-    Test.StartMethod("execute()")
-    cClassPath = utils.URL2Path(utils.Path2URL(cTestDocsDir))
-    cResURL = utils.getTempFileURL("SystemShellExecute.txt", true)
-    cResFile = utils.URL2Path(cResURL)
-    bOK = true
-    
-    cArgs = "-classpath " + cClassPath + " SystemShellExecute " + cResFile
-    Out.Log("Executing : 'java " + cArgs + "'")
-    oObj.execute("java", cArgs, 1)
-    
-    oFacc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    if bOK then 
-        Out.Log("Waiting while the file will be created or timeout reached ...")
-        bExist = false
-        i = 0
-        while i &lt; 20 AND NOT bExist
-            bExist = oFacc.exists(cResURL)
-            wait(1000) 
-            i = i + 1
-        wend
-        
-        if bExist then
-            Out.Log("The command was executed and file created in " + i + " sec.")
-        else
-            Out.Log("File was not created.")
-        endif
-        
-        bOK = bOK AND bExist
-    endif
-    
-    Test.MethodTested("execute()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/CellProperties/script.xlb b/qadevOOo/tests/basic/ifc/table/CellProperties/script.xlb
deleted file mode 100644
index f6d079817389..000000000000
--- a/qadevOOo/tests/basic/ifc/table/CellProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_CellProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_CellProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/CellProperties/table_CellProperties.xba b/qadevOOo/tests/basic/ifc/table/CellProperties/table_CellProperties.xba
deleted file mode 100644
index 74d2e9706f3b..000000000000
--- a/qadevOOo/tests/basic/ifc/table/CellProperties/table_CellProperties.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_CellProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim bOK As Boolean
-Dim oTB As Variant, oldVal As Variant 
-Dim newVal As Variant, valToSet As Variant
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.table.CellProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim aCellStyles(1) As String
-
-    aCellStyles(0) = "Result"
-    aCellStyles(1) = "Default"
-    PropertyTester.TestProperty("CellStyle", aCellStyles())
-
-    PropertyTester.TestProperty("CellBackColor")
-
-    PropertyTester.TestProperty("IsCellBackgroundTransparent")
-
-    Dim aNumberFormats(1) As Integer
-    aNumberFormats(0) = 2
-    aNumberFormats(1) = 1
-    PropertyTester.TestProperty("NumberFormat", aNumberFormats())
-
-    PropertyTester.TestProperty("ShadowFormat")
-
-    PropertyTester.TestProperty("HoriJustify")
-
-    PropertyTester.TestProperty("VertJustify")
-
-    PropertyTester.TestProperty("Orientation")
-
-    PropertyTester.TestProperty("CellProtection")
-
-    Test.StartMethod("TableBorder")
-
-    Dim oTBNew As New com.sun.star.table.TableBorder
-    bOK = true
-    oldVal = oObj.TableBorder.Distance
-    Out.Log("value of 'TableBorder.Distance' before: "+oldVal)
-    oTBNew = oObj.TableBorder
-    Out.Log("setting value: "+ (oldVal + 20))
-    oTBNew.Distance = oldVal + 20
-    oObj.setPropertyValue("TableBorder", oTBNew)
-    newVal = oObj.TableBorder.Distance
-    Out.Log("value of 'TableBorder.Distance' after: "+newVal)
-    bOK = bOK AND (newVal = oTBNew.Distance)
-    Test.MethodTested("TableBorder", bOK)
-
-    PropertyTester.TestProperty("IsTextWrapped")
-
-    Dim nRotate(1) As Integer
-    nRotate(0) = 30999
-    nRotate(1) = 4500
-    PropertyTester.TestProperty("RotateAngle",nRotate())
-
-    PropertyTester.TestProperty("RotateReference")
-
-    PropertyTester.TestProperty("AsianVerticalMode")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/TableColumn/script.xlb b/qadevOOo/tests/basic/ifc/table/TableColumn/script.xlb
deleted file mode 100644
index 6e6455ba0f2f..000000000000
--- a/qadevOOo/tests/basic/ifc/table/TableColumn/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_TableColumn" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_TableColumn"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/TableColumn/table_TableColumn.xba b/qadevOOo/tests/basic/ifc/table/TableColumn/table_TableColumn.xba
deleted file mode 100644
index cf052ca74719..000000000000
--- a/qadevOOo/tests/basic/ifc/table/TableColumn/table_TableColumn.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_TableColumn" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.table.TableColumn
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("Width")
-
-    PropertyTester.TestProperty("OptimalWidth")
-
-    PropertyTester.TestProperty("IsVisible")
-
-    PropertyTester.TestProperty("IsStartOfNewPage")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/TableRow/script.xlb b/qadevOOo/tests/basic/ifc/table/TableRow/script.xlb
deleted file mode 100644
index a60eabb39d69..000000000000
--- a/qadevOOo/tests/basic/ifc/table/TableRow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_TableRow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_TableRow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/TableRow/table_TableRow.xba b/qadevOOo/tests/basic/ifc/table/TableRow/table_TableRow.xba
deleted file mode 100644
index f46e5f1e7e09..000000000000
--- a/qadevOOo/tests/basic/ifc/table/TableRow/table_TableRow.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_TableRow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.table.TableRow
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("Height")
-
-    PropertyTester.TestProperty("OptimalHeight")
-
-    PropertyTester.TestProperty("IsVisible")
-
-    PropertyTester.TestProperty("IsStartOfNewPage")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XAutoFormattable/script.xlb b/qadevOOo/tests/basic/ifc/table/XAutoFormattable/script.xlb
deleted file mode 100644
index 88458e208447..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XAutoFormattable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XAutoFormattable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XAutoFormattable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XAutoFormattable/table_XAutoFormattable.xba b/qadevOOo/tests/basic/ifc/table/XAutoFormattable/table_XAutoFormattable.xba
deleted file mode 100644
index d67b346a9203..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XAutoFormattable/table_XAutoFormattable.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XAutoFormattable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XAutoFormattable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iBg1 As Variant, iBg2 As Variant
-
-    Test.StartMethod("autoFormat()")
-    bOK = true
-    oObj.getCellByPosition(0, 0).setPropertyValue("BackColor", 0)
-    oObj.getCellByPosition(1, 1).setPropertyValue("BackColor", 0)
-    oObj.autoFormat("Default")
-    iBg1 = oObj.getCellByPosition(0, 0).getPropertyValue("BackColor")
-    iBg2 = oObj.getCellByPosition(1, 1).getPropertyValue("BackColor")
-    bOK = bOK AND iBg1 &lt;&gt; iBg2
-    Test.MethodTested("autoFormat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XCell/script.xlb b/qadevOOo/tests/basic/ifc/table/XCell/script.xlb
deleted file mode 100644
index 837a8f5c67f9..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XCell/table_XCell.xba b/qadevOOo/tests/basic/ifc/table/XCell/table_XCell.xba
deleted file mode 100644
index 6bb675e5088c..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCell/table_XCell.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aFormula As String
-    Dim aValue As Integer
-    Dim aType As Variant
-
-    Test.StartMethod("setFormula()")
-    bOK = true
-    Out.Log("setFormula(""=2+2"")")
-    oObj.setFormula("=2+2")
-    Test.MethodTested("setFormula()", bOK)
-
-    Test.StartMethod("getFormula()")
-    bOK = true
-    aFormula = oObj.getFormula()
-    Out.Log("getFormula() returned '" &amp; aFormula &amp; "'")
-    bOK = bOK AND inStr(1, aFormula, "2+2")
-    Test.MethodTested("getFormula()", bOK)
-
-    Test.StartMethod("getValue()")
-    bOK = true
-    aValue = oObj.getValue()
-    bOK = bOK AND aValue = 4
-    Test.MethodTested("getValue()", bOK)
-
-    Test.StartMethod("setValue()")
-    bOK = true
-    oObj.setValue(10)
-    bOK = bOK AND oObj.getValue = 10
-    Test.MethodTested("setValue()", bOK)
-
-    Test.StartMethod("getType()")
-    bOK = true
-    aType = oObj.getType()
-    bOK = bOK AND (aType = com.sun.star.table.CellContentType.EMPTY OR _
-                   aType = com.sun.star.table.CellContentType.VALUE OR _
-                   aType = com.sun.star.table.CellContentType.TEXT  OR _
-                   aType = com.sun.star.table.CellContentType.FORMULA)
-    Test.MethodTested("getType()", bOK)
-
-    Test.StartMethod("getError()")
-    bOK = true
-    bOK = bOK AND (oObj.getError() = 0)
-    oObj.setFormula("=sqrt(-2)")
-    bOK = bOK AND (oObj.getError() &lt;&gt; 0)
-    Test.MethodTested("getError()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XCellCursor/script.xlb b/qadevOOo/tests/basic/ifc/table/XCellCursor/script.xlb
deleted file mode 100644
index beb85284488f..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCellCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XCellCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XCellCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XCellCursor/table_XCellCursor.xba b/qadevOOo/tests/basic/ifc/table/XCellCursor/table_XCellCursor.xba
deleted file mode 100644
index b681dfa1a334..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCellCursor/table_XCellCursor.xba
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XCellCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-'XCellCursor walks in a range of data. That
-' means: If you have the range (A1:B10) filled
-' with data gotoStart() goes to (A1), gotoEnd()
-' goes to (B10). But: you must insite this range.
-' If you are in (C3) you will nerver go to (A1).
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XCellCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bSupport As Boolean
-    Dim ResetCols As Integer, ResetRows As Long
-    Dim nStartSCol, nStartECol As Integer
-    Dim nStartSRow, nStartERow As Long
-    Dim nNextECol As Integer, nNextERow As Long
-    Dim nEndECol As Integer, nEndERow As Long
-    Dim nPrevECol As Integer, nPrevERow As Long
-    Dim nOffECol As Integer, nOffERow As Long
-    Dim oAddress As Object
-
-    if hasUnoInterfaces(oObj, "com.sun.star.sheet.XSheetCellCursor") then
-        bSupport = true
-        ResetCols = oObj.getColumns().getCount()
-        ResetRows = oObj.getRows().getCount()
-    else
-        bSupport = false
-    end if
-
-    Test.StartMethod("gotoStart()")
-    bOK = true
-    oObj.gotoStart()
-    oAddress = oObj.getRangeAddress()
-    nStartSCol = oAddress.StartColumn
-    nStartECol = oAddress.EndColumn
-    nStartSRow = oAddress.StartRow
-    nStartERow = oAddress.EndRow
-    bOK = bOK AND (nStartSCol = nStartECol) AND (nStartSRow = nStartERow)
-    Out.Log("nStartSCol = " &amp; nStartSCol &amp; " nStartECol = " &amp; nStartECol &amp;_
-           " nStartSRow = " &amp; nStartSRow &amp; " nStartERow = " &amp; nStartERow)
-    Test.MethodTested("gotoStart()", bOK)
-
-    Test.StartMethod("gotoNext()")
-    bOK = true
-    oObj.gotoNext()
-    oAddress = oObj.getRangeAddress()
-    nNextECol = oAddress.EndColumn
-    nNextERow = oAddress.EndRow
-    bOK = bOK AND ((nNextECol = nStartSCol + 1) OR (nNextERow = nStartSRow + 1))
-    Out.Log("nNextECol = " &amp; nNextECol &amp; " nNextERow = " &amp; nNextERow)
-    Test.MethodTested("gotoNext()", bOK)
-
-    Test.StartMethod("gotoEnd()")
-    bOK = true
-    oObj.gotoEnd()
-    oAddress = oObj.getRangeAddress()
-    nEndECol = oAddress.EndColumn
-    nEndERow = oAddress.EndRow
-    bOK = bOK AND ((nEndECol &gt; nStartECol) OR (nEndERow &gt; nStartERow))
-    Out.Log("nEndSCol = " &amp; nEndECol &amp; " nEndERow = " &amp; nEndERow)
-    Test.MethodTested("gotoEnd()", bOK)
-
-    Test.StartMethod("gotoPrevious()")
-    bOK = true
-    oObj.gotoPrevious()
-    oAddress = oObj.getRangeAddress()
-    nPrevECol = oAddress.EndColumn
-    nPrevERow = oAddress.EndRow
-    bOK = bOK AND ((nPrevECol &lt; nEndECol) OR (nPrevERow &lt; nEndERow))
-    Out.Log("nPrevECol = " &amp; nPrevECol &amp; " nPrevERow = " &amp; nPrevERow)
-    Test.MethodTested("gotoPrevious()", bOK)
-
-    Test.StartMethod("gotoOffset()")
-    bOK = true
-    oObj.gotoStart()
-    oObj.gotoOffset(1,1)
-    oAddress = oObj.getRangeAddress()
-    nOffECol = oAddress.EndColumn
-    nOffERow = oAddress.EndRow
-    bOK = bOK AND (nOffECol = nStartSCol + 1) AND (nOffERow = nStartSRow + 1)
-    Out.Log("nOffECol = " &amp; nOffECol &amp; " nOffERow = " &amp; nOffERow)
-    Test.MethodTested("gotoOffset()", bOK)
-
-    if bSupport then
-        Out.Log("Reset to old range: " &amp; ResetCols &amp; "," &amp; ResetRows)
-        oObj.collapseToSize(ResetCols, ResetRows)
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XCellRange/script.xlb b/qadevOOo/tests/basic/ifc/table/XCellRange/script.xlb
deleted file mode 100644
index 432c2e2fd845..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCellRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XCellRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XCellRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XCellRange/table_XCellRange.xba b/qadevOOo/tests/basic/ifc/table/XCellRange/table_XCellRange.xba
deleted file mode 100644
index 84588e716650..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XCellRange/table_XCellRange.xba
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XCellRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' You can only get ranges within your
-' object-range. That means is your object-range
-' is (A1:C3) you can get only a range within
-' (A1:C3).
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XCellRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oCell As Object
-    Dim oCellRange As Object
-    Dim oCellRange1 As Object
-    Dim bSupport As Boolean
-    Dim oAddress As Object
-    Dim nSCol As Long, nECol As Long
-    Dim nSRow As Long, nERow As Long
-    Dim nCol As Long, nRow As Long
-    Dim cSCol As String, cECol As String
-
-    bOK = true
-    'does the object support this service? If yes, the object is a range itself.
-    'So we must look for the range address to be get a valid range
-    if hasUnoInterfaces( oObj, "com.sun.star.sheet.XCellRangeAddressable" ) then
-        Out.Log("Object supports com.sun.star.sheet.XCellRangeAddressable")
-        bSupport = true
-        oAddress = oObj.getRangeAddress()
-        nSCol = oAddress.StartColumn
-        nECol = oAddress.EndColumn
-        nSRow = oAddress.StartRow
-        nERow = oAddress.EndRow
-        nCol = nECol - nSCol
-        nRow = nERow - nSRow
-    else
-        bSupport = false
-        nCol = 1
-        nRow = 1
-    end if
-
-    Test.StartMethod("getCellByPosition()")
-    bOK = true
-    Out.Log("try to getCellByPosition(" + nCol + "," + nRow + ")")
-    oCell = oObj.getCellByPosition(nCol, nRow)
-    bOK = bOK AND hasUnoInterfaces( oCell, "com.sun.star.table.XCell" )
-    Test.MethodTested("getCellByPosition()", bOK)
-
-    Test.StartMethod("getCellRangeByPosition()")
-    bOK = true
-    Out.Log("try to getCellRangeByPosition(0,0," + nCol + "," + nRow + ")")
-    oCellRange = oObj.getCellRangeByPosition(0, 0, nCol, nRow)
-    bOK = bOK AND hasUnoInterfaces( oCellRange, "com.sun.star.table.XCellRange" )
-    Test.MethodTested("getCellRangeByPosition()", bOK)
-
-    Test.StartMethod("getCellRangeByName()")
-    bOK = true
-    if bSupport then
-        oAddress = oObj.getRangeAddress()
-        nSCol = oAddress.StartColumn
-        nECol = oAddress.EndColumn
-        nSRow = oAddress.StartRow
-        nERow = oAddress.EndRow
-        cSCol = getCharacter(nSCol)
-        cECol = getCharacter(nECol)
-    else
-        nSRow = 0
-        nERow = 2
-        cSCol = "A"
-        cECol = "C"
-    end if
-    Out.Log("Try to getCellRangeByName(""" + cSCol + (nSRow + 1) + ":" + cECol + (nERow + 1) + """)")
-    oCellRange1 = oObj.getCellRangeByName("" + cSCol + (nSRow + 1) + ":" + cECol + (nERow + 1))
-    bOK = bOK AND hasUnoInterfaces( oCellRange1, "com.sun.star.table.XCellRange" )
-    Test.MethodTested("getCellRangeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function getCharacter( nCol as Integer) as String
-    Dim Char As String
-    Dim nNum As Integer
-    nNum = nCol
-    Char = ""
-    if (nNum - 26) &gt; 0 Then
-        Char = Chr((nNum mod 26)+65)
-        nNum = Int((nNum - 26)/ 26)
-    end if
-    Char = Chr(nNum + 65) + Char
-    getCharacter = Char
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XColumnRowRange/script.xlb b/qadevOOo/tests/basic/ifc/table/XColumnRowRange/script.xlb
deleted file mode 100644
index 7dc9dec2d4c2..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XColumnRowRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XColumnRowRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XColumnRowRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XColumnRowRange/table_XColumnRowRange.xba b/qadevOOo/tests/basic/ifc/table/XColumnRowRange/table_XColumnRowRange.xba
deleted file mode 100644
index 8b22ff74500e..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XColumnRowRange/table_XColumnRowRange.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XColumnRowRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XColumnRowRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oColumns As Variant
-    Dim oRows As Variant
-
-    Test.StartMethod("getColumns()")
-    bOK = true
-    oColumns = oObj.getColumns()
-    bOK = bOK AND hasUnoInterfaces( oColumns, "com.sun.star.table.XTableColumns" )
-    Test.MethodTested("getColumns()", bOK)
-
-    Test.StartMethod("getRows()")
-    bOK = true
-    oRows = oObj.getRows()
-    bOK = bOK AND hasUnoInterfaces( oRows, "com.sun.star.table.XTableRows" )
-    Test.MethodTested("getRows()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableChart/script.xlb b/qadevOOo/tests/basic/ifc/table/XTableChart/script.xlb
deleted file mode 100644
index 7a8bc8b28a2e..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableChart/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XTableChart" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XTableChart"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableChart/table_XTableChart.xba b/qadevOOo/tests/basic/ifc/table/XTableChart/table_XTableChart.xba
deleted file mode 100644
index 8d5caa7f9faa..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableChart/table_XTableChart.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XTableChart" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XTableChart
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim tAddr(0) As New com.sun.star.table.CellRangeAddress
-    Dim objAddr As Object
-
-    Test.StartMethod("getHasColumnHeaders()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getHasColumnHeaders())
-    Test.MethodTested("getHasColumnHeaders()", bOK)
-
-    Test.StartMethod("setHasColumnHeaders()")
-    bOK = true
-    oObj.setHasColumnHeaders(true)
-    bOK = bOK AND oObj.getHasColumnHeaders() = true
-    oObj.setHasColumnHeaders(false)
-    bOK = bOK AND oObj.getHasColumnHeaders() = false
-    Test.MethodTested("setHasColumnHeaders()", bOK)
-
-    Test.StartMethod("getHasRowHeaders()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getHasRowHeaders())
-    Test.MethodTested("getHasRowHeaders()", bOK)
-
-    Test.StartMethod("setHasRowHeaders()")
-    bOK = true
-    oObj.setHasRowHeaders(true)
-    bOK = bOK AND oObj.getHasRowHeaders()
-    oObj.setHasRowHeaders(false)
-    bOK = bOK AND oObj.getHasRowHeaders() = false
-    Test.MethodTested("setHasRowHeaders()", bOK)
-
-    Test.StartMethod("getRanges()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getRanges())
-    Test.MethodTested("getRanges()", bOK)
-
-    Test.StartMethod("setRanges()")
-    bOK = true
-    tAddr(0).Sheet = 0
-    tAddr(0).StartRow = 0
-    tAddr(0).StartColumn = 0
-    tAddr(0).EndRow = 3
-    tAddr(0).EndColumn = 3
-
-    oObj.setRanges(tAddr())
-    objAddr = oObj.getRanges()
-    bOK = bOK AND NOT isNULL(objAddr)
-    if bOK then
-        Out.Log("oChart.getRanges() returned array of " &amp; ubound(objAddr) + 1 &amp; " element(s)")
-        bOK = bOK AND (ubound(objAddr) &lt;&gt; -1)
-    end if
-    Test.MethodTested("setRanges()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableCharts/script.xlb b/qadevOOo/tests/basic/ifc/table/XTableCharts/script.xlb
deleted file mode 100644
index e02edbd313f5..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableCharts/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XTableCharts" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XTableCharts"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableCharts/table_XTableCharts.xba b/qadevOOo/tests/basic/ifc/table/XTableCharts/table_XTableCharts.xba
deleted file mode 100644
index b9a76250e533..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableCharts/table_XTableCharts.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XTableCharts" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cChartDataAddress As New com.sun.star.table.CellRangeAddress
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XTableCharts
-'*************************************************************************
-On Error Goto ErrHndl
-On Error goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cCount As Integer
-    cCount = oObj.count()
-
-    Dim tRect As New com.sun.star.awt.Rectangle
-    tRect.X = 100
-    tRect.Y = 100
-    tRect.Width = 5000
-    tRect.Height = 2000
-
-    Test.StartMethod("addNewByName()")
-    bOK = true
-
-    Dim oRanges(0) As New com.sun.star.table.CellRangeAddress
-    oRanges(0).Sheet = cChartDataAddress.Sheet
-    oRanges(0).StartRow = cChartDataAddress.StartRow
-    oRanges(0).EndRow = cChartDataAddress.EndRow
-    oRanges(0).StartColumn = cChartDataAddress.StartColumn
-    oRanges(0).EndColumn = cChartDataAddress.EndColumn
-
-    oObj.addNewByName("XTableCharts", tRect, oRanges(), true, true)
-    bOK = bOK AND oObj.Count = cCount + 1
-    Out.Log("Inserting chart " &amp; bOK)
-    oInst = oObj.getByName("XTableCharts")
-    bOK = bOK AND NOT isNULL(oInst)
-    Test.MethodTested("addNewByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName("XTableCharts")
-    bOK = bOK AND (oObj.Count = cCount)
-    Test.MethodTested("removeByName()", bOK)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/script.xlb
deleted file mode 100644
index 4103c5404308..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XTableChartsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XTableChartsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/table_XTableChartsSupplier.xba b/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/table_XTableChartsSupplier.xba
deleted file mode 100644
index 19fa85f4f01d..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableChartsSupplier/table_XTableChartsSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XTableChartsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XTableChartsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getCharts()")
-    bOK = true
-    oCharts = oObj.getCharts()
-    bOK = bOK AND hasUnoInterfaces(oCharts, "com.sun.star.table.XTableCharts")
-    Test.MethodTested("getCharts()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableColumns/script.xlb b/qadevOOo/tests/basic/ifc/table/XTableColumns/script.xlb
deleted file mode 100644
index efeba31d43bd..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableColumns/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XTableColumns" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XTableColumns"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableColumns/table_XTableColumns.xba b/qadevOOo/tests/basic/ifc/table/XTableColumns/table_XTableColumns.xba
deleted file mode 100644
index 40aafed887c0..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableColumns/table_XTableColumns.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XTableColumns" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oTable As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XTableColumns
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Out.Log("Filling three cells.")
-    oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    oTable.getCellByPosition(1, 0).String = cObjectName &amp; " 2"
-    oTable.getCellByPosition(2, 0).String = ""
-
-    Test.StartMethod("insertByIndex()")
-    bOK = true
-    oObj.insertByIndex(1, 1)
-    bOK = bOK AND oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    bOK = bOK AND oTable.getCellByPosition(1, 0).String = ""
-    bOK = bOK AND oTable.getCellByPosition(2, 0).String = cObjectName &amp; " 2"
-    Test.MethodTested("insertByIndex()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(1, 1)
-    bOK = bOK AND oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    bOK = bOK AND oTable.getCellByPosition(1, 0).String = cObjectName &amp; " 2"
-    bOK = bOK AND oTable.getCellByPosition(2, 0).String = ""
-    Test.MethodTested("removeByIndex()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableRows/script.xlb b/qadevOOo/tests/basic/ifc/table/XTableRows/script.xlb
deleted file mode 100644
index 83ad19104b27..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableRows/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="table_XTableRows" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="table_XTableRows"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/table/XTableRows/table_XTableRows.xba b/qadevOOo/tests/basic/ifc/table/XTableRows/table_XTableRows.xba
deleted file mode 100644
index e86e922ba644..000000000000
--- a/qadevOOo/tests/basic/ifc/table/XTableRows/table_XTableRows.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="table_XTableRows" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oTable As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.table.XTableRows
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Out.Log("Filling three cells.")
-    oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    oTable.getCellByPosition(0, 1).String = cObjectName &amp; " 2"
-    oTable.getCellByPosition(0, 2).String = ""
-
-    Test.StartMethod("insertByIndex()")
-    bOK = true
-    Out.Log("Insert Row between first ones")
-    oObj.insertByIndex(1, 1)
-    bOK = bOK AND oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    bOK = bOK AND oTable.getCellByPosition(0, 1).String = ""
-    bOK = bOK AND oTable.getCellByPosition(0, 2).String = cObjectName &amp; " 2"
-    Test.MethodTested("insertByIndex()", bOK)
-
-    Test.StartMethod("removeByIndex()")
-    bOK = true
-    oObj.removeByIndex(1, 1)
-    bOK = bOK AND oTable.getCellByPosition(0, 0).String = cObjectName &amp; " 1"
-    bOK = bOK AND oTable.getCellByPosition(0, 1).String = cObjectName &amp; " 2"
-    bOK = bOK AND oTable.getCellByPosition(0, 2).String = ""
-    Test.MethodTested("removeByIndex()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/task/XInteractionHandler/script.xlb b/qadevOOo/tests/basic/ifc/task/XInteractionHandler/script.xlb
deleted file mode 100644
index 0e5931a99ef8..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XInteractionHandler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="task_XInteractionHandler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="task_XInteractionHandler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/task/XInteractionHandler/task_XInteractionHandler.xba b/qadevOOo/tests/basic/ifc/task/XInteractionHandler/task_XInteractionHandler.xba
deleted file mode 100644
index 2caad798f534..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XInteractionHandler/task_XInteractionHandler.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="task_XInteractionHandler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.task.XInteractionHandler
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bExExpected As Boolean
-
-    Test.StartMethod("handle()")
-    bOK = true
-
-    ' This method needs an com::sun::star::task::XInteractionRequest
-    ' as a parameter. In BASIC we can't create own services.
-    ' So we can't create an instance that supports XInteractionRequest.
-    ' All that can be tested here is that there is no exception when
-    ' calling this method with NULL and that there IS an exception,
-    ' when calling method with wrong parameter.
-
-    bExExpected = false
-    oObj.handle(NULL)
-
-    bExExpected = true
-    oObj.handle(oObj)
-
-    Test.MethodTested("handle()", bOK)
-
-Exit Sub
-ErrHndl:
-    if (bExExpected) then
-        Out.Log("EXPECTED EXCEPTION. " &amp; error)
-    else
-        Test.Exception()
-        bOK = false
-    end if
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/task/XJob/script.xlb b/qadevOOo/tests/basic/ifc/task/XJob/script.xlb
deleted file mode 100644
index 2d25220b6ee4..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XJob/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="task_XJob" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="task_XJob"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/task/XJob/task_XJob.xba b/qadevOOo/tests/basic/ifc/task/XJob/task_XJob.xba
deleted file mode 100644
index 8461cbeb6bdc..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XJob/task_XJob.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="task_XJob" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'	Global vXJobArgs(0 to n) as Variant
-'   Example:
-'	Dim vXJobArg0(0 to 0) as new com.sun.star.beans.NamedValue
-'	Dim vXJobArg1(0 to 0) as new com.sun.star.beans.NamedValue
-'	vXJobArgs0(0).Name = "MyProperty": vXJobArg0(0).Vaue = "MyValue"
-'	vXJobArgs1(0).Name = "MyProperty": vXJobArg0(0).Vaue = "My2ndValue"
-'	vXJobArgs(0) = vXJobArg0()
-'	vXJobArgs(1) = vXJobArg1()
-
-
-'*************************************************************************
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.task.XJob
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bRun as Boolean
-	Dim n as Integer
-    
-    out.dbg("Start tests of com.sun.star.task.XJob #########") 
-    ReCreateObj()
-	
-    Test.StartMethod("execute()")
-	
-	bOK = TRUE
-	for n = 0 to uBound(vXJobArgs())
-        bRun = FALSE
-		out.dbg("running vXJobArgs(" + n + ")")
-		bRun = oObj.execute(vXJobArgs(n))
-        bOK = bOK AND bRun
-        out.dbg("Result: " + bRun) 
-	next n
-    Test.MethodTested("execute()", bOK)
-	
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/script.xlb b/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/script.xlb
deleted file mode 100644
index 782ede80daa4..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="task_XStatusIndicatorFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="task_XStatusIndicatorFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/task_XStatusIndicatorFactory.xba b/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/task_XStatusIndicatorFactory.xba
deleted file mode 100644
index b9094a0e9f10..000000000000
--- a/qadevOOo/tests/basic/ifc/task/XStatusIndicatorFactory/task_XStatusIndicatorFactory.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="task_XStatusIndicatorFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.task.XStatusIndicatorFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("createStatusIndicator()")
-    bOK = true
-    Dim SI1 As Object, SI2 As Object
-    SI1 = oObj.createStatusIndicator()
-    SI2 = oObj.createStatusIndicator()
-    'Start all Indicators
-    SI1.start("Status1", 100)
-    SI2.start("Status2", 100)
-
-    'change SI2
-    SI2.setText("A new name for the status")
-    SI2.setValue(45)
-    SI2.reset()
-    SI2.end()
-
-    'Now SI1 is active
-    SI1.end()
-
-    bOK = Not isNull(SI1)
-    Test.MethodTested("createStatusIndicator()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseFrame/script.xlb b/qadevOOo/tests/basic/ifc/text/BaseFrame/script.xlb
deleted file mode 100644
index 27ce09a2bb2c..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseFrame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_BaseFrame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_BaseFrame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseFrame/text_BaseFrame.xba b/qadevOOo/tests/basic/ifc/text/BaseFrame/text_BaseFrame.xba
deleted file mode 100644
index 30f616fe44e1..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseFrame/text_BaseFrame.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_BaseFrame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.BaseFrame
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim FrameStyles(6) as String
-    FrameStyles(0) = "Formula"
-    FrameStyles(1) = "Graphics"
-    FrameStyles(2) = "Marginalia"
-    FrameStyles(3) = "OLE"
-    FrameStyles(4) = "Labels"
-    FrameStyles(5) = "Watermark"
-    FrameStyles(6) = "Frame"
-    PropertyTester.TestProperty("FrameStyleName", FrameStyles())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/script.xlb b/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/script.xlb
deleted file mode 100644
index d19bf601e574..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_BaseFrameProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_BaseFrameProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/text_BaseFrameProperties.xba b/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/text_BaseFrameProperties.xba
deleted file mode 100644
index 979432e5a5f1..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseFrameProperties/text_BaseFrameProperties.xba
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_BaseFrameProperties" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.BaseFrameProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-	oObj.SizeProtected = false
-
-    PropertyTester.TestProperty("ShadowFormat")
-
-    Dim nPages(0 to 2) As Integer
-    nPages(0) = 1
-    nPages(1) = 3
-    nPages(2) = 1
-    PropertyTester.TestProperty("AnchorPageNo",nPages())
-
-    PropertyTester.TestProperty("BackColor")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-    PropertyTester.TestProperty("LeftBorder")
-
-    PropertyTester.TestProperty("RightBorder")
-
-    PropertyTester.TestProperty("TopBorder")
-
-    PropertyTester.TestProperty("BottomBorder")
-
-    PropertyTester.TestProperty("BorderDistance")
-
-    PropertyTester.TestProperty("LeftBorderDistance")
-
-    PropertyTester.TestProperty("RightBorderDistance")
-
-    PropertyTester.TestProperty("TopBorderDistance")
-
-    PropertyTester.TestProperty("BottomBorderDistance")
-
-    PropertyTester.TestProperty("BackTransparent")
-
-    PropertyTester.TestProperty("ContentProtected")
-
-    PropertyTester.TestProperty("LeftMargin")
-
-    PropertyTester.TestProperty("RightMargin")
-
-    PropertyTester.TestProperty("TopMargin")
-
-    PropertyTester.TestProperty("BottomMargin")
-
-    Dim aRelative(2) As Integer
-    aRelative(0) = 10
-    aRelative(1) = 20
-    aRelative(2) = 0
-    PropertyTester.TestProperty("RelativeHeight", aRelative())
-
-    PropertyTester.TestProperty("RelativeWidth", aRelative())
-
-    PropertyTester.TestProperty("Height")
-
-    PropertyTester.TestProperty("Width")
-
-    PropertyTester.TestProperty("IsSyncWidthToHeight")
-
-    PropertyTester.TestProperty("IsSyncHeightToWidth")
-
-    Dim aHoriOrient(3) As Integer
-    aHoriOrient(0) = com.sun.star.text.HoriOrientation.RIGHT
-    aHoriOrient(1) = com.sun.star.text.HoriOrientation.CENTER
-    aHoriOrient(2) = com.sun.star.text.HoriOrientation.LEFT
-    aHoriOrient(3) = com.sun.star.text.HoriOrientation.NONE
-    PropertyTester.TestProperty("HoriOrient", aHoriOrient())
-
-    PropertyTester.TestProperty("HoriOrientPosition")
-
-    Dim aHoriRelations(3) As Integer
-    aHoriRelations(0) = com.sun.star.text.RelOrientation.FRAME
-    aHoriRelations(1) = com.sun.star.text.RelOrientation.CHAR
-    aHoriRelations(2) = com.sun.star.text.RelOrientation.PAGE_LEFT
-    aHoriRelations(3) = com.sun.star.text.RelOrientation.PAGE_RIGHT
-
-    PropertyTester.TestProperty("HoriOrientRelation", aHoriRelations())
-
-    Dim aVertOrient(3) As Integer
-    aVertOrient(0) = com.sun.star.text.VertOrientation.TOP
-    aVertOrient(1) = com.sun.star.text.VertOrientation.CENTER
-    aVertOrient(2) = com.sun.star.text.VertOrientation.BOTTOM
-    aVertOrient(3) = com.sun.star.text.VertOrientation.NONE
-    PropertyTester.TestProperty("VertOrient", aVertOrient())
-
-    PropertyTester.TestProperty("VertOrientPosition", aVertOrient())
-
-    Dim aVertRelations(3) As Integer
-    aVertRelations(0) = com.sun.star.text.RelOrientation.FRAME
-    aVertRelations(1) = com.sun.star.text.RelOrientation.CHAR
-    aVertRelations(2) = com.sun.star.text.RelOrientation.PAGE_LEFT
-    aVertRelations(3) = com.sun.star.text.RelOrientation.PAGE_RIGHT
-    PropertyTester.TestProperty("VertOrientRelation", aVertRelations())
-
-    PropertyTester.TestProperty("HyperLinkURL")
-
-    PropertyTester.TestProperty("HyperLinkTarget")
-
-    PropertyTester.TestProperty("HyperLinkName")
-
-    PropertyTester.TestProperty("Opaque")
-
-    PropertyTester.TestProperty("PageToggle")
-
-    PropertyTester.TestProperty("PositionProtected")
-
-    PropertyTester.TestProperty("Print")
-
-    PropertyTester.TestProperty("ServerMap")
-
-	oObj.SizeProtected = false
-    PropertyTester.TestProperty("Size")
-
-    PropertyTester.TestProperty("SizeProtected")
-
-	oObj.SizeProtected = false
-
-    PropertyTester.TestProperty("Surround")
-
-    PropertyTester.TestProperty("SurroundAnchorOnly")
-
-    PropertyTester.TestProperty("AnchorFrame")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseIndex/script.xlb b/qadevOOo/tests/basic/ifc/text/BaseIndex/script.xlb
deleted file mode 100644
index d3f4a6b1a23f..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseIndex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_BaseIndex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_BaseIndex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseIndex/text_BaseIndex.xba b/qadevOOo/tests/basic/ifc/text/BaseIndex/text_BaseIndex.xba
deleted file mode 100644
index 92a93336bdb7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseIndex/text_BaseIndex.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_BaseIndex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.BaseIndex
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Title")
-
-    PropertyTester.TestProperty("IsProtected")
-
-    PropertyTester.TestProperty("ParaStyleHeading")
-
-    PropertyTester.TestProperty("ParaStyleLevel1")
-
-    PropertyTester.TestProperty("ParaStyleLevel2")
-
-    PropertyTester.TestProperty("ParaStyleLevel3")
-
-    PropertyTester.TestProperty("ParaStyleLevel4")
-
-    PropertyTester.TestProperty("ParaStyleLevel5")
-
-    PropertyTester.TestProperty("ParaStyleLevel6")
-
-    PropertyTester.TestProperty("ParaStyleLevel7")
-
-    PropertyTester.TestProperty("ParaStyleLevel8")
-
-    PropertyTester.TestProperty("ParaStyleLevel9")
-
-    PropertyTester.TestProperty("ParaStyleLevel10")
-
-    PropertyTester.TestProperty("ParaStyleSeparator")
-
-    PropertyTester.TestProperty("TextColumns")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-    PropertyTester.TestProperty("BackTransparent")
-
-    PropertyTester.TestProperty("LevelFormat")
-
-    PropertyTester.TestProperty("CreateFromChapter")
-
-    PropertyTester.TestProperty("HeaderSection")
-
-    PropertyTester.TestProperty("ContentSection")
-
-    PropertyTester.TestProperty("BackColor")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseIndexMark/script.xlb b/qadevOOo/tests/basic/ifc/text/BaseIndexMark/script.xlb
deleted file mode 100644
index dc54b5b8fdfb..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseIndexMark/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_BaseIndexMark" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_BaseIndexMark"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/BaseIndexMark/text_BaseIndexMark.xba b/qadevOOo/tests/basic/ifc/text/BaseIndexMark/text_BaseIndexMark.xba
deleted file mode 100644
index da934f4f49cc..000000000000
--- a/qadevOOo/tests/basic/ifc/text/BaseIndexMark/text_BaseIndexMark.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_BaseIndexMark" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.BaseIndexMark
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("AlternativeText")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/CellProperties/script.xlb b/qadevOOo/tests/basic/ifc/text/CellProperties/script.xlb
deleted file mode 100644
index 5fd5c45f6573..000000000000
--- a/qadevOOo/tests/basic/ifc/text/CellProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_CellProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_CellProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/CellProperties/text_CellProperties.xba b/qadevOOo/tests/basic/ifc/text/CellProperties/text_CellProperties.xba
deleted file mode 100644
index 8d05e4b56b24..000000000000
--- a/qadevOOo/tests/basic/ifc/text/CellProperties/text_CellProperties.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_CellProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.CellProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("BackColor")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-    PropertyTester.TestProperty("NumberFormat")
-
-    PropertyTester.TestProperty("BackTransparent")
-
-    PropertyTester.TestProperty("LeftBorder")
-
-    PropertyTester.TestProperty("RightBorder")
-
-    PropertyTester.TestProperty("TopBorder")
-
-    PropertyTester.TestProperty("BottomBorder")
-
-    PropertyTester.TestProperty("LeftBorderDistance")
-
-    PropertyTester.TestProperty("RightBorderDistance")
-
-    PropertyTester.TestProperty("TopBorderDistance")
-
-    PropertyTester.TestProperty("BottomBorderDistance")
-
-    PropertyTester.TestProperty("UserDefinedAttributes")
-
-    PropertyTester.TestProperty("TextSection")
-
-    Dim myParams(2) As Boolean
-    myParams(0) = true
-    myParams(1) = false
-    myParams(1) = false
-    PropertyTester.TestProperty("IsProtected", myParams())
-
-    PropertyTester.TestProperty("CellName")
-
-
-	Dim orient(9) as Integer
-	orient(0) = com.sun.star.text.VertOrientation.NONE
-	orient(1) = com.sun.star.text.VertOrientation.TOP
-	orient(2) = com.sun.star.text.VertOrientation.CENTER
-	orient(3) = com.sun.star.text.VertOrientation.BOTTOM
-	orient(4) = com.sun.star.text.VertOrientation.CHAR_TOP
-	orient(5) = com.sun.star.text.VertOrientation.CHAR_CENTER
-	orient(6) = com.sun.star.text.VertOrientation.CHAR_BOTTOM
-	orient(7) = com.sun.star.text.VertOrientation.LINE_TOP
-	orient(8) = com.sun.star.text.VertOrientation.LINE_CENTER
-	orient(9) = com.sun.star.text.VertOrientation.LINE_BOTTOM
-	
-    PropertyTester.TestProperty("VertOrient", orient())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/CellRange/script.xlb b/qadevOOo/tests/basic/ifc/text/CellRange/script.xlb
deleted file mode 100644
index 59e6c295861d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/CellRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_CellRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_CellRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/CellRange/text_CellRange.xba b/qadevOOo/tests/basic/ifc/text/CellRange/text_CellRange.xba
deleted file mode 100644
index 63a3e78e1975..000000000000
--- a/qadevOOo/tests/basic/ifc/text/CellRange/text_CellRange.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_CellRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.CellRange
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("BackColor")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackTransparent")
-
-    PropertyTester.TestProperty("ChartColumnAsLabel")
-
-    PropertyTester.TestProperty("ChartRowAsLabel")
-
-    PropertyTester.TestProperty("NumberFormat")
-
-    PropertyTester.TestProperty("TopMargin")
-
-    PropertyTester.TestProperty("BottomMargin")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/Defaults/script.xlb b/qadevOOo/tests/basic/ifc/text/Defaults/script.xlb
deleted file mode 100644
index 6b41f6d1336a..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Defaults/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_Defaults" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_Defaults"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/Defaults/text_Defaults.xba b/qadevOOo/tests/basic/ifc/text/Defaults/text_Defaults.xba
deleted file mode 100644
index 0c7bcf3c2c82..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Defaults/text_Defaults.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_Defaults" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.Defaults
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("TabStopDistance")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/DocumentIndex/script.xlb b/qadevOOo/tests/basic/ifc/text/DocumentIndex/script.xlb
deleted file mode 100644
index 387227462568..000000000000
--- a/qadevOOo/tests/basic/ifc/text/DocumentIndex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_DocumentIndex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_DocumentIndex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/DocumentIndex/text_DocumentIndex.xba b/qadevOOo/tests/basic/ifc/text/DocumentIndex/text_DocumentIndex.xba
deleted file mode 100644
index e0578779377d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/DocumentIndex/text_DocumentIndex.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_DocumentIndex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.DocumentIndex
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("UseAlphabeticalSeparators")
-    PropertyTester.TestProperty("UseKeyAsEntry")
-    PropertyTester.TestProperty("UseCombinedEntries")
-    PropertyTester.TestProperty("IsCaseSensitive")
-    PropertyTester.TestProperty("UsePP")
-    PropertyTester.TestProperty("UseDash")
-    PropertyTester.TestProperty("UseUpperCase")
-    PropertyTester.TestProperty("MainEntryCharacterStyleName")
-    PropertyTester.TestProperty("DocumentIndexMarks")
-    PropertyTester.TestProperty("Locale")
-    PropertyTester.TestProperty("SortAlgorithm")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/script.xlb b/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/script.xlb
deleted file mode 100644
index 46a08a71d963..000000000000
--- a/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_DocumentIndexMark" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_DocumentIndexMark"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/text_DocumentIndexMark.xba b/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/text_DocumentIndexMark.xba
deleted file mode 100644
index db7e459465dd..000000000000
--- a/qadevOOo/tests/basic/ifc/text/DocumentIndexMark/text_DocumentIndexMark.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_DocumentIndexMark" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.DocumentIndexMark
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("PrimaryKey")
-
-    PropertyTester.TestProperty("SecondaryKey")
-
-    PropertyTester.TestProperty("IsMainEntry")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/Footnote/script.xlb b/qadevOOo/tests/basic/ifc/text/Footnote/script.xlb
deleted file mode 100644
index d0a6ba452943..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Footnote/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_Footnote" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_Footnote"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/Footnote/text_Footnote.xba b/qadevOOo/tests/basic/ifc/text/Footnote/text_Footnote.xba
deleted file mode 100644
index 12dd74714f6e..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Footnote/text_Footnote.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_Footnote" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.Footnote
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ReferenceId")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/FootnoteSettings/script.xlb b/qadevOOo/tests/basic/ifc/text/FootnoteSettings/script.xlb
deleted file mode 100644
index 552949b4a5ff..000000000000
--- a/qadevOOo/tests/basic/ifc/text/FootnoteSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_FootnoteSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_FootnoteSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/FootnoteSettings/text_FootnoteSettings.xba b/qadevOOo/tests/basic/ifc/text/FootnoteSettings/text_FootnoteSettings.xba
deleted file mode 100644
index 2645f19b2808..000000000000
--- a/qadevOOo/tests/basic/ifc/text/FootnoteSettings/text_FootnoteSettings.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_FootnoteSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.FootnoteSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Dim aSymbolArr(1) As String
-    aSymbolArr(0) = "Footnote Symbol"
-    aSymbolArr(1) = "Endnote Symbol"
-    PropertyTester.TestProperty("CharStyleName",aSymbolArr())
-
-    PropertyTester.TestProperty("NumberingType")
-
-    Dim aPageStyles(0 to 2) As String
-    aPageStyles(0) = "HTML"
-    aPageStyles(1) = "Index"
-    aPageStyles(2) = "Endnote"
-    PropertyTester.TestProperty("PageStyleName",aPageStyles())
-
-    Dim aParaStyles(0 to 2) As String
-    aParaStyles(0) = "Heading"
-    aParaStyles(1) = "Signature"
-    aParaStyles(2) = "Standard"
-    PropertyTester.TestProperty("ParaStyleName",aParaStyles())
-
-    PropertyTester.TestProperty("Prefix")
-
-    PropertyTester.TestProperty("StartAt")
-
-    PropertyTester.TestProperty("Suffix")
-
-    PropertyTester.TestProperty("BeginNotice")
-
-    PropertyTester.TestProperty("EndNotice")
-
-    Dim aCounting(0 to 1) As Integer
-    aCounting(0) = 1
-    aCounting(1) = 2
-    PropertyTester.TestProperty("FootnoteCounting",aCounting())
-
-    PropertyTester.TestProperty("PositionEndOfDoc")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/script.xlb b/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/script.xlb
deleted file mode 100644
index 23e31fcc63f6..000000000000
--- a/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_LineNumberingProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_LineNumberingProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/text_LineNumberingProperties.xba b/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/text_LineNumberingProperties.xba
deleted file mode 100644
index 14e1bca8b5cf..000000000000
--- a/qadevOOo/tests/basic/ifc/text/LineNumberingProperties/text_LineNumberingProperties.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_LineNumberingProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.LineNumberingProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("IsOn")
-
-    Dim aNames(1) As String
-    aNames(0) = "Endnote anchor"
-    aNames(1) = "Endnote Symbol"
-    PropertyTester.TestProperty("CharStyleName", aNames())
-
-    PropertyTester.TestProperty("CountEmptyLines")
-
-    PropertyTester.TestProperty("CountLinesInFrames")
-
-    PropertyTester.TestProperty("Distance")
-
-    PropertyTester.TestProperty("Interval")
-
-    PropertyTester.TestProperty("SeparatorText")
-
-    PropertyTester.TestProperty("SeparatorInterval")
-
-    Dim aPositions(1) As Integer
-    aPositions(0) = 1
-    aPositions(1) = 0
-    PropertyTester.TestProperty("NumberPosition", aPositions())
-
-    PropertyTester.TestProperty("NumberingType")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/MailMerge/script.xlb b/qadevOOo/tests/basic/ifc/text/MailMerge/script.xlb
deleted file mode 100644
index 8ea1d96356a7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/MailMerge/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_MailMerge" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="text_MailMerge"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/MailMerge/text_MailMerge.xba b/qadevOOo/tests/basic/ifc/text/MailMerge/text_MailMerge.xba
deleted file mode 100644
index aa267aa9ff37..000000000000
--- a/qadevOOo/tests/basic/ifc/text/MailMerge/text_MailMerge.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_MailMerge" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'	Global cMailMerge_DocumentURL as String
-'   cMailMerge_DocumentURL must be a valid Document URL
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.MailMerge
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("DataSourceName")
-
-	Dim DataCommandTypes(2) as Integer
-	DataCommandTypes(0) = com.sun.star.sdb.CommandType.TABLE
-	DataCommandTypes(1) = com.sun.star.sdb.CommandType.QUERY
-	DataCommandTypes(2) = com.sun.star.sdb.CommandType.COMMAND
-    PropertyTester.TestProperty("CommandType", DataCommandTypes())
-
-    PropertyTester.TestProperty("Command")
-
-    PropertyTester.TestProperty("ResultSet")
-
-    PropertyTester.TestProperty("ActiveConnection")
-
-    PropertyTester.TestProperty("Selection", Array(Array(2,4), Array(1,3)))
-    
-    PropertyTester.TestProperty("EscapeProcessing", )
-
-    PropertyTester.TestProperty("Filter")
-
-    PropertyTester.TestProperty("DocumentURL", Array(cMailMerge_DocumentURL))
-
-    PropertyTester.TestProperty("Model")
-
-    PropertyTester.TestProperty("OutputType")
-
-    PropertyTester.TestProperty("SinglePrintJobs")
-
-    PropertyTester.TestProperty("OutputURL", Array(ConvertToURL(utils.getUserPath())))
-
-    PropertyTester.TestProperty("FileNameFromColumn")
-
-    PropertyTester.TestProperty("FileNamePrefix")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/NumberingRules/script.xlb b/qadevOOo/tests/basic/ifc/text/NumberingRules/script.xlb
deleted file mode 100644
index fdd8280545eb..000000000000
--- a/qadevOOo/tests/basic/ifc/text/NumberingRules/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_NumberingRules" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_NumberingRules"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/NumberingRules/text_NumberingRules.xba b/qadevOOo/tests/basic/ifc/text/NumberingRules/text_NumberingRules.xba
deleted file mode 100644
index d46f53eb6c1c..000000000000
--- a/qadevOOo/tests/basic/ifc/text/NumberingRules/text_NumberingRules.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_NumberingRules" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.NumberingRules
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("IsAbsoluteMargins")
-
-    PropertyTester.TestProperty("IsAutomatic")
-
-    PropertyTester.TestProperty("IsContinuousNumbering")
-
-    PropertyTester.TestProperty("Name")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/PrintSettings/script.xlb b/qadevOOo/tests/basic/ifc/text/PrintSettings/script.xlb
deleted file mode 100644
index 9e9b673d4c3e..000000000000
--- a/qadevOOo/tests/basic/ifc/text/PrintSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_PrintSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_PrintSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/PrintSettings/text_PrintSettings.xba b/qadevOOo/tests/basic/ifc/text/PrintSettings/text_PrintSettings.xba
deleted file mode 100644
index e1519cee1e19..000000000000
--- a/qadevOOo/tests/basic/ifc/text/PrintSettings/text_PrintSettings.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_PrintSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.PrintSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("PrintGraphics")
-
-    PropertyTester.TestProperty("PrintTables")
-
-    PropertyTester.TestProperty("PrintDrawings")
-
-    PropertyTester.TestProperty("PrintLeftPages")
-
-    PropertyTester.TestProperty("PrintRightPages")
-
-    PropertyTester.TestProperty("PrintControls")
-
-    PropertyTester.TestProperty("PrintReversed")
-
-    PropertyTester.TestProperty("PrintPaperFromSetup")
-
-    PropertyTester.TestProperty("PrintFaxName")
-
-    PropertyTester.TestProperty("PrintAnnotationMode", Array( _
-        com.sun.star.text.NotePrintMode.NOT, _
-        com.sun.star.text.NotePrintMode.ONLY, _
-        com.sun.star.text.NotePrintMode.DOC_END, _
-        com.sun.star.text.NotePrintMode.PAGE_END))
-
-    PropertyTester.TestProperty("PrintProspect")
-
-    PropertyTester.TestProperty("PrintPageBackground")
-
-    PropertyTester.TestProperty("PrintBlackFonts")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/Text/script.xlb b/qadevOOo/tests/basic/ifc/text/Text/script.xlb
deleted file mode 100644
index e86fce1e13bd..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Text/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_Text" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_Text"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/Text/text_Text.xba b/qadevOOo/tests/basic/ifc/text/Text/text_Text.xba
deleted file mode 100644
index 68ab507293ae..000000000000
--- a/qadevOOo/tests/basic/ifc/text/Text/text_Text.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_Text" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.Text
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("StartRedline")
-
-    PropertyTester.TestProperty("EndRedline")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextColumns/script.xlb b/qadevOOo/tests/basic/ifc/text/TextColumns/script.xlb
deleted file mode 100644
index c8aeed8326d5..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextColumns/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextColumns" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextColumns"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextColumns/text_TextColumns.xba b/qadevOOo/tests/basic/ifc/text/TextColumns/text_TextColumns.xba
deleted file mode 100644
index e3545193e66e..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextColumns/text_TextColumns.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextColumns" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextColumns
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    PropertyTester.TestProperty("IsAutomatic")
-
-    Test.StartMethod("AutomaticDistance")
-    bOK = true
-    if (oObj.IsAutomatic) then
-        bOK = PropertyTester.TestProperty("AutomaticDistance")
-    else
-        Out.Log("AutomaticDistance is available ONLY if IsAutomatic is TRUE. " &amp; _
-                "But it is FALSE.")
-    end if
-
-    Test.MethodTested("AutomaticDistance", bOK)
-
-    PropertyTester.TestProperty("SeparatorLineWidth")
-    PropertyTester.TestProperty("SeparatorLineColor")
-
-    Dim aHeights(1) As Integer
-    aHeights(0) = 10
-    aHeights(1) = 50
-    PropertyTester.TestProperty("SeparatorLineRelativeHeight", aHeights())
-    PropertyTester.TestProperty("SeparatorLineVerticalAlignment")
-    PropertyTester.TestProperty("SeparatorLineIsOn")
-
-Exit Sub
-ErrHndl:
-    bOK = false
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextContent/script.xlb b/qadevOOo/tests/basic/ifc/text/TextContent/script.xlb
deleted file mode 100644
index a28ef0745bf4..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextContent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextContent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextContent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextContent/text_TextContent.xba b/qadevOOo/tests/basic/ifc/text/TextContent/text_TextContent.xba
deleted file mode 100644
index 624a61579033..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextContent/text_TextContent.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextContent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextContent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim noElems()
-    Dim count,i,j As Integer
-   
-    j = 0
-    if (oObj.getPropertySetInfo.hasPropertyByName("AnchorTypes")) then
-        count = ubound(oObj.AnchorTypes())
-        if (count &lt;&gt; 0) then
-            Dim aTypes(count-1) As Variant
-            for i = 0 to (count)
-                if oObj.AnchorTypes(i) &lt;&gt; _
-                    com.sun.star.text.TextContentAnchorType.AT_FRAME then
-                        aTypes(j) = oObj.AnchorTypes(i)
-                        j = j + 1
-                endif
-            next i
-            PropertyTester.TestProperty("AnchorType",aTypes())
-        else 
-            PropertyTester.TestProperty("AnchorType")
-        endif
-    else
-        PropertyTester.TestProperty("AnchorType")
-    endif
-    
-    PropertyTester.TestProperty("AnchorTypes", noElems())
-    PropertyTester.TestProperty("TextWrap")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextDocument/script.xlb b/qadevOOo/tests/basic/ifc/text/TextDocument/script.xlb
deleted file mode 100644
index 852fc6355d18..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextDocument/text_TextDocument.xba b/qadevOOo/tests/basic/ifc/text/TextDocument/text_TextDocument.xba
deleted file mode 100644
index 3a6afbc69419..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextDocument/text_TextDocument.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("CharLocale")
-
-    PropertyTester.TestProperty("CharacterCount")
-
-    PropertyTester.TestProperty("ParagraphCount")
-
-    PropertyTester.TestProperty("WordCount")
-
-    PropertyTester.TestProperty("WordSeparator")
-
-    PropertyTester.TestProperty("IndexAutoMarkFileURL")
-
-    PropertyTester.TestProperty("RecordChanges")
-
-    PropertyTester.TestProperty("TwoDigitYear")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextFieldMaster/script.xlb b/qadevOOo/tests/basic/ifc/text/TextFieldMaster/script.xlb
deleted file mode 100644
index a9998b0a93f9..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextFieldMaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextFieldMaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextFieldMaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextFieldMaster/text_TextFieldMaster.xba b/qadevOOo/tests/basic/ifc/text/TextFieldMaster/text_TextFieldMaster.xba
deleted file mode 100644
index 8355f71faa2a..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextFieldMaster/text_TextFieldMaster.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextFieldMaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextFieldMaster
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("Name")
-
-    PropertyTester.TestProperty("DependentTextFields")
-
-    PropertyTester.TestProperty("InstanceName")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextFrame/script.xlb b/qadevOOo/tests/basic/ifc/text/TextFrame/script.xlb
deleted file mode 100644
index 658d59486b38..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextFrame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextFrame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextFrame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextFrame/text_TextFrame.xba b/qadevOOo/tests/basic/ifc/text/TextFrame/text_TextFrame.xba
deleted file mode 100644
index c634160d7905..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextFrame/text_TextFrame.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextFrame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextFrame
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj.SizeType = com.sun.star.text.SizeType.VARIABLE
-    PropertyTester.TestProperty("FrameHeightAbsolute")
-
-    PropertyTester.TestProperty("FrameWidthAbsolute")
-
-    Dim aPercents(2) As Integer
-    aPercents(0) = 25
-    aPercents(1) = 50
-    aPercents(2) = 100
-    PropertyTester.TestProperty("FrameWidthPercent", aPercents())
-    PropertyTester.TestProperty("FrameHeightPercent", aPercents())
-
-    PropertyTester.TestProperty("FrameIsAutomaticHeight")
-
-    Dim SizeTypes(2) As Integer
-    SizeTypes(0) = com.sun.star.text.SizeType.VARIABLE
-    SizeTypes(1) = com.sun.star.text.SizeType.FIX
-    SizeTypes(2) = com.sun.star.text.SizeType.MIN
-    PropertyTester.TestProperty("SizeType",SizeTypes())
-
-    PropertyTester.TestProperty("WritingMode", Array(3))
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextGraphicObject/script.xlb b/qadevOOo/tests/basic/ifc/text/TextGraphicObject/script.xlb
deleted file mode 100644
index 0c52b82b2a91..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextGraphicObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextGraphicObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextGraphicObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextGraphicObject/text_TextGraphicObject.xba b/qadevOOo/tests/basic/ifc/text/TextGraphicObject/text_TextGraphicObject.xba
deleted file mode 100644
index 5dec209a0251..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextGraphicObject/text_TextGraphicObject.xba
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextGraphicObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextGraphicObject
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ContentProtected")
-
-    PropertyTester.TestProperty("SurroundContour")
-
-    PropertyTester.TestProperty("ContourOutside")
-
-    Test.StartMethod("ContourPolyPolygon")
-    ' Because in additional parameters we must to
-    ' pass an array of values, we need such array.
-    Dim aPParr1(1) As Variant
-    Dim aPol1(3) As new com.sun.star.awt.Point
-    Dim gArr As Variant
-    
-    bOK = true
-    aPol1(0).x = 0   : aPol1(0).y = 0
-    aPol1(1).x = 101 : aPol1(1).y = 0
-    aPol1(2).x = 101 : aPol1(2).y = 101
-    aPol1(3).x = 0   : aPol1(3).y = 101
-    Dim aPol2(3) As new com.sun.star.awt.Point
-    aPol2(0).x = 11 : aPol2(0).y = 11
-    aPol2(1).x = 90 : aPol2(1).y = 11
-    aPol2(2).x = 90 : aPol2(2).y = 90
-    aPol2(3).x = 11 : aPol2(3).y = 90
-    aPParr1(0) = aPol1() : aPParr1(1) = aPol2()
-    oObj.setPropertyValue("ContourPolyPolygon", aPParr1())
-    gArr = oObj.getPropertyValue("ContourPolyPolygon")
-    
-    if isArray(gArr) AND ubound(gArr) &gt;= 1 then
-        Dim aP1 As Variant, aP2 As Variant
-        
-        aP1 = gArr(0)
-        aP2 = gArr(1)
-        bOK = bOK AND comparePointArrays(aPol1(), aP1, 0, 0, 4)
-        bOK = bOK AND comparePointArrays(aPol2(), aP2, 0, 0, 4)
-
-        ' One more point must be added to close the polygon
-        bOK = bOK AND comparePointArrays(aPol1(), aP1, 0, 4, 1)
-        bOK = bOK AND comparePointArrays(aPol2(), aP2, 0, 4, 1)
-    else
-        Out.Log("Returned value is invalid")
-        Out.Log = false
-    endif
-    
-    Test.MethodTested("ContourPolyPolygon", bOK)
-        
-'    PropertyTester.TestProperty("ContourPolyPolygon",testArr())
-
-    Dim aCropArr(1) As Variant
-    Dim Crop1 As Object
-    Dim Crop2 As Object
-
-    Crop1 = createUnoStruct("com.sun.star.text.GraphicCrop")
-    Crop2 = createUnoStruct("com.sun.star.text.GraphicCrop")
-
-    Crop1.Top = 11 : Crop1.Bottom = 11 : Crop1.Left = 11 : Crop1.Right = 11
-    Crop2.Top = -11 : Crop2.Bottom = 11 : Crop2.Left = -11 : Crop2.Right = 11
-
-    aCropArr(0) = Crop1 : aCropArr(1) = Crop2
-    PropertyTester.TestProperty("GraphicCrop",aCropArr())
-
-    PropertyTester.TestProperty("HoriMirroredOnEvenPages")
-
-    PropertyTester.TestProperty("HoriMirroredOnOddPages")
-
-    PropertyTester.TestProperty("VertMirrored")
-
-    PropertyTester.TestProperty("GraphicURL")
-
-    PropertyTester.TestProperty("GraphicFilter")
-
-    PropertyTester.TestProperty("ActualSize")
-
-    Dim oAdjustArr(4) As Integer
-    oAdjustArr(0) = -100
-    oAdjustArr(1) = -50
-    oAdjustArr(2) = 0
-    oAdjustArr(3) = 50
-    oAdjustArr(4) = 100
-
-    PropertyTester.TestProperty("AdjustLuminance",oAdjustArr())
-
-    PropertyTester.TestProperty("AdjustContrast",oAdjustArr())
-
-    PropertyTester.TestProperty("AdjustRed",oAdjustArr())
-
-    PropertyTester.TestProperty("AdjustGreen",oAdjustArr())
-
-    PropertyTester.TestProperty("AdjustBlue",oAdjustArr())
-
-    PropertyTester.TestProperty("Gamma",oAdjustArr())
-
-    PropertyTester.TestProperty("GraphicIsInverted")
-
-    PropertyTester.TestProperty("Transparency",oAdjustArr())
-
-    PropertyTester.TestProperty("GraphicColorMode")
-
-    PropertyTester.TestProperty("ImageMap")
-
-    PropertyTester.TestProperty("ActualSize")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function comparePointArrays(arr1 As Variant, arr2 As Variant, fromIdx1 As Integer, fromIdx2 As Integer, count As Integer) As Boolean
-On Error Goto ErrHndl
-    Dim bOK As Boolean   
-    Dim i As Integer 
-    
-    if NOT isArray(arr1) then
-        Out.Log("First parameter is not Array.")
-        comparePointArrays() = false
-        exit Function
-    endif
-
-    if NOT isArray(arr2) then
-        Out.Log("Second parameter is not Array.")
-        comparePointArrays() = false
-        exit Function
-    endif
-
-    if (lbound(arr1) &gt; fromIdx1 OR ubound(arr1) &lt; (fromIdx1 + count - 1)) then
-        Out.Log("Invalid bounds of the first array")
-        comparePointArrays() = false
-        exit Function
-    endif
-    if (lbound(arr2) &gt; fromIdx2 OR ubound(arr2) &lt; (fromIdx2 + count - 1)) then
-        Out.Log("Invalid bounds of the second array")
-        comparePointArrays() = false
-        exit Function
-    endif
-
-    bOK = true
-    for i = 0 to count - 1
-        if arr1(fromIdx1 + i).x &lt;&gt; arr2(fromIdx2 + i).x OR _
-           arr1(fromIdx1 + i).y &lt;&gt; arr2(fromIdx2 + i).y then
-
-            Out.Log("Points #" + i + " are different : (" + _
-                arr1(fromIdx1 + i).x + "," + arr1(fromIdx1 + i).y + "), (" + _
-                arr2(fromIdx2 + i).x + "," + arr2(fromIdx2 + i).y + ")."
-                
-            bOK = false
-        end if
-    next i
-
-    comparePointArrays() = bOK
-    
-    exit Function
-ErrHndl:
-    Test.Exception()
-    comparePointArrays() = false
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextPortion/script.xlb b/qadevOOo/tests/basic/ifc/text/TextPortion/script.xlb
deleted file mode 100644
index 0aefd8463cfc..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextPortion/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextPortion" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextPortion"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextPortion/text_TextPortion.xba b/qadevOOo/tests/basic/ifc/text/TextPortion/text_TextPortion.xba
deleted file mode 100644
index a88541f59c4c..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextPortion/text_TextPortion.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextPortion" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextPortion
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("TextPortionType")
-
-    PropertyTester.TestProperty("ControlCharacter")
-
-
-'
-    PropertyTester.TestProperty("Bookmark")
-
-    PropertyTester.TestProperty("IsCollapsed")
-
-    PropertyTester.TestProperty("IsStart")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextSection/script.xlb b/qadevOOo/tests/basic/ifc/text/TextSection/script.xlb
deleted file mode 100644
index 649b8eee5e98..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextSection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextSection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextSection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextSection/text_TextSection.xba b/qadevOOo/tests/basic/ifc/text/TextSection/text_TextSection.xba
deleted file mode 100644
index bd7f21d3de53..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextSection/text_TextSection.xba
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextSection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextSection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("Condition")
-
-    PropertyTester.TestProperty("IsVisible")
-
-    PropertyTester.TestProperty("IsProtected")
-    
-    Dim link As New com.sun.star.text.SectionFileLink
-    link.FileURL = utils.Path2URL(cTestDocsDir + "Iterator.sxw")
-
-    PropertyTester.TestProperty("FileLink", Array(link))
-
-    PropertyTester.TestProperty("LinkRegion")
-
-    PropertyTester.TestProperty("DDECommandType")
-
-    PropertyTester.TestProperty("DDECommandFile")
-
-    PropertyTester.TestProperty("DDECommandElement")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-    PropertyTester.TestProperty("FootnoteIsCollectAtTextEnd")
-
-    PropertyTester.TestProperty("FootnoteIsRestartNumbering")
-
-    PropertyTester.TestProperty("FootnoteRestartNumberingAt")
-
-    PropertyTester.TestProperty("FootnoteIsOwnNumbering")
-
-    oObj.FootnoteIsOwnNumbering = true
-    oObj.FootnoteNumberingType = 1
-    PropertyTester.TestProperty("FootnoteNumberingType", Array(com.sun.star.style.NumberingType.ARABIC))
-
-    PropertyTester.TestProperty("FootnoteNumberingPrefix")
-
-    PropertyTester.TestProperty("FootnoteNumberingSuffix")
-
-    PropertyTester.TestProperty("EndnoteIsCollectAtTextEnd")
-
-    PropertyTester.TestProperty("EndnoteIsRestartNumbering")
-
-    PropertyTester.TestProperty("EndnoteRestartNumberingAt")
-
-    PropertyTester.TestProperty("EndnoteIsOwnNumbering")
-
-    oObj.EndnoteIsOwnNumbering = true
-    oObj.EndnoteNumberingType = 1
-    PropertyTester.TestProperty("EndnoteNumberingType", Array(com.sun.star.style.NumberingType.ARABIC))
-
-    PropertyTester.TestProperty("EndnoteNumberingPrefix")
-
-    PropertyTester.TestProperty("EndnoteNumberingSuffix")
-
-    PropertyTester.TestProperty("IsAutomaticUpdate")
-
-    Test.StartMethod("TextColumns")
-    Dim oTC As Variant
-    Dim oldVal, newVal, val2set As Integer
-    oTC = oDoc.createInstance("com.sun.star.text.TextColumns")
-    oldVal = oObj.TextColumns.ColumnCount
-    Out.Log("COLUMNS BEFORE: "+oldVal)
-    if (oldVal &lt; 100) then 
-	val2set = oldVal + 20
-    else 
-	val2set = oldVal - 20
-    Endif
-    Out.Log("COLUMNS TO SET: "+val2set)
-    oTC.ColumnCount = val2set                                                                     
-    oObj.TextColumns = oTC
-    newVal = oObj.TextColumns.ColumnCount                                                                  
-    Out.Log("COLUMNS AFTER: "+newVal)
-    bOK = oldVal &lt;&gt; newVal
-    Test.MethodTested("TextColumns", bOK)
-
-    PropertyTester.TestProperty("SectionLeftMargin")
-
-    PropertyTester.TestProperty("SectionRightMargin")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextTable/script.xlb b/qadevOOo/tests/basic/ifc/text/TextTable/script.xlb
deleted file mode 100644
index e7e7a0ab6ce4..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextTable/text_TextTable.xba b/qadevOOo/tests/basic/ifc/text/TextTable/text_TextTable.xba
deleted file mode 100644
index 96432c262f90..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextTable/text_TextTable.xba
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim border As Variant
-    Dim oldVal As Variant, newVal As Variant, getVal As Variant
-
-
-    PropertyTester.TestProperty("BreakType")
-
-    PropertyTester.TestProperty("LeftMargin")
-
-    PropertyTester.TestProperty("RightMargin")
-
-    PropertyTester.TestProperty("HoriOrient", Array( _
-        com.sun.star.text.HoriOrientation.NONE, _
-        com.sun.star.text.HoriOrientation.RIGHT, _
-        com.sun.star.text.HoriOrientation.CENTER, _
-        com.sun.star.text.HoriOrientation.LEFT, _
-        com.sun.star.text.HoriOrientation.INSIDE, _
-        com.sun.star.text.HoriOrientation.OUTSIDE, _
-        com.sun.star.text.HoriOrientation.FULL, _
-        com.sun.star.text.HoriOrientation.LEFT_AND_WIDTH))
-
-    PropertyTester.TestProperty("KeepTogether")
-
-    PropertyTester.TestProperty("Split")
-
-    PropertyTester.TestProperty("PageNumberOffset", Array(1, 2))
-
-    PropertyTester.TestProperty("PageDescName", Array("First Page"))
-
-    PropertyTester.TestProperty("RelativeWidth", Array(50, 100))
-
-    PropertyTester.TestProperty("RepeatHeadline")
-
-    PropertyTester.TestProperty("ShadowFormat")
-
-    PropertyTester.TestProperty("TopMargin")
-
-    PropertyTester.TestProperty("BottomMargin")
-
-    PropertyTester.TestProperty("BackTransparent")
-
-    PropertyTester.TestProperty("Width")
-
-    oldVal = oObj.ChartRowAsLabel
-    PropertyTester.TestProperty("ChartRowAsLabel")
-    oObj.ChartRowAsLabel = oldVal
-
-    oldVal = oObj.ChartColumnAsLabel
-    PropertyTester.TestProperty("ChartColumnAsLabel")
-    oObj.ChartColumnAsLabel = oldVal
-
-    border = oObj.TableBorder
-    oldVal = border.Distance
-    newVal = oldVal + 200
-    border.Distance = newVal
-
-    PropertyTester.TestProperty("TableBorder", Array(border))
-
-    PropertyTester.TestProperty("TableColumnSeparators")
-
-    PropertyTester.TestProperty("TableColumnRelativeSum")
-
-    PropertyTester.TestProperty("BackColor")
-
-    PropertyTester.TestProperty("BackGraphicURL")
-
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    PropertyTester.TestProperty("BackGraphicLocation")
-
-	oObj.HoriOrient = com.sun.star.text.HoriOrientation.CENTER
-	oObj.RelativeWidth = 50
-	PropertyTester.TestProperty("IsWidthRelative", Array(FALSE))
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/TextTableRow/script.xlb b/qadevOOo/tests/basic/ifc/text/TextTableRow/script.xlb
deleted file mode 100644
index 43be1c5b512f..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextTableRow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_TextTableRow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_TextTableRow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/TextTableRow/text_TextTableRow.xba b/qadevOOo/tests/basic/ifc/text/TextTableRow/text_TextTableRow.xba
deleted file mode 100644
index d4f39be2bd8e..000000000000
--- a/qadevOOo/tests/basic/ifc/text/TextTableRow/text_TextTableRow.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_TextTableRow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.TextTableRow
-'*************************************************************************
-On Error Goto ErrHndl
-    PropertyTester.TestProperty("BackColor")
-    PropertyTester.TestProperty("BackTransparent")
-    PropertyTester.TestProperty("BackGraphicURL")
-    PropertyTester.TestProperty("BackGraphicFilter")
-
-    Dim locations As Variant
-    locations = Array(_
-      com.sun.star.style.GraphicLocation.LEFT_TOP,_
-      com.sun.star.style.GraphicLocation.MIDDLE_TOP,_
-      com.sun.star.style.GraphicLocation.RIGHT_TOP,_
-      com.sun.star.style.GraphicLocation.LEFT_MIDDLE,_
-      com.sun.star.style.GraphicLocation.MIDDLE_MIDDLE,_
-      com.sun.star.style.GraphicLocation.RIGHT_MIDDLE,_
-      com.sun.star.style.GraphicLocation.LEFT_BOTTOM,_
-      com.sun.star.style.GraphicLocation.MIDDLE_BOTTOM,_
-      com.sun.star.style.GraphicLocation.RIGHT_BOTTOM,_
-      com.sun.star.style.GraphicLocation.AREA,_
-      com.sun.star.style.GraphicLocation.TILED )
-    PropertyTester.TestProperty("BackGraphicLocation", locations)
-    PropertyTester.TestProperty("TableColumnSeparators")
-    PropertyTester.TestProperty("Height")
-    PropertyTester.TestProperty("IsAutoHeight")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/ViewSettings/script.xlb b/qadevOOo/tests/basic/ifc/text/ViewSettings/script.xlb
deleted file mode 100644
index 8827ee26ea5e..000000000000
--- a/qadevOOo/tests/basic/ifc/text/ViewSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_ViewSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_ViewSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/ViewSettings/text_ViewSettings.xba b/qadevOOo/tests/basic/ifc/text/ViewSettings/text_ViewSettings.xba
deleted file mode 100644
index adc227dae8f9..000000000000
--- a/qadevOOo/tests/basic/ifc/text/ViewSettings/text_ViewSettings.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_ViewSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.text.ViewSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    PropertyTester.TestProperty("ShowAnnotations")
-
-    PropertyTester.TestProperty("ShowBreaks")
-
-    PropertyTester.TestProperty("ShowDrawings")
-
-    PropertyTester.TestProperty("ShowFieldCommands")
-
-    PropertyTester.TestProperty("ShowFootnoteBackground")
-
-    PropertyTester.TestProperty("ShowGraphics")
-
-    PropertyTester.TestProperty("ShowHiddenParagraphs")
-
-    PropertyTester.TestProperty("ShowHiddenText")
-
-    PropertyTester.TestProperty("ShowHoriRuler")
-
-    PropertyTester.TestProperty("ShowHoriScrollBar")
-
-    PropertyTester.TestProperty("ShowIndexMarkBackground")
-
-    PropertyTester.TestProperty("ShowOnlineLayout")
-
-    PropertyTester.TestProperty("ShowParaBreaks")
-
-    PropertyTester.TestProperty("ShowProtectedSpaces")
-
-    PropertyTester.TestProperty("ShowRulers")
-
-    PropertyTester.TestProperty("ShowSoftHyphens")
-
-    PropertyTester.TestProperty("ShowSpaces")
-
-    PropertyTester.TestProperty("ShowTableBoundaries")
-
-    PropertyTester.TestProperty("ShowTables")
-
-    PropertyTester.TestProperty("ShowTabstops")
-
-    PropertyTester.TestProperty("ShowTextBoundaries")
-
-    PropertyTester.TestProperty("ShowTextFieldBackground")
-
-    PropertyTester.TestProperty("ShowVertRuler")
-
-    PropertyTester.TestProperty("ShowVertScrollBar")
-
-    PropertyTester.TestProperty("SmoothScrolling")
-
-    PropertyTester.TestProperty("IsVertRulerRightAligned")
-
-    Dim zoomTypes As Variant
-    zoomTypes = Array(0, 1, 2, 3)
-    PropertyTester.TestProperty("ZoomType", zoomTypes())
-
-    PropertyTester.TestProperty("ZoomValue")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/script.xlb b/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/script.xlb
deleted file mode 100644
index 3eebfbeaeb1b..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XAutoTextContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XAutoTextContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/text_XAutoTextContainer.xba b/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/text_XAutoTextContainer.xba
deleted file mode 100644
index 18ba7b0b7da6..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextContainer/text_XAutoTextContainer.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XAutoTextContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global nGlobalLong As Long
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XAutoTextContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oAutoText As Object
-    Dim aElementNames() As Variant
-    Dim i As Integer
-    Dim nCount As Integer
-
-    Out.Log("Remove element with name '" &amp; cIfcShortName &amp; "' if exists")
-    aElementNames() = oObj.ElementNames
-
-    for i = 0 to uBound(aElementNames())
-        if aElementNames(i) = cIfcShortName then
-            oObj.removeByName(cIfcShortName)
-            nGlobalLong = oObj.Count
-        end if
-    next i
-
-    Test.StartMethod("insertNewByName()")
-    bOK = true
-    oAutoText = oObj.insertNewByName(cIfcShortName)
-    nCount = oObj.Count
-    bOK = bOK AND (oObj.Count = nGlobalLong + 1)
-    Test.MethodTested("insertNewByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName(cIfcShortName)
-
-    nCount = oObj.Count
-    bOK = bOK AND (oObj.Count = nGlobalLong)
-    Test.MethodTested("removeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/script.xlb b/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/script.xlb
deleted file mode 100644
index a35dec04f5bd..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XAutoTextEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XAutoTextEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/text_XAutoTextEntry.xba b/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/text_XAutoTextEntry.xba
deleted file mode 100644
index 99070d58b2e0..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextEntry/text_XAutoTextEntry.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XAutoTextEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XAutoTextEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldText As String, newText As String
-
-    Test.StartMethod("applyTo()")
-    bOK = true
-    oldText = oDoc.Text.getString()
-    oObj.ApplyTo(oDoc.Text.createTextCursor())
-    newText = oDoc.Text.getString()
-    bOK = bOK AND (newText &lt;&gt; oldText)
-    
-    Test.MethodTested("applyTo()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/script.xlb b/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/script.xlb
deleted file mode 100644
index 11ef1cbd6ba5..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XAutoTextGroup" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XAutoTextGroup"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/text_XAutoTextGroup.xba b/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/text_XAutoTextGroup.xba
deleted file mode 100644
index 75d6866993af..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XAutoTextGroup/text_XAutoTextGroup.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XAutoTextGroup" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global nGlobalLong as Long
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XAutoTextGroup
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim aTitles() As Variant
-    Dim aElements() As Variant
-    Dim oCursor As Object
-
-
-   bOK = true
-
-   oCursor = oDoc.Text.createTextCursor()
-   oCursor.gotoEnd(true)
-
-    Test.StartMethod("getTitles()")
-    bOK = true
-    aTitles() = oObj.Titles
-    bOK = bOK AND NOT (uBound(aTitles()) = -1)
-    Test.MethodTested("getTitles()", bOK)
-
-    Test.StartMethod("insertNewByName()")
-    bOK = true
-    oObj.insertNewByName(cIfcShortName, cIfcShortName, oCursor)
-    bOK = bOK AND (oObj.Count &gt; nGlobalLong)
-    Test.MethodTested("insertNewByName()", bOK)
-
-    Test.StartMethod("renameByName()")
-    bOK = true
-    cName =  mid(cIfcShortName,1,2)
-    oObj.renameByName(cIfcShortName,cName, cName &amp; cIfcShortName )
-    aElements() = oObj.getElementNames()
-    bOk = bOK AND (cName = aElements(uBound(aElements())))
-    Test.MethodTested("renameByName()", bOK)
-
-    Test.StartMethod("removeByName()")
-    bOK = true
-    oObj.removeByName(cName)
-    aElements() = oObj.getElementNames()
-    bOk = bOK AND (cName &lt;&gt; aElements(uBound(aElements())))
-    Test.MethodTested("removeByName()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/script.xlb
deleted file mode 100644
index 5ba4d5a9a0d7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XChapterNumberingSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XChapterNumberingSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/text_XChapterNumberingSupplier.xba b/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/text_XChapterNumberingSupplier.xba
deleted file mode 100644
index 5f07b99b1a98..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XChapterNumberingSupplier/text_XChapterNumberingSupplier.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XChapterNumberingSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XChapterNumberingSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getChapterNumberingRules()")
-    bOK = true
-
-    bOK = bOK AND hasUnoInterfaces(oObj.getChapterNumberingRules(), "com.sun.star.container.XIndexReplace")
-    Test.MethodTested("getChapterNumberingRules()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/script.xlb b/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/script.xlb
deleted file mode 100644
index f216aeaf0c5f..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XDefaultNumberingProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XDefaultNumberingProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/text_XDefaultNumberingProvider.xba b/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/text_XDefaultNumberingProvider.xba
deleted file mode 100644
index 9fc53a91753f..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XDefaultNumberingProvider/text_XDefaultNumberingProvider.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XDefaultNumberingProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XDefaultNumberingProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oLocale As New com.sun.star.lang.Locale
-    Dim aIndAcc As Object
-    Dim aPropVals As Object
-    Dim cr As Object
-
-    oLocale.Country = "US"
-    oLocale.Language = "en"
-
-    Test.StartMethod("getDefaultOutlineNumberings()")
-    bOK = true
-    aIndAcc = oObj.getDefaultOutlineNumberings(oLocale)
-    if (ubound(aIndAcc) &gt;= 0) then
-        Out.Log("Returned sequence has " &amp; ubound(aIndAcc) + 1 &amp; " elements.")
-        bOK = bOK AND hasUNOInterfaces(aIndAcc(0), "com.sun.star.container.XIndexAccess")
-    else
-        Out.Log("Returned sequence is EMPTY.")
-        bOK = false
-    end if
-    Test.MethodTested("getDefaultOutlineNumberings()", bOK)
-
-    Test.StartMethod("getDefaultContinuousNumberingLevels()")
-    bOK = true
-    aPropVals = oObj.getDefaultContinuousNumberingLevels(oLocale)
-    if (ubound(aPropVals) &gt;= 0) then
-        Out.Log("Returned sequence has " &amp; ubound(aPropVals) + 1 &amp; " elements.")
-        cr = createUNOService("com.sun.star.reflection.CoreReflection")
-        bOK = bOK AND (cr.getType(aPropVals(0)).Name = "[]com.sun.star.beans.PropertyValue")
-'        OutDefaultContinuousNumberingLevels(aPropVals)
-    else
-        Out.Log("Returned sequence is EMPTY.")
-        bOK = false
-    end if
-    Test.MethodTested("getDefaultContinuousNumberingLevels()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub OutDefaultOutlineNumberings(aIndAcc As Variant)
-    Dim i As Integer
-    Dim k As Integer
-    Dim l As Integer
-    Dim ia As Object
-    Dim props As Variant
-
-    for k = 0 to ubound(aIndAcc)
-        Out.Log("" &amp; k &amp; ")")
-        ia = aIndAcc(k)
-        for l = 0 to ia.Count() - 1
-            Out.Log("    " &amp; l &amp; ":")
-            props = ia.getByIndex(l)
-            for i = 0 to ubound(props)
-                Out.Log("        - " &amp; props(i).Name &amp; " = " &amp; props(i).Value)
-            next i
-        next l
-    next k
-End Sub
-
-Sub OutDefaultContinuousNumberingLevels(aPropVals As Variant)
-    Dim i As Integer
-    Dim k As Integer
-    Dim props As Variant
-
-    for i = 0 to ubound(aPropVals)
-        Out.Log("" &amp; i &amp; ")")
-        props = aPropVals(i)
-        for k = 0 to ubound(props)
-            Out.Log("   - " &amp; props(k).Name &amp; " = " &amp; props(k).Value)
-        next k
-    next i
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XDocumentIndex/script.xlb b/qadevOOo/tests/basic/ifc/text/XDocumentIndex/script.xlb
deleted file mode 100644
index fc20ebb211a8..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XDocumentIndex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XDocumentIndex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XDocumentIndex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XDocumentIndex/text_XDocumentIndex.xba b/qadevOOo/tests/basic/ifc/text/XDocumentIndex/text_XDocumentIndex.xba
deleted file mode 100644
index 021093468be5..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XDocumentIndex/text_XDocumentIndex.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XDocumentIndex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XDocumentIndex
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getServiceName()")
-    bOK = true
-    cName = oObj.getServiceName()
-    Out.Log("Service name is '" &amp; cName &amp; "'")
-    Test.MethodTested("getServiceName()", bOK)
-
-    Test.StartMethod("update()")
-    bOK = true
-    oObj.update()
-    Test.MethodTested("update()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/script.xlb
deleted file mode 100644
index bcd7bbe8ed05..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XEndnotesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XEndnotesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/text_XEndnotesSupplier.xba b/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/text_XEndnotesSupplier.xba
deleted file mode 100644
index c85b42f63945..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XEndnotesSupplier/text_XEndnotesSupplier.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XEndnotesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XEndnotesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getEndnotes()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getEndnotes(), "com.sun.star.container.XIndexAccess")
-    Test.MethodTested("getEndnotes()", bOK)
-
-    Test.StartMethod("getEndnoteSettings()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getEndnoteSettings(), "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getEndnoteSettings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XFootnote/script.xlb b/qadevOOo/tests/basic/ifc/text/XFootnote/script.xlb
deleted file mode 100644
index 38bb5ec7b924..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XFootnote/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XFootnote" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XFootnote"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XFootnote/text_XFootnote.xba b/qadevOOo/tests/basic/ifc/text/XFootnote/text_XFootnote.xba
deleted file mode 100644
index 8b8e11c61215..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XFootnote/text_XFootnote.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XFootnote" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XFootnote
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim cLabel As String
-
-
-    Test.StartMethod("getLabel()")
-    bOK = true
-    cLabel = oObj.Label
-    bOK = bOK AND (cLabel = (cGlobalString &amp; nGlobalLong))
-    Test.MethodTested("getLabel()", bOK)
-
-    Test.StartMethod("setLabel()")
-    bOK = true
-    oObj.Label = cIfcShortName
-    bOK = bOK AND (oObj.Label &lt;&gt; cLabel)
-    Test.MethodTested("setLabel()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/script.xlb
deleted file mode 100644
index 8b7a7ab94be3..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XFootnotesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XFootnotesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/text_XFootnotesSupplier.xba b/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/text_XFootnotesSupplier.xba
deleted file mode 100644
index 009d7b8f7e3d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XFootnotesSupplier/text_XFootnotesSupplier.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XFootnotesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XFootnotesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getFootnotes()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getFootnotes(), "com.sun.star.container.XIndexAccess")
-    Test.MethodTested("getFootnotes()", bOK)
-
-    Test.StartMethod("getFootnoteSettings()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getFootnoteSettings(), "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getFootnoteSettings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/script.xlb
deleted file mode 100644
index 4bc46cc25d13..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XLineNumberingSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XLineNumberingSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/text_XLineNumberingSupplier.xba b/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/text_XLineNumberingSupplier.xba
deleted file mode 100644
index 64844888e720..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XLineNumberingSupplier/text_XLineNumberingSupplier.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XLineNumberingSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XLineNumberingSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim Rules As Variant
-
-
-    Test.StartMethod("getLineNumberingRules()")
-    bOK = true
-    Rules = oObj.getLineNumberingRules()
-    Out.Log("ubound(Rules) = " &amp; ubound(Rules))
-    bOK = bOK AND NOT isNULL(Rules)
-    Test.MethodTested("getLineNumberingRules()", bOK)
-
-    Test.StartMethod("setLineNumberingRules()")
-    bOK = true
-    oObj.setLineNumberingRules(Rules)
-    Test.MethodTested("setLineNumberingRules()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/script.xlb
deleted file mode 100644
index 92cdc97078fe..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XMailMergeBroadcaster" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="text_XMailMergeBroadcaster"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/text_XMailMergeBroadcaster.xba b/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/text_XMailMergeBroadcaster.xba
deleted file mode 100644
index 43edb935143d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XMailMergeBroadcaster/text_XMailMergeBroadcaster.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XMailMergeBroadcaster" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'	Global FUNCTION XMailMergeEvent()
-'   This function fires an event which causes a listner call
-
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-	Dim bCB1 as Boolean
-	Dim bCB2 as Boolean
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XMailMergeBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-	Dim oListener1 as Object
-	Dim oListener2 as Object
-
-    Out.Log("create two listeners")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.text.XMailMergeListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.text.XMailMergeListener")
-
-    Test.StartMethod("addMailMergeEventListener()")
-	bCB1 = FALSE
-	bCB2 = FALSE
-	bOK = TRUE
-	oObj.addMailMergeEventListener(oListener1)
-	oObj.addMailMergeEventListener(oListener2)
-    XMailMergeEvent()
-	out.dbg("call oObj.execute()")
-	out.dbg("Listener1: " + bCB1 + " ; Listener2: " + bCB2)
-	bOK = bOK AND bCB1 AND bCB2
-    Test.MethodTested("addMailMergeEventListener()", bOK)
-	
-    Test.StartMethod("removeMailMergeEventListener()")
-	bCB1 = FALSE
-	bCB2 = FALSE
-	bOK = TRUE
-	out.dbg("remove Listener1")
-	oObj.removeMailMergeEventListener(oListener1)
-	out.dbg("call oObj.execute()")
-    XMailMergeEvent()
-	out.dbg("Listener1: " + bCB1 + " ; Listener2: " + bCB2)
-	bOK = bOK AND NOT bCB1 AND bCB2
-    Test.MethodTested("removeMailMergeEventListener()", bOK)
-	
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub CB1_notifyMailMergeEvent()
-	out.dbg("CB1_notifyMailMergeEvent() was clled.")
-	bCB1 = TRUE
-end Sub
- 
-Sub CB2_notifyMailMergeEvent()
-	out.dbg("CB2_notifyMailMergeEvent() was clled.")
-	bCB2 = TRUE
-end Sub
- 
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XPageCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XPageCursor/script.xlb
deleted file mode 100644
index 45ceef1da261..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XPageCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XPageCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XPageCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XPageCursor/text_XPageCursor.xba b/qadevOOo/tests/basic/ifc/text/XPageCursor/text_XPageCursor.xba
deleted file mode 100644
index 6f4c28469a0d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XPageCursor/text_XPageCursor.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XPageCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - PageCursor must be created from document XPageCursor.sdw
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XPageCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    RecreateObj()
-
-    Test.StartMethod("jumpToFirstPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToFirstPage()
-    oObj.goRight(12, true)
-    bOK = bOK AND oObj.String = "StartOfPage1"
-    Test.MethodTested("jumpToFirstPage()", bOK)
-
-    Test.StartMethod("jumpToLastPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToLastPage()
-    oObj.goRight(12, true)
-    bOK = bOK AND oObj.String = "StartOfPage2"
-    Test.MethodTested("jumpToLastPage()", bOK)
-
-    Test.StartMethod("jumpToPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToPage(1)
-    oObj.goRight(12, true)
-    bOK = bOK AND oObj.String = "StartOfPage1"
-    Test.MethodTested("jumpToPage()", bOK)
-
-    Test.StartMethod("getPage()")
-    bOK = true
-    bOK = bOK AND oObj.getPage() = 1
-    Test.MethodTested("getPage()", bOK)
-
-    Test.StartMethod("jumpToNextPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToNextPage()
-    oObj.goRight(12, true)
-    bOK = bOK AND oObj.String = "StartOfPage2"
-    Test.MethodTested("jumpToNextPage()", bOK)
-
-    Test.StartMethod("jumpToPreviousPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToPreviousPage()
-    oObj.goLeft(12, true)
-    bOK = bOK AND oObj.String = "EndOfPage  1"
-    Test.MethodTested("jumpToPreviousPage()", bOK)
-
-    Test.StartMethod("jumpToEndOfPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToEndOfPage()
-    oObj.goLeft(12, true)
-    bOK = bOK AND oObj.String = "EndOfPage  1"
-    Test.MethodTested("jumpToEndOfPage()", bOK)
-
-    Test.StartMethod("jumpToStartOfPage()")
-    bOK = true
-    bOK = bOK AND oObj.jumpToStartOfPage()
-    oObj.goRight(12, true)
-    bOK = bOK AND oObj.String = "StartOfPage1"
-    Test.MethodTested("jumpToStartOfPage()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XPagePrintable/script.xlb b/qadevOOo/tests/basic/ifc/text/XPagePrintable/script.xlb
deleted file mode 100644
index 9e126a20a50b..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XPagePrintable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XPagePrintable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XPagePrintable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XPagePrintable/text_XPagePrintable.xba b/qadevOOo/tests/basic/ifc/text/XPagePrintable/text_XPagePrintable.xba
deleted file mode 100644
index 80d9a93cef65..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XPagePrintable/text_XPagePrintable.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XPagePrintable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XPagePrintable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aPrintSettings As Variant
-    Dim aNewSettings As Variant
-
-    Test.StartMethod("getPagePrintSettings()")
-    bOK = true
-    aPrintSettings = oObj.getPagePrintSettings()
-    Out.Log("PrintSettings have " &amp; (ubound(aPrintSettings) + 1) &amp; " elements")
-    bOK = bOK AND (ubound(aPrintSettings) &gt; 0)
-    Test.MethodTested("getPagePrintSettings()", bOK)
-
-    Test.StartMethod("setPagePrintSettings()")
-    bOK = true
-    Dim bOldLandscape As Boolean
-    ' Changing Landscape property...
-    bOldLandscape = aPrintSettings(8).Value
-    aPrintSettings(8).Value = NOT bOldLandscape
-
-    oObj.setPagePrintSettings(aPrintSettings())
-    aNewSettings = oObj.getPagePrintSettings()
-    bOK = bOK AND (aNewSettings(8).Value = NOT bOldLandscape)
-
-    Test.MethodTested("setPagePrintSettings()", bOK)
-
-    Test.StartMethod("printPages()")
-    bOK = true
-    Dim aPrintingOptions(0) As New com.sun.star.beans.PropertyValue
-    Dim sFileName As String
-    sFileName = utils.Path2URL(cTestDocsDir &amp; "/temp/XPagePrintable.prt")
-
-    if (FileExists(sFileName)) then
-        kill(sFileName)
-    end if
-
-    aPrintingOptions(0).Name = "FileName"
-    aPrintingOptions(0).Value = sFileName
-    aPrintingOptions(0).State = com.sun.star.beans.PropertyState.DEFAULT_VALUE
-
-    Out.Log("Printing to " &amp; sFileName)
-    oObj.printPages(aPrintingOptions())
-
-    bOK = bOK AND FileExists(sFileName)
-    Test.MethodTested("printPages()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XParagraphCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XParagraphCursor/script.xlb
deleted file mode 100644
index 0b33ec3d310c..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XParagraphCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XParagraphCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XParagraphCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XParagraphCursor/text_XParagraphCursor.xba b/qadevOOo/tests/basic/ifc/text/XParagraphCursor/text_XParagraphCursor.xba
deleted file mode 100644
index 072cb69dbb41..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XParagraphCursor/text_XParagraphCursor.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XParagraphCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oText As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XParagraphCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-
-    for i = 0 to 2
-        oText.insertString(oObj, "" + i +"Start of paragraph.", false)
-        oText.insertString(oObj, Chr(10) + cObjectName + " " + cIfcShortName + Chr(10), false)
-        oText.insertString(oObj, "Paragraph's end." + i, false)
-        oText.insertControlCharacter(oObj, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    next i
-
-    oObj.gotoStart(false)
-
-    Test.StartMethod("gotoStartOfParagraph()")
-    bOK = true
-    oObj.gotoStartOfParagraph(false)
-    oText.insertString(oObj, "1", false)
-    bOK = bOK AND inStr(1, oText.String, "10Start") &lt;&gt; 0
-    Test.MethodTested("gotoStartOfParagraph()", bOK)
-
-    Test.StartMethod("gotoEndOfParagraph()")
-    bOK = true
-    oObj.gotoEndOfParagraph(false)
-    oText.insertString(oObj, "2", false)
-    bOK = bOK AND inStr(1, oText.String, "end.02") &lt;&gt; 0
-    Test.MethodTested("gotoEndOfParagraph()", bOK)
-
-    Test.StartMethod("gotoNextParagraph()")
-    bOK = true
-    oObj.gotoNextParagraph(false)
-    oObj.gotoNextParagraph(false)
-    oObj.gotoEndOfParagraph(false)
-    oText.insertString(oObj, "3", false)
-    bOK = bOK AND inStr(1, oText.String, "end.23") &lt;&gt; 0
-    Test.MethodTested("gotoNextParagraph()", bOK)
-
-    Test.StartMethod("gotoPreviousParagraph()")
-    bOK = true
-    oObj.gotoPreviousParagraph(false)
-    oObj.gotoEndOfParagraph(false)
-    oText.insertString(oObj, "4", false)
-    bOK = bOK AND inStr(1, oText.String, "end.14") &lt;&gt; 0
-    Test.MethodTested("gotoPreviousParagraph()", bOK)
-
-    Test.StartMethod("isStartOfParagraph()")
-    bOK = true
-    oObj.gotoStartOfParagraph(false)
-    bOK = bOK AND oObj.isStartOfParagraph()
-    bOK = bOK AND NOT oObj.isEndOfParagraph()
-    Test.MethodTested("isStartOfParagraph()", bOK)
-
-    Test.StartMethod("isEndOfParagraph()")
-    bOK = true
-    oObj.gotoEndOfParagraph(false)
-    bOK = bOK AND oObj.isEndOfParagraph()
-    bOK = bOK AND NOT oObj.isStartOfParagraph()
-    Test.MethodTested("isEndOfParagraph()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/script.xlb
deleted file mode 100644
index e66d625ea72a..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XReferenceMarksSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XReferenceMarksSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/text_XReferenceMarksSupplier.xba b/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/text_XReferenceMarksSupplier.xba
deleted file mode 100644
index ee2f4b025d33..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XReferenceMarksSupplier/text_XReferenceMarksSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XReferenceMarksSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XReferenceMarksSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getReferenceMarks()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getReferenceMarks(), "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getReferenceMarks()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/script.xlb b/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/script.xlb
deleted file mode 100644
index 45220fcf0ae9..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XRelativeTextContentInsert" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XRelativeTextContentInsert"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/text_XRelativeTextContentInsert.xba b/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/text_XRelativeTextContentInsert.xba
deleted file mode 100644
index 63d93c63593c..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XRelativeTextContentInsert/text_XRelativeTextContentInsert.xba
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XRelativeTextContentInsert" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XRelativeTextContentInsert
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oEnum As Object
-    Dim oCursor As Object
-    Dim oContent1 As Object
-    Dim oContent2 As Object
-    Dim bFound As Boolean
-    Dim oEl As Object
-
-    Test.StartMethod("insertTextContentBefore()")
-    bOK = true
-    oCursor = oObj.createTextCursor()
-    if (isNULL(oCursor)) then Out.Log("Can't create text cursor!")
-
-    Out.Log("First, mark all existant entries with 0")
-
-    oEnum = oObj.createEnumeration()
-    while (oEnum.hasMoreElements())
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            oEl.String = "0"
-        end if
-    wend
-
-    Out.Log("Inserting TextSection...")
-    oContent1 = oDoc.createInstance("com.sun.star.text.TextSection")
-    oObj.insertTextContent(oCursor, oContent1, false)
-
-    oEnum = oObj.createEnumeration()
-    while (oEnum.hasMoreElements())
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            if (oEl.String = "") then oEl.String = "1"
-        end if
-    wend
-
-    Out.Log("Mark new entry with 1")
-
-    oContent2 = oDoc.createInstance("com.sun.star.text.Paragraph")
-    oObj.insertTextContentBefore(oContent2, oContent1)
-
-    oEnum = oObj.createEnumeration()
-    while (oEnum.hasMoreElements())
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            if (oEl.String = "") then oEl.String = "2"
-        end if
-    wend
-
-    Out.Log("Mark new entry with 2")
-
-    Out.Log("Testing that content was inserted BEFORE. I.e. Label 2 before label 1")
-
-    oEnum = oObj.createEnumeration()
-    bFound = false
-    while (oEnum.hasMoreElements() AND NOT bFound)
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            bFound = oEl.String = "2"
-        end if
-    wend
-
-    oEl = oEnum.NextElement()
-    bOK = bOK AND oEl.String = "1"
-
-    Test.MethodTested("insertTextContentBefore()", bOK)
-
-
-    Test.StartMethod("insertTextContentAfter()")
-    bOK = true
-
-    Out.Log("Inserting TextSection...")
-    oContent1 = oDoc.createInstance("com.sun.star.text.TextSection")
-    oObj.insertTextContent(oCursor, oContent1, false)
-
-    oEnum = oObj.createEnumeration()
-    while (oEnum.hasMoreElements())
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            if (oEl.String = "") then oEl.String = "3"
-        end if
-    wend
-
-    Out.Log("Mark new entry with 3")
-
-    oContent2 = oDoc.createInstance("com.sun.star.text.Paragraph")
-    oObj.insertTextContentAfter(oContent2, oContent1)
-
-    oEnum = oObj.createEnumeration()
-    while (oEnum.hasMoreElements())
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            if (oEl.String = "") then oEl.String = "4"
-        end if
-    wend
-
-    Out.Log("Mark new entry with 4")
-
-    Out.Log("Testing that content was inserted AFTRER. I.e. Label 4 after label 3")
-
-    oEnum = oObj.createEnumeration()
-    bFound = false
-    while (oEnum.hasMoreElements() AND NOT bFound)
-        oEl = oEnum.NextElement()
-        if (oEl.supportsService("com.sun.star.text.Paragraph")) then
-            bFound = oEl.String = "3"
-        end if
-    wend
-
-    oEl = oEnum.NextElement()
-    bOK = bOK AND oEl.String = "4"
-
-    Test.MethodTested("insertTextContentAfter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XSentenceCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XSentenceCursor/script.xlb
deleted file mode 100644
index a27aa634f031..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XSentenceCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XSentenceCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XSentenceCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XSentenceCursor/text_XSentenceCursor.xba b/qadevOOo/tests/basic/ifc/text/XSentenceCursor/text_XSentenceCursor.xba
deleted file mode 100644
index 09cd1870b19d..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XSentenceCursor/text_XSentenceCursor.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XSentenceCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XSentenceCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    oObj.Text.String = "Sentence two. Sentence three."
-
-	oObj.gotoEnd(false)
-
-    Test.StartMethod("gotoStartOfSentence()")
-    bOK = true
-    oObj.gotoStartOfSentence(false)
-    oObj.String = "1"
-    Out.Log("Current text: '" + oObj.Text.String + "'")
-    bOK = bOK AND inStr(1, oObj.Text.String, "1Sentence three.") &lt;&gt; 0
-    Test.MethodTested("gotoStartOfSentence()", bOK)
-
-    Test.StartMethod("isStartOfSentence()")
-    Test.StartMethod("isEndOfSentence()")
-    bOK = true
-    oObj.gotoStartOfSentence(false)
-    bOK = bOK AND oObj.isStartOfSentence()
-    bOK = bOK AND NOT oObj.isEndOfSentence()
-    oObj.gotoEndOfSentence(false)
-    bOK = bOK AND NOT oObj.isStartOfSentence()
-    bOK = bOK AND oObj.isEndOfSentence()
-    Test.MethodTested("isStartOfSentence()", bOK)
-    Test.MethodTested("isEndOfSentence()", bOK)
-
-
-    Test.StartMethod("gotoEndOfSentence()")
-    bOK = true
-    oObj.gotoEndOfSentence(false)
-    oObj.String = "2"
-    Out.Log("Current text: '" + oObj.Text.String + "'")
-    bOK = bOK AND inStr(1, oObj.Text.String, "three.2") &lt;&gt; 0
-    Test.MethodTested("gotoEndOfSentence()", bOK)
-
-    Test.StartMethod("gotoPreviousSentence()")
-    bOK = true
-    oObj.gotoPreviousSentence(false)
-    oObj.String = "3"
-    Out.Log("Current text: '" + oObj.Text.String + "'")
-    bOK = bOK AND inStr(1, oObj.Text.String, "3Sentence two.") &lt;&gt; 0
-    Test.MethodTested("gotoPreviousSentence()", bOK)
-
-    Test.StartMethod("gotoNextSentence()")
-    bOK = true
-    oObj.gotoNextSentence(false)
-    oObj.String = "4"
-    Out.Log("Current text: '" + oObj.Text.String + "'")
-    bOK = bOK AND inStr(1, oObj.Text.String, "41") &lt;&gt; 0
-    Test.MethodTested("gotoNextSentence()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XSimpleText/script.xlb b/qadevOOo/tests/basic/ifc/text/XSimpleText/script.xlb
deleted file mode 100644
index d15cb9a51d44..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XSimpleText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XSimpleText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XSimpleText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XSimpleText/text_XSimpleText.xba b/qadevOOo/tests/basic/ifc/text/XSimpleText/text_XSimpleText.xba
deleted file mode 100644
index ee73a6e7f3b7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XSimpleText/text_XSimpleText.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XSimpleText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XSimpleText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oPosCursor As Variant
-    Dim cIfcShortName As String
-    Dim bOK As Boolean
-    Dim oldString, newString As String
-
-    cIfcShortName = "XSimpleText"
-
-    Test.StartMethod("createTextCursor()")
-    bOK = true
-    oCursor = oObj.createTextCursor()
-    bOK = bOK AND NOT (isNull(oCursor))
-    bOK = bOK AND hasUnoInterfaces(oCursor, "com.sun.star.text.XTextCursor")
-    Test.MethodTested("createTextCursor()", bOK)
-
-    Test.StartMethod("createTextCursorByRange()")
-    bOK = true
-    oPosCursor = oObj.createTextCursorbyRange(oCursor)
-    bOK = bOK AND NOT isNull(oPosCursor)
-    bOK = bOK AND hasUnoInterfaces(oPosCursor, "com.sun.star.text.XTextCursor")
-    Test.MethodTested("createTextCursorByRange()", bOK)
-
-    Test.StartMethod("insertString()")
-    bOK = true
-    oldString = oObj.String
-    Out.Log("String before inserting:'" + oldString + "'")
-    oCursor.gotoStart(false)
-    oObj.insertString(oCursor, cIfcShortName, false)
-    Dim newStr As String
-    newStr = oObj.String
-    Out.Log("String content after inserting:'" + newStr + "'")
-    Dim expectedStr As String
-    expectedStr = cIfcShortName + oldString
-    Out.Log("Expected string:'" + expectedStr + "'")
-    bOK = bOK AND (expectedStr = newStr)
-    oObj.setString(oldString)
-    Test.MethodTested("insertString()", bOK)
-
-    ' some cursor navigation to verify if controlcharacters have benn inserted:)
-    Test.StartMethod("insertControlCharacter()")
-    bOK = true
-    oldString = oObj.getString()
-    newString = "XSimpleText"
-    Out.Log("Set string to '" + newString + "'")
-    oObj.setString(newString)
-    Out.Log("Current string content of object: '" + oObj.getString() + "'")
-    oCursor.gotoStart(false)
-    Out.Log("Insert control characters...")
-'    oObj.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oObj.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.LINE_BREAK, false)
-    Out.Log("Now string content of object: '" + oObj.getString() + "'")
-    Dim breakPos As Integer
-    breakPos = inStr(oObj.getString(), chr(10))
-    Out.Log("Line break found at " + breakPos)
-    bOK = bOK AND breakPos > 0
-    oObj.String = oldString
-    Out.Log("Return string to old state:'" + oObj.getString() + "'" )
-    Test.MethodTested("insertControlCharacter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XText/script.xlb b/qadevOOo/tests/basic/ifc/text/XText/script.xlb
deleted file mode 100644
index af753e01a742..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XText/text_XText.xba b/qadevOOo/tests/basic/ifc/text/XText/text_XText.xba
deleted file mode 100644
index c0580ba6ea45..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XText/text_XText.xba
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oCollection As Object [optional]
-'       if this relation exists then the method "count" is called for check insert/remove
-'     - Global oInstance As Object
-'       Global aAddons() As Variant [optional]
-'       if this relation exists, then additional methods are called before and after insert/removeTextContent() methods
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim cText As String
-    Dim oCursor As Object
-    Dim i1 As Integer
-    Dim i2 As Integer
-
-    Test.StartMethod("insertTextContent()")
-    bOK = true
-    cText = ". Zeile : test_XText"
-
-    If IsObject(oCollection) and IsObject(oInstance) Then
-        oCursor = oObj.createTextCursor()
-        oCursor.gotoEnd(false)
-        i1 = count(oCollection)
-        Out.Log("Before inserting we have " + i1 + " elements.")
-    
-'        if isArray(aAddons) then                                    
-'            Out.Log("Calling beforeInsertTextContent() ...")
-'            beforeInsertTextContent()
-'        endif
-
-        oObj.insertTextContent(oCursor, oInstance, false)
-
-'        if isArray(aAddons) then 
-'            Out.Log("Calling afterInsertTextContent() ...")
-'            afterInsertTextContent()
-'        endif
-
-        i2 = count(oCollection)
-        Out.Log("After inserting we have " + i2 + " elements.")
-        bOK = bOK AND i1 = i2 - 1
-        Test.MethodTested("insertTextContent()", bOK)
-
-        Test.StartMethod("removeTextContent()")
-        bOK = true
-        i1 = count(oCollection)
-        Out.Log("Before removing we have " + i1 + " elements.")
-
-'        if (isArray(aAddons)) then 
-'           Out.Log("Calling beforeRemoveTextContent() ...")
-'            beforeRemoveTextContent()
-'        endif
-
-        oObj.removeTextContent(oInstance)
-
-'        if (isArray(aAddons)) then 
-'            Out.Log("Calling afterRemoveTextContent() ...")
-'            afterRemoveTextContent()
-'        endif
-
-        i2 = count(oCollection)
-        Out.Log("After removing we have " + i2 + " elements.")
-        bOK = bOK AND i1 = i2 + 1
-        Test.MethodTested("removeTextContent()", bOK)
-    Else
-        oCursor = oObj.createTextCursor()
-        oCursor.gotoEnd(false)
-        oObj.insertTextContent(oCursor, oInstance, false)
-        Test.MethodTested("insertTextContent()", True)
-        Test.StartMethod("removeTextContent()")
-        oObj.removeTextContent(oInstance)
-        Test.MethodTested("removeTextContent()", True)
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Function count(container As Variant) As Integer
-    Dim iAmount As Integer
-    Dim oEnumeration As Object
-
-    if hasUnoInterfaces(container, "com.sun.star.container.XIndexAccess") then
-        iAmount = container.getCount()
-    elseif hasUnoInterfaces(container, "com.sun.star.container.XNameAccess") then
-        iAmount = ubound(container.getElementNames()) + 1
-    elseif hasUnoInterfaces(container, "com.sun.star.container.XEnumerationAccess") then
-        oEnumeration = container.createEnumeration()
-        iAmount = 0
-        while oEnumeration.hasMoreElements()
-            iAmount = iAmount + 1
-            oEnumeration.nextElement()
-        wend
-    end if
-
-    count() = iAmount
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextColumns/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextColumns/script.xlb
deleted file mode 100644
index de7dd8e808c0..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextColumns/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextColumns" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextColumns"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextColumns/text_XTextColumns.xba b/qadevOOo/tests/basic/ifc/text/XTextColumns/text_XTextColumns.xba
deleted file mode 100644
index bc9c2c048c8f..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextColumns/text_XTextColumns.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextColumns" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oPageStyle As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextColumns
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim nCount As Integer
-    Dim aColumns As Variant
-    Dim RightCol As Variant
-    Dim LeftCol As Variant
-    Dim nRefValue As Long
-
-    nCount = 2
-
-    Test.StartMethod("setColumnCount()")
-    bOK = true
-    oObj.setColumnCount(nCount)
-    Test.MethodTested("setColumnCount()", bOK)
-
-    Test.StartMethod("getColumns()")
-    bOK = true
-    aColumns = oObj.Columns
-    bOK = bOK AND NOT isNull(aColumns)
-    Test.MethodTested("getColumns()", bOK)
-
-    LeftCol = aColumns(0)
-    RightCol = aColumns(1)
-    RightCol.Width = 10000 : RightCol.RightMargin = 2000
-    LeftCol.Width = 15000  : LeftCol.LeftMargin = 5000
-
-    aColumns(0) = LeftCol
-    aColumns(1) = RightCol
-
-    oObj.setColumns(aColumns())
-
-    ' initialize the pagestyle with the new values
-    oPageStyle.TextColumns = oObj
-
-    ' check if ColumnsCount was set successfull
-    Test.StartMethod("getColumnCount()")
-    bOK = true
-    bOK = bOK AND (nCount = oPageStyle.TextColumns.ColumnCount)
-    Test.MethodTested("getColumnCount()", bOK)
-
-    Test.StartMethod("getReferenceValue()")
-    bOK = true
-    nRefValue = oObj.getReferenceValue()
-    bOK = bOK AND (nRefValue = 25000)
-    Test.MethodTested("getReferenceValue()", bOK)
-
-    Test.StartMethod("setColumns()")
-    bOK = true
-    RightCol.Width = 15000
-    aColumns(1) = RightCol
-    oObj.setColumns(aColumns())
-    oPageStyle.TextColumns = oObj
-    bOK = bOK AND (oPageStyle.TextColumns.ReferenceValue = 30000)
-    Test.MethodTested("setColumns()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextContent/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextContent/script.xlb
deleted file mode 100644
index b15fd5993ee6..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextContent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextContent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextContent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextContent/text_XTextContent.xba b/qadevOOo/tests/basic/ifc/text/XTextContent/text_XTextContent.xba
deleted file mode 100644
index acfb85d5edc4..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextContent/text_XTextContent.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextContent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextContent
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-	Dim bImpossible as Boolean
-	
-	bImpossible = FALSE
-    Test.StartMethod("getAnchor()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getAnchor(), "com.sun.star.text.XTextRange")
-    Test.MethodTested("getAnchor()", bOK)
-
-On Error Goto ImpossibleErr
-	If bXTextContentImpossible then
-		bImpossible = TRUE
-	End If		
-
-On Error Goto ErrHndl
-
-    Test.StartMethod("attach()")
-	bOK = true
-    oXTextContent.attach(oXTextContentRange)
-	If bImpossible then
-		bOK = True
-	    Out.Log("bXTextContnetImpossible = TRUE: Object is not " + _
-		        "able to attach() to something => TRUE")
-	end If
-    Test.MethodTested("attach()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-   	bOK = false
-    resume next
-	
-ImpossibleErr:
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextCursor/script.xlb
deleted file mode 100644
index ff8b4c2ee551..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextCursor/text_XTextCursor.xba b/qadevOOo/tests/basic/ifc/text/XTextCursor/text_XTextCursor.xba
deleted file mode 100644
index fa542d02515b..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextCursor/text_XTextCursor.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oCursor As Object
-' One more cursor
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oRange As Object
-
-    oObj.Text.String = "abcdefg"
-
-    Test.StartMethod("gotoEnd()")
-    bOK = true
-    oObj.gotoEnd(false)
-    oObj.String = "1"
-    bOK = bOK AND inStr(1, oObj.Text.String, "g1")
-    Test.MethodTested("gotoEnd()", bOK)
-
-    Test.StartMethod("gotoStart()")
-    bOK = true
-    oObj.gotoStart(false)
-    oObj.String = "2"
-    bOK = bOK AND inStr(1, oObj.Text.String, "2a")
-    Test.MethodTested("gotoStart()", bOK)
-
-    Test.StartMethod("goRight()")
-    bOK = true
-    oObj.gotoStart(false)
-    oObj.goRight(2, false)
-    oObj.String = "3"
-    bOK = bOK AND inStr(1, oObj.Text.String, "2a3")
-    Test.MethodTested("goRight()", bOK)
-
-    Test.StartMethod("goLeft()")
-    bOK = true
-    oObj.gotoEnd(false)
-    oObj.goLeft(2, false)
-    oObj.String = "4"
-    bOK = bOK AND inStr(1, oObj.Text.String, "4g1")
-    Test.MethodTested("goLeft()", bOK)
-
-    Test.StartMethod("gotoRange()")
-    bOK = true
-    oCursor.gotoEnd(false)
-    oCursor.goLeft(1, false)
-    oCursor.goLeft(2, true)
-    oObj.gotoStart(false)
-    oObj.gotoRange(oCursor, false)
-    bOK = bOK AND oObj.String = "4g"
-    Test.MethodTested("gotoRange()", bOK)
-
-    Test.StartMethod("collapseToStart()")
-    bOK = true
-    cTp = oObj.String
-    oObj.collapseToStart()
-    oObj.String = "5"
-    bOK = bOK AND inStr(1, oObj.Text.String, "5" &amp; cTp)
-    Test.MethodTested("collapseToStart()", bOK)
-
-    Test.StartMethod("collapseToEnd()")
-    bOK = true
-    oObj.gotoEnd(false)
-    oObj.goLeft(3, true)
-    cTp = oObj.String
-    oObj.collapseToEnd()
-    oObj.String = "6"
-    bOK = bOK AND inStr(1, oObj.Text.String, cTp &amp; "6")
-    Test.MethodTested("collapseToEnd()", bOK)
-
-    Test.StartMethod("isCollapsed()")
-    bOK = true
-    oObj.collapseToStart()
-    bOK = bOK AND oObj.isCollapsed()
-    oObj.gotoEnd(false)
-    oObj.goLeft(3, true)
-    bOK = bOK AND NOT oObj.isCollapsed()
-    Test.MethodTested("isCollapsed()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextDocument/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextDocument/script.xlb
deleted file mode 100644
index 3d21d9548231..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextDocument/text_XTextDocument.xba b/qadevOOo/tests/basic/ifc/text/XTextDocument/text_XTextDocument.xba
deleted file mode 100644
index a8a63b753495..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextDocument/text_XTextDocument.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getText()")
-    bOK = true
-    oText = oObj.getText()
-    bOK = bOK AND hasUnoInterfaces(oText, "com.sun.star.text.XText")
-    Test.MethodTested("getText()", bOK)
-
-    Test.StartMethod("reformat()")
-    bOK = true
-    oObj.reformat()
-    Test.MethodTested("reformat()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/script.xlb
deleted file mode 100644
index 6c31a1aadd14..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextEmbeddedObjectsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextEmbeddedObjectsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/text_XTextEmbeddedObjectsSupplier.xba b/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/text_XTextEmbeddedObjectsSupplier.xba
deleted file mode 100644
index 53ae423f5175..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextEmbeddedObjectsSupplier/text_XTextEmbeddedObjectsSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextEmbeddedObjectsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextEmbeddedObjectsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getEmbeddedObjects()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getEmbeddedObjects(), "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getEmbeddedObjects()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextField/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextField/script.xlb
deleted file mode 100644
index 5520ad3eb242..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextField/text_XTextField.xba b/qadevOOo/tests/basic/ifc/text/XTextField/text_XTextField.xba
deleted file mode 100644
index 183707c95a45..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextField/text_XTextField.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getPresentation()")
-    bOK = true
-    Out.Log("getting presentetion with bShowCommand flag...")
-    bOK = bOK AND (VarType(oObj.getPresentation(true)) = 8 )
-    Out.Log("Result: " &amp; bOK)
-    Out.Log("getting presentetion without bShowCommand flag...")
-    bOK = bOK AND (VarType(oObj.getPresentation(false)) = 8 )
-    Out.Log("Result: " &amp; bOK)
-
-    Test.MethodTested("getPresentation()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextFrame/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextFrame/script.xlb
deleted file mode 100644
index 5da11ee8e3a7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextFrame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextFrame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextFrame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextFrame/text_XTextFrame.xba b/qadevOOo/tests/basic/ifc/text/XTextFrame/text_XTextFrame.xba
deleted file mode 100644
index c2649b234521..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextFrame/text_XTextFrame.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextFrame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextFrame
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oCursor As Object
-
-
-    Test.StartMethod("getText()")
-    bOK = true
-    oText = oObj.Text
-    bOK = bOK AND NOT isNull(oText)
-
-    oCursor = oObj.Text.createTextCursor()
-    oBookmark = oDoc.Bookmarks.getByIndex(0)
-
-    oCursor.gotoRange(oBookmark.Anchor, true)
-
-    ' ... and check if text is what it should be
-    bOK = bOK AND (mid(oCursor.String, 1, Len(cFrameName)) = cFrameName)
-    Test.MethodTested("getText()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/script.xlb
deleted file mode 100644
index 1c98d19d8c83..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextGraphicObjectsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextGraphicObjectsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/text_XTextGraphicObjectsSupplier.xba b/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/text_XTextGraphicObjectsSupplier.xba
deleted file mode 100644
index 1b6b7ba6f1c9..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextGraphicObjectsSupplier/text_XTextGraphicObjectsSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextGraphicObjectsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextGraphicObjectsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getGraphicObjects()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getGraphicObjects(), "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getGraphicObjects()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRange/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextRange/script.xlb
deleted file mode 100644
index 98eb1adc767b..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRange/text_XTextRange.xba b/qadevOOo/tests/basic/ifc/text/XTextRange/text_XTextRange.xba
deleted file mode 100644
index 14d417924c27..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRange/text_XTextRange.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oStartOfTextRange As Object
-    Dim oEndOfTextRange As Object
-    Dim oText As Object
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("setString()")
-    Test.StartMethod("getString()")
-    bOK = true
-    oObj.setString("Middle")
-    bOK = bOK AND (oObj.getString() = "Middle")
-    Test.MethodTested("setString()", bOK)
-    Test.MethodTested("getString()", bOK)
-
-    Test.StartMethod("getEnd()")
-    oEndOfTextRange = oObj.getEnd()
-    oEndOfTextRange.String = "End"
-
-    Test.StartMethod("getStart()")
-    bOK = true
-    oStartOfTextRange = oObj.getStart()
-    oStartOfTextRange.String = "Start"
-
-    Test.StartMethod("getText()")
-    bOK = true
-    oText = oObj.getText()
-    Out.Log("Result string is '" + oText.getString() + "'")
-    bOK = bOK AND instr(oText.getString(), "StartMiddleEnd") &gt; 0
-    Test.MethodTested("getEnd()", bOK)
-    Test.MethodTested("getStart()", bOK)
-    Test.MethodTested("getText()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/script.xlb
deleted file mode 100644
index 08a067879bf7..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextRangeCompare" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextRangeCompare"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/text_XTextRangeCompare.xba b/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/text_XTextRangeCompare.xba
deleted file mode 100644
index 4e750a4a47ee..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRangeCompare/text_XTextRangeCompare.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextRangeCompare" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextRangeCompare
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oCursor1 As Object
-    Dim oCursor2 As Object
-    Dim nResult As Integer
-    Dim bEnd As Boolean
-    Dim bStart As Boolean
-    Dim cIfcShortName As String
-
-    cIfcShortName = "XTextRangeCompare"
-
-    nResult = 10
-
-    Test.StartMethod("compareRegionEnds()")
-    Test.StartMethod("compareRegionStarts()")
-
-    oCursor1 = oObj.createTextCursor()
-    oCursor2 = oObj.createTextCursor()
-
-    nResult = oObj.compareRegionEnds(oCursor1, oCursor2)
-    bEnd = (nResult = 0)
-    nResult = oObj.compareRegionStarts(oCursor1, oCursor2)
-    bStart = (nResult = 0)
-
-    oObj.insertString(oCursor1, cIfcShortName, false)
-    oObj.insertControlCharacter(oCursor1, 0, false)
-    oCursor2 = oObj.createTextCursor()
-
-    oObj.insertString(oCursor2, cIfcShortName + cIfcShortName, false)
-    oObj.insertControlCharacter(oCursor2, 0, false)
-
-    nResult = oObj.compareRegionEnds(oCursor1, oCursor2)
-    bEnd = bEnd AND (nResult = -1)
-    nResult = oObj.compareRegionEnds(oCursor2, oCursor1)
-    bEnd = bEnd AND (nResult = 1)
-
-    nResult = oObj.compareRegionStarts(oCursor1, oCursor2)
-    bStart = (nResult = -1)
-    nResult = oObj.compareRegionStarts(oCursor2, oCursor1)
-    bStart = (nResult = 1)
-
-    Test.MethodTested("compareRegionEnds()", bEnd)
-    Test.MethodTested("compareRegionStarts()", bStart)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRangeMover/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextRangeMover/script.xlb
deleted file mode 100644
index 25b529a589f0..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRangeMover/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextRangeMover" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextRangeMover"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextRangeMover/text_XTextRangeMover.xba b/qadevOOo/tests/basic/ifc/text/XTextRangeMover/text_XTextRangeMover.xba
deleted file mode 100644
index 4922f14464e1..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextRangeMover/text_XTextRangeMover.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextRangeMover" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oTextRangeToMove As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextRangeMover
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("moveTextRange()")
-    bOK = true
-    oObj.moveTextRange(oTextRangeToMove, 1)
-    Test.MethodTested("moveTextRange()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextSection/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextSection/script.xlb
deleted file mode 100644
index 0335ea7bbf13..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextSection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextSection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextSection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextSection/text_XTextSection.xba b/qadevOOo/tests/basic/ifc/text/XTextSection/text_XTextSection.xba
deleted file mode 100644
index 92d4fab6cd7a..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextSection/text_XTextSection.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextSection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextSection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oPS As Variant, oCS As Variant
-    Dim i As Integer
-    Dim bChild As Boolean
-
-    Test.StartMethod("getParentSection()")
-    bOK = true
-    oPS = oObj.getParentSection()
-    if (NOT isNULL(oPS)) then
-        bOK = bOK AND hasUnoInterfaces(oPS, "com.sun.star.text.XTextSection")
-        if bOK then
-            Out.Log("Checking the names of parent's children ...")
-            oCS = oPS.getChildSections()
-            bChild = false
-            for i = 0 to ubound(oCS)
-                if oCS(i).Name = oObj.Name then bChild = true
-            next i
-            if NOT bChild then
-                Out.Log("The tested section was not found among its parent's child sections.")
-                bOK = false
-            endif
-        else
-            Out.Log("Wrong object returned.")
-            bOK = false
-        endif
-    else
-        Out.Log("!!! Not really tested. Parent not found !!!")
-    end if
-    Test.MethodTested("getParentSection()", bOK)
-
-    Test.StartMethod("getChildSections()")
-    bOK = true
-    oCS = oObj.getChildSections()
-    bOK = bOK AND isArray(oCS)
-    if (ubound(oCS) &gt;= 0) then
-        bOK = bOK AND hasUnoInterfaces(oCS(0), "com.sun.star.text.XTextSection")
-        if bOK then
-            Out.Log("Checking the name of child's parent ...")
-            oPS = oCS(0).getParentSection()
-            bOK = bOK AND oPS.Name = oObj.Name
-            if NOT bOK then 
-                Out.Log("Child's parent name isn't match to the object name: '" + oPS.Name + "', '" + oObj.Name + "'")
-            endif
-        else
-            Out.Log("Wrong object returned.")
-        endif
-    else
-        Out.Log("!!! Not really tested. There are no section's children !!!")
-        bOK = false
-    end if
-    Test.MethodTested("getChildSections()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTable/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextTable/script.xlb
deleted file mode 100644
index 292086fbe8a5..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTable/text_XTextTable.xba b/qadevOOo/tests/basic/ifc/text/XTextTable/text_XTextTable.xba
deleted file mode 100644
index 32009e626418..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTable/text_XTextTable.xba
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global nTableW As Integer
-'     - Global nTableH As Integer
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer, j As Integer
-    Dim oRows As Object, oColumns As Object
-    Dim oCursor As Object, oCell As Object
-    Dim aNames As Variant
-    Dim nDscColumns As Integer, nDscRows As Integer
-
-    Test.StartMethod("initialize()")
-    bOK = true
-    ' Object is already was initialized, when it was created... So, assume that this is OK.
-
-    For i = 0 to nTableW - 1
-        For j = 0 to nTableH - 1
-            oObj.getCellByPosition(i, j).Value = i + j * nTableW
-        Next j
-    Next i
-    
-    nDscColumns = ubound(oObj.getColumnDescriptions()) + 1
-    nDscRows = ubound(oObj.getRowDescriptions()) + 1
-
-    bOK = bOK AND nDscRows = nTableH AND nDscColumns = nTableW 
-    if NOT bOK then
-        Out.Log("The table must have size (" + nTableW + "," + nTableH + _
-            "), but descriptions returned for size (" + nDscColumns + "," + nDscRows + ")")
-    endif
-    Test.MethodTested("initialize()", bOK)
-
-    Test.StartMethod("getRows()")
-    bOK = true
-
-    oRows = oObj.getRows()
-
-    bOK = bOK AND hasUnoInterfaces(oRows, "com.sun.star.table.XTableRows")
-    bOK = bOK AND oRows.getCount() = nTableH
-    Test.MethodTested("getRows()", bOK)
-
-    Test.StartMethod("getColumns()")
-    bOK = true
-
-    oColumns = oObj.getColumns()
-
-    bOK = bOK AND hasUnoInterfaces(oColumns, "com.sun.star.table.XTableColumns")
-    bOK = bOK AND oColumns.getCount() = nTableW
-    Test.MethodTested("getColumns()", bOK)
-
-
-    Test.StartMethod("createCursorByCellName()")
-    bOK = true
-    oCursor = oObj.createCursorByCellName("B2")
-    bOK = bOK AND hasUnoInterfaces(oCursor, "com.sun.star.text.XTextTableCursor")
-    bOK = bOK AND oCursor.getRangeName() = "B2"
-    Test.MethodTested("createCursorByCellName()", bOK)
-
-    oCursor.splitRange(1, true)
-    oCursor.splitRange(1, false)
-
-    Test.StartMethod("getCellNames()")
-    bOK = true
-    aNames = oObj.getCellNames()
-    bOK = bOK AND ubound(aNames) = nTableW * nTableH + 1 ' = nTableW * nTableH - 1 + 2(after splitting)
-    Test.MethodTested("getCellNames()", bOK)
-
-    Test.StartMethod("getCellByName()")
-    bOK = true
-    oCell = oObj.getCellByPosition(0,0)
-    oCell.String = "A1"
-    oCell = oObj.getCellByName("A1")
-    bOK = bOK AND oCell.String = "A1"
-    
-    oCell = oObj.getCellByName("B2.2.1")
-    bOK = bOK AND hasUnoInterfaces(oCell, "com.sun.star.table.XCell")
-
-    Test.MethodTested("getCellByName()", bOK)
-
-    ReCreateObj()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTableCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextTableCursor/script.xlb
deleted file mode 100644
index 6a67335e4ea2..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTableCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextTableCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextTableCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTableCursor/text_XTextTableCursor.xba b/qadevOOo/tests/basic/ifc/text/XTextTableCursor/text_XTextTableCursor.xba
deleted file mode 100644
index 989a1537b3aa..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTableCursor/text_XTextTableCursor.xba
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextTableCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextTableCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("gotoStart()")
-    bOK = true
-    oObj.gotoStart(false)
-    bOK = bOK AND Expected("A1")
-    Test.MethodTested("gotoStart()", bOK)
-
-    Test.StartMethod("getRangeName()")
-    bOK = true
-    cName = oObj.getRangeName()
-    bOK = bOK AND NOT isNULL(cName)
-    Test.MethodTested("getRangeName()", bOK)
-
-    Test.StartMethod("gotoCellByName()")
-    bOK = true
-    bOK = bOK AND oObj.gotoCellByName("B2", true)
-    bOK = bOK AND Expected("A1:B2")
-    Test.MethodTested("gotoCellByName()", bOK)
-
-    Test.StartMethod("goLeft()")
-    bOK = true
-    bOK = bOK AND oObj.goLeft(1, false)
-    bOK = bOK AND Expected("A2")
-    Test.MethodTested("goLeft()", bOK)
-
-    Test.StartMethod("goRight()")
-    bOK = true
-    bOK = bOK AND oObj.goRight(3, true)
-    bOK = bOK AND Expected("A2:D2")
-    Test.MethodTested("goRight()", bOK)
-
-    Test.StartMethod("goUp()")
-    bOK = true
-    bOK = bOK AND oObj.goUp(1, true)
-    bOK = bOK AND Expected("A2:D1")
-    Test.MethodTested("goUp()", bOK)
-
-    Test.StartMethod("goDown()")
-    bOK = true
-    bOK = bOK AND oObj.goDown(3, false)
-    bOK = bOK AND Expected("D4")
-    Test.MethodTested("goDown()", bOK)
-
-    Test.StartMethod("gotoEnd()")
-    bOK = true
-    oObj.gotoEnd(true)
-    bOK = bOK AND Expected("D4:E5")
-    Test.MethodTested("gotoEnd()", bOK)
-
-    Test.StartMethod("mergeRange()")
-    bOK = true
-    oObj.gotoStart(false)
-    oObj.gotoEnd(true)
-    bOK = bOK AND oObj.mergeRange()
-    bOK = bOK AND Expected("A1")
-    Test.MethodTested("mergeRange()", bOK)
-
-    Test.StartMethod("splitRange()")
-    bOK = true
-    bOK = bOK AND oObj.splitRange(3, true)
-    oObj.gotoEnd(true)
-    bOK = bOK AND Expected("A1.1.1:A1.1.4")
-	oObj.gotoStart(false)
-    bOK = bOK AND oObj.splitRange(2, false)
-    oObj.goRight(2, true)
-    bOK = bOK AND Expected("A1.1.1:A1.3.1")
-    Test.MethodTested("splitRange()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Function Expected(cName As String) As Boolean
-	Dim bOK As Boolean
-	Dim cRangeName As String
-	Dim cAltName As String
-	Dim dPos As Integer
-
-	cRangeName = oObj.getRangeName()
-
-	dPos = inStr(1, cName, ":")
-	if (dPos &gt; 0) then
-		cAltName = Mid(cName, dPos + 1) &amp; ":" &amp; Left(cName, dPos - 1)
-		bOK = (cRangeName = cName) OR (cAltName = cRangeName)
-	else
-		bOK = cRangeName = cName
-	end if
-
-	if (NOT bOK) then
-		Out.Log("Expected RangeName is '" &amp; cName &amp; "' and actual is '" &amp; cRangeName &amp; "'")
-	end if
-
-	Expected() = bOK
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/script.xlb
deleted file mode 100644
index 8357f15eee37..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextTablesSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextTablesSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/text_XTextTablesSupplier.xba b/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/text_XTextTablesSupplier.xba
deleted file mode 100644
index ce3b1700ed74..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextTablesSupplier/text_XTextTablesSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextTablesSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextTablesSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getTextTables()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getTextTables(), "com.sun.star.container.XNameAccess")
-    Test.MethodTested("getTextTables()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/script.xlb b/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/script.xlb
deleted file mode 100644
index 82f35ff951ae..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XTextViewCursorSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XTextViewCursorSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/text_XTextViewCursorSupplier.xba b/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/text_XTextViewCursorSupplier.xba
deleted file mode 100644
index 626fd75dbf08..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XTextViewCursorSupplier/text_XTextViewCursorSupplier.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XTextViewCursorSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XTextViewCursorSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getViewCursor()")
-    bOK = true
-    oCursor = oObj.getViewCursor()
-    bOK = bOK AND NOT isNULL(oCursor)
-    bOK = bOK AND oCursor.implementationName = "SwXTextViewCursor"
-    Test.MethodTested("getViewCursor()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/text/XWordCursor/script.xlb b/qadevOOo/tests/basic/ifc/text/XWordCursor/script.xlb
deleted file mode 100644
index 0bf6c008e8e8..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XWordCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_XWordCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_XWordCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/text/XWordCursor/text_XWordCursor.xba b/qadevOOo/tests/basic/ifc/text/XWordCursor/text_XWordCursor.xba
deleted file mode 100644
index c1e2936b3241..000000000000
--- a/qadevOOo/tests/basic/ifc/text/XWordCursor/text_XWordCursor.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_XWordCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.text.XWordCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    oObj.Text.string = "1Word1: 2Word2, 3Word3."
-    oObj.gotoStart(false)
-
-    Test.StartMethod("gotoStartOfWord()")
-    bOK = true
-    oObj.gotoStartOfWord(false)
-    oObj.String = "1"
-    bOK = bOK AND inStr(1, oObj.Text.String, "11W") &lt;&gt; 0
-    Test.MethodTested("gotoStartOfWord()", bOK)
-
-    Test.StartMethod("gotoEndOfWord()")
-    bOK = true
-    oObj.gotoEndOfWord(false)
-    oObj.String = "2"
-    bOK = bOK AND inStr(1, oObj.Text.String, "d12") &lt;&gt; 0
-    Test.MethodTested("gotoEndOfWord()", bOK)
-
-    Test.StartMethod("gotoNextWord()")
-    bOK = true
-    oObj.gotoNextWord(false)
-    oObj.gotoNextWord(false)
-    oObj.gotoEndOfWord(false)
-    oObj.String = "3"
-    bOK = bOK AND inStr(1, oObj.Text.String, "d33") &lt;&gt; 0
-    Test.MethodTested("gotoNextWord()", bOK)
-
-    Test.StartMethod("gotoPreviousWord()")
-    bOK = true
-    oObj.gotoPreviousWord(false)
-    oObj.gotoStartOfWord(false)
-    oObj.String = "4"
-    bOK = bOK AND inStr(1, oObj.Text.String, "42W") &lt;&gt; 0
-    Test.MethodTested("gotoPreviousWord()", bOK)
-
-    Test.StartMethod("isStartOfWord()")
-    bOK = true
-    oObj.gotoStartOfWord(false)
-    bOK = bOK AND oObj.isStartOfWord()
-    Test.MethodTested("isStartOfWord()", bOK)
-
-    Test.StartMethod("isEndOfWord()")
-    bOK = true
-    oObj.gotoEndOfWord(false)
-    bOK = bOK AND oObj.isEndOfWord()
-    Test.MethodTested("isEndOfWord()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/script.xlb
deleted file mode 100644
index ac4ee4bfe229..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XCachedContentResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XCachedContentResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/ucb_XCachedContentResultSetFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/ucb_XCachedContentResultSetFactory.xba
deleted file mode 100644
index 646757fbaa21..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetFactory/ucb_XCachedContentResultSetFactory.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XCachedContentResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oCachedContentResultSetStub As Object
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XCachedContentResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createCachedContentResultSet()")
-    bOK = true
-
-    Dim oResSet As Object
-    oResSet = oObj.createCachedContentResultSet(oCachedContentResultSetStub, NULL_OBJECT)
-    
-    If IsNull(oResSet) Then
-        bOK = False
-        out.log("Method returned NULL")
-    Else
-        Dim stubRowNum, setRowNum As Integer
-        oCachedContentResultSetStub.last()
-        stubRowNum = oCachedContentResultSetStub.getRow()
-
-        oResSet.last()
-        setRowNum = oResSet.getRow()
-                
-        bOK = (stubRowNum = setRowNum) and (setRowNum &gt; 0)
-        out.log("Number of rows : stub=" + stubRowNum + " set=" + setRowNum)    
-    EndIf
-
-    Test.MethodTested("createCachedContentResultSet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/script.xlb
deleted file mode 100644
index 35e8bdf341f0..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XCachedContentResultSetStubFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XCachedContentResultSetStubFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/ucb_XCachedContentResultSetStubFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/ucb_XCachedContentResultSetStubFactory.xba
deleted file mode 100644
index a8a4516757e7..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedContentResultSetStubFactory/ucb_XCachedContentResultSetStubFactory.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XCachedContentResultSetStubFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oContentResultSet As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XCachedContentResultSetStubFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createCachedContentResultSetStub()")
-    bOK = true
-
-    Dim oResSetStub As Object
-    oResSetStub = oObj.createCachedContentResultSetStub(oContentResultSet)
-    
-    If IsNull(oResSetStub) Then
-        bOk = False
-        out.log("Method returned NULL")
-    Else
-        Dim stubRowNum, setRowNum As Integer
-    
-        oResSetStub.last()
-        stubRowNum = oResSetStub.getRow()     
-        
-        oContentResultSet.last()
-        setRowNum = oContentResultSet.getRow()
-    
-        bOk = (stubRowNum = setRowNum) and (setRowNum &gt; 0)
-        out.log("Number of rows : set=" + setRowNum + "stub=" + stubRowNum)
-    EndIf
-    
-    Test.MethodTested("createCachedContentResultSetStub()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/script.xlb
deleted file mode 100644
index 355cb7dd01b2..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XCachedDynamicResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XCachedDynamicResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/ucb_XCachedDynamicResultSetFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/ucb_XCachedDynamicResultSetFactory.xba
deleted file mode 100644
index 292af7567947..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetFactory/ucb_XCachedDynamicResultSetFactory.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XCachedDynamicResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'Global oResSetStub As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE     : 
-' com.sun.star.ucb.XCachedDynamicResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("createCachedDynamicResultSet()")
-    bOK = true
-
-    Dim oResSet As Object
-    oResSet = oObj.createCachedDynamicResultSet(oResSetStub, NULL_OBJECT)
-
-    If IsNull(oResSet) Then
-        bOk = False
-        out.log("Method returned NULL")
-    Else
-        Dim oResultSetS As Object, oResultSetStubS As Object
-
-        oResultSetS = oResSet.getStaticResultSet()
-
-        oResultSetStubS = oResSetStub.getStaticResultSet()
-
-        Dim stubRowNum As Integer, setRowNum As Integer
-
-        oResultSetStubS.last()
-        stubRowNum = oResultSetStubS.getRow()
-
-        oResultSetS.last()
-        setRowNum = oResultSetS.getRow()
-
-        bOK = (stubRowNum = setRowNum) and (setRowNum &gt; 0)
-
-        out.log("Number of rows : stub=" + stubRowNum + " set=" + setRowNum)
-    EndIf
-
-    Test.MethodTested("createCachedDynamicResultSet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/script.xlb
deleted file mode 100644
index 8e6110e4c280..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XCachedDynamicResultSetStubFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XCachedDynamicResultSetStubFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/ucb_XCachedDynamicResultSetStubFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/ucb_XCachedDynamicResultSetStubFactory.xba
deleted file mode 100644
index 8f323d227d5b..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCachedDynamicResultSetStubFactory/ucb_XCachedDynamicResultSetStubFactory.xba
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XCachedDynamicResultSetStubFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oResSet As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XCachedDynamicResultSetStubFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createCachedDynamicResultSetStub()")
-    bOK = true
-
-    Dim oResSetStub As Object
-    oResSetStub = oObj.createCachedDynamicResultSetStub(oResSet)
-        
-    If IsNull(oResSetStub) Then 
-        bOK = False
-        out.log("Method returned NULL")
-    Else
-        Dim oResSetS, oResSetStubS As Object
-
-        oResSetS = oResSet.getStaticResultSet()
-        oResSetStubS = oResSetStub.getStaticResultSet()
-        
-        Dim stubRowNum, setRowNum As Integer
-    
-        oResSetStubS.last()
-        stubRowNum = oResSetStubS.getRow()
-
-        oResSetS.last()
-        setRowNum = oResSetS.getRow()
-                
-        bOK = (stubRowNum = setRowNum) and (setRowNum &gt; 0)
-
-        out.log("Number of rows : stub=" + stubRowNum + " set=" + setRowNum)
-    EndIf
-
-    Test.MethodTested("createCachedDynamicResultSetStub()", bOK)
-
-    Test.StartMethod("connectToCache()")
-    bOK = true
-
-    Dim oFac As Object
-    oFac = createUnoService("com.sun.star.ucb.CachedDynamicResultSetFactory")
-
-    Dim oDynResSet As Object
-    oDynResSet = oFac.createCachedDynamicResultSet(NULL_OBJECT, NULL_OBJECT)
-
-    oObj.connectToCache(oResSet, oDynResSet, NULL_OBJECT, NULL_OBJECT)
-    
-    out.log("checking connection to the source...")    
-
-    oResSetS = oResSet.getStaticResultSet()
-    oResSetStubS = oDynResSet.getStaticResultSet()
-        
-    oResSetStubS.last()
-    stubRowNum = oResSetStubS.getRow()
-
-    oResSetS.last()
-    setRowNum = oResSetS.getRow()
-                
-    bOK = (stubRowNum = setRowNum) and (setRowNum &gt; 0)
-
-    out.log("Number of rows : stub=" + stubRowNum + " set=" + setRowNum)
-
-    Test.MethodTested("connectToCache()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/script.xlb
deleted file mode 100644
index 5b0eb48543ee..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XCommandProcessor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XCommandProcessor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/ucb_XCommandProcessor.xba b/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/ucb_XCommandProcessor.xba
deleted file mode 100644
index 3281500c4b1d..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XCommandProcessor/ucb_XCommandProcessor.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XCommandProcessor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XCommandProcessor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim CommandId As Long
-    Dim oCommand As New com.sun.star.ucb.Command
-    Dim Environment As Object
-    Dim Res As Variant
-    Dim Commands As Variant
-
-    Test.StartMethod("createCommandIdentifier()")
-    bOK = true
-    CommandId = oObj.createCommandIdentifier()
-    bOK = bOK AND CommandId &lt;&gt; 0
-    Test.MethodTested("createCommandIdentifier()", bOK)
-
-    Test.StartMethod("execute()")
-    bOK = true
-    oCommand.Name = "getCommandInfo"
-    oCommand.Handle = -1
-    oCommand.Argument = "arg"
-
-    Res = oObj.execute(oCommand, CommandId, Environment)
-    Out.Log("getCommandInfo returned: ")
-    Commands = Res.getCommands()
-    for i = 0 to ubound(commands)
-        Out.Log "    " &amp; commands(i).Name
-    next i
-
-    Test.MethodTested("execute()", bOK)
-
-    Test.StartMethod("abort()")
-    bOK = true
-    oObj.abort(CommandId)
-    Test.MethodTested("abort()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/script.xlb
deleted file mode 100644
index 52e741f78ce3..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XContentIdentifierFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XContentIdentifierFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/ucb_XContentIdentifierFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/ucb_XContentIdentifierFactory.xba
deleted file mode 100644
index 32e2149f0c88..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentIdentifierFactory/ucb_XContentIdentifierFactory.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XContentIdentifierFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global sContentID As String
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XContentIdentifierFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ContentID As Object
-
-    if (sContentID = "") then
-        Out.Log("sContentID NOT initialized!")
-        Exit Sub
-    end if
-
-    Test.StartMethod("createContentIdentifier()")
-    bOK = true
-    ContentID = oObj.createContentIdentifier(sContentID)
-    bOK = bOK AND hasUNOInterfaces(ContentID, "com.sun.star.ucb.XContentIdentifier")
-    Test.MethodTested("createContentIdentifier()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProvider/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XContentProvider/script.xlb
deleted file mode 100644
index 8f76e1207192..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XContentProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XContentProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProvider/ucb_XContentProvider.xba b/qadevOOo/tests/basic/ifc/ucb/XContentProvider/ucb_XContentProvider.xba
deleted file mode 100644
index 437c6e543bfd..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProvider/ucb_XContentProvider.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XContentProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global ContentID1 As Object
-'     - Global ContentID2 As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XContentProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim compRes As Integer
-    Dim Content As Object
-
-    if (NOT hasUNOInterfaces(ContentID1, "com.sun.star.ucb.XContentIdentifier") OR _
-        NOT hasUNOInterfaces(ContentID2, "com.sun.star.ucb.XContentIdentifier")) then
-        Out.Log("ContentID1 or/and ContentID2 not initialized.")
-        Exit Sub
-    end if
-
-    Test.StartMethod("queryContent()")
-    bOK = true
-    Out.Log("Try to query content for '" &amp; ContentID1.getContentIdentifier() &amp; "'")
-    Content = oObj.queryContent(ContentID1)
-    bOK = bOK AND hasUnoInterfaces(Content, "com.sun.star.ucb.XContent")
-    Out.Log("Content is XContent - " &amp; bOK)
-    if (bOK) then
-        Out.Log("Returned identifier is " &amp; Content.getIdentifier.getContentIdentifier())
-        bOK = bOK AND (Content.getIdentifier.getContentIdentifier() = ContentID1.getContentIdentifier())
-    end if
-    Test.MethodTested("queryContent()", bOK)
-
-    Test.StartMethod("compareContentIds()")
-    bOK = true
-    compRes = oObj.compareContentIds(ContentID1, ContentID2)
-    bOK = bOK AND compRes &lt;&gt; 0
-    compRes = oObj.compareContentIds(ContentID2, ContentID2)
-    bOK = bOK AND compRes = 0
-    Test.MethodTested("compareContentIds()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/script.xlb
deleted file mode 100644
index d4230fd9c2e4..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XContentProviderFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XContentProviderFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/ucb_XContentProviderFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/ucb_XContentProviderFactory.xba
deleted file mode 100644
index b667fa59c743..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProviderFactory/ucb_XContentProviderFactory.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XContentProviderFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XContentProviderFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createContentProvider()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.createContentProvider(_
-                  "com.sun.star.ucb.ContentProviderFactory"),_
-                  "com.sun.star.ucb.XContentProvider")
-    Test.MethodTested("createContentProvider()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/script.xlb
deleted file mode 100644
index 020d1bbd6498..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XContentProviderManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XContentProviderManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/ucb_XContentProviderManager.xba b/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/ucb_XContentProviderManager.xba
deleted file mode 100644
index 478485d31a4a..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XContentProviderManager/ucb_XContentProviderManager.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XContentProviderManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XContentProviderManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim Provider As Object
-    Dim Scheme As String
-    Dim ReplaceExisting As Boolean
-    Dim ContentProvider As Object
-    Dim queryInfo As Variant
-    Dim bFound As Boolean
-
-    Test.StartMethod("queryContentProviders()")
-    bOK = true
-    queryInfo = oObj.queryContentProviders()
-    Out.Log("queryContentProviders() returned " &amp; ubound(queryInfo) &amp; " elements.")
-    for i = 0 to ubound(queryInfo)
-        Out.Log(queryInfo(i).Scheme)
-    next i
-    Test.MethodTested("queryContentProviders()", bOK)
-
-    Test.StartMethod("registerContentProvider()")
-    bOK = true
-    ReplaceExisting = true
-    Scheme = "XContentProviderManager"
-    Provider = createUNOService("com.sun.star.ucb.FileContentProvider")
-    Out.Log("Registering Scheme = '" &amp; Scheme &amp; "'")
-    ContentProvider = oObj.registerContentProvider(Provider, Scheme, ReplaceExisting)
-    bOK = bOK AND hasUnoInterfaces(ContentProvider, "com.sun.star.ucb.XContentProvider")
-    Out.Log("ContentProvider is XContentProvider - " &amp; bOK)
-    if bOK then
-        bFound = false
-        queryInfo = oObj.queryContentProviders()
-        for i = 0 to ubound(queryInfo)
-            bFound = bFound OR queryInfo(i).Scheme = Scheme
-        next i
-        if NOT bFound then
-            Out.Log("Can't find registered ContentProvider in query!")
-            bOK = false
-        end if
-    end if
-    Test.MethodTested("registerContentProvider()", bOK)
-
-    Test.StartMethod("deregisterContentProvider()")
-    if bOK then
-        oObj.deregisterContentProvider(ContentProvider, Scheme)
-        bFound = false
-        queryInfo = oObj.queryContentProviders()
-        for i = 0 to ubound(queryInfo)
-            bFound = bFound OR queryInfo(i).Scheme = Scheme
-        next i
-        if bFound then
-            Out.Log("ContentProvider was found in query! It was not DeRegistered!")
-            bOK = false
-        end if
-    else
-        Out.Log("Can't deregister ContentProvider without registering!")
-    end if
-
-    Test.MethodTested("deregisterContentProvider()", bOK)
-
-    Test.StartMethod("queryContentProvider()")
-    bOK = true
-    ContentProvider = oObj.queryContentProvider(queryInfo(0).Scheme)
-    bOK = bOK AND hasUnoInterfaces(ContentProvider, "com.sun.star.ucb.XContentProvider")
-    Test.MethodTested("queryContentProvider()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XDataContainer/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XDataContainer/script.xlb
deleted file mode 100644
index c5b36f463e24..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XDataContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XDataContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XDataContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XDataContainer/ucb_XDataContainer.xba b/qadevOOo/tests/basic/ifc/ucb/XDataContainer/ucb_XDataContainer.xba
deleted file mode 100644
index 362684c3853d..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XDataContainer/ucb_XDataContainer.xba
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XDataContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XDataContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-
-
-    Test.StartMethod("setContentType()")
-    Test.StartMethod("getContentType()")
-
-    Dim aContType As String
-    Dim objContType As String
-    Dim newContType As String
-
-    bOK = true
-    aContType = oObj.getContentType()
-    Out.Log("Current content type is: '" + aContType + "'")
-    newContType = "text/html"
-
-    if (newContType = aContType) then
-        newContType = "text/plain"
-    end if
-
-    Out.Log("Trying to change type to " + newContType)
-    oObj.setContentType(newContType)
-
-    objContType = oObj.getContentType()
-    Out.Log("Actual content type is: '" + objContType + "'")
-    bOK = bOK AND objContType = newContType
-    Out.Log("Change type back to original...")
-    oObj.setContentType(aContType)
-
-    Test.MethodTested("getContentType()", bOK)
-    Test.MethodTested("setContentType()", bOK)
-
-
-    Test.StartMethod("getData()")
-    bOK = true
-
-    Dim Data As Variant
-
-    Data = oObj.getData()
-    Out.Log("getData returned array with ubound = " + ubound(Data))
-    bOK = bOK AND ubound(Data) &gt;= -1
-    for i  = 0 to ubound(Data)
-        Out.Log("" + Data(i) + " " + chr(Data(i)))
-    next i
-    Test.MethodTested("getData()", bOK)
-
-    Test.StartMethod("setData()")
-    bOK = true
-
-    Dim DataToSet As Variant
-    DataToSet = DimArray(ubound(Data()))
-
-    for i = 0 to ubound(DataToSet())
-        DataToSet(i) = Data(i) + 1
-    next i
-
-    oObj.setData(DataToSet)
-    Data = oObj.getData()
-    Out.Log("after setData() call: getData returned array with ubound = " + ubound(Data))
-    bOK = bOK AND (ubound(Data) = ubound(DataToSet))
-    if (bOK) then 
-        for i  = 0 to ubound(Data)
-            Out.Log("" + Data(i) + " " + chr(Data(i)))
-            bOK = bOK AND (DataToSet(i) = Data(i))
-        next i
-    end if
-
-    Test.MethodTested("setData()", bOK)
-
-    Test.StartMethod("getDataURL()")
-    Test.StartMethod("setDataURL()")
-
-
-    Dim aDataURL As String
-    Dim objDataURL As String
-    Dim newDataURL As String
-
-    bOK = true
-    aDataURL = oObj.getDataURL()
-    Out.Log("Current data URL is: '" + aDataURL + "'")
-    newDataURL = "http://www.sun.com"
-    if (newDataURL = aDataURL) then
-        newDataURL = "http://www.openoffice.org"
-    end if
-
-    Out.Log("Trying to change data URL to " + newDataURL)
-    oObj.setDataURL(newDataURL)
-
-    objDataURL = oObj.getDataURL()
-    Out.Log("Actual data URL is: '" + objDataURL + "'")
-    bOK = bOK AND objDataURL = newDataURL
-    Out.Log("Change data URL back to original...")
-    oObj.setDataURL(aDataURL)
-
-    Out.Log("Methods getDataURL() and setDataURL() are DEPRICATED. The result of test is ALWAYS true!")
-
-    bOK = true
-
-    Test.MethodTested("getDataURL()", bOK)
-    Test.MethodTested("setDataURL()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/script.xlb
deleted file mode 100644
index 81007cb5654c..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XFileIdentifierConverter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XFileIdentifierConverter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/ucb_XFileIdentifierConverter.xba b/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/ucb_XFileIdentifierConverter.xba
deleted file mode 100644
index 8b69b8f6cdc2..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XFileIdentifierConverter/ucb_XFileIdentifierConverter.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XFileIdentifierConverter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XFileIdentifierConverter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim iRes As Integer
-    Dim sRes As String
-
-
-    Test.StartMethod("getFileProviderLocality()")
-    bOK = true
-
-    Out.Log("Test that " &amp; cBaseURL &amp; " is correct")
-    iRes = oObj.getFileProviderLocality(cBaseURL)
-    Out.Log("Returned value is " &amp; iRes)
-    bOK = bOK AND iRes &gt; 0
-
-    Out.Log("Test that wrong URL is NOT correct")
-    iRes = oObj.getFileProviderLocality("++lsjd_!!")
-    Out.Log("Returned value is " &amp; iRes)
-    bOK = bOK AND iRes &lt; 0
-
-    Test.MethodTested("getFileProviderLocality()", bOK)
-
-    Test.StartMethod("getFileURLFromSystemPath()")
-    bOK = true
-    Out.Log("Convert " &amp; cSystemPath)
-    sRes = oObj.getFileURLFromSystemPath(cBaseURL, cSystemPath)
-    Out.Log("Returned value is " &amp; sRes)
-    bOK = bOK AND sRes = Path2URL(cSystemPath)
-    Test.MethodTested("getFileURLFromSystemPath()", bOK)
-
-    Test.StartMethod("getSystemPathFromFileURL()")
-    bOK = true
-    Out.Log("Convert " &amp; cURLPath)
-    sRes = oObj.getSystemPathFromFileURL(cURLPath)
-    Out.Log("Returned value is " &amp; sRes)
-    bOK = bOK AND sRes = URL2Path(cURLPath)
-    Test.MethodTested("getSystemPathFromFileURL()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/script.xlb
deleted file mode 100644
index a5c8a5a0a01c..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XPropertyMatcherFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XPropertyMatcherFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/ucb_XPropertyMatcherFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/ucb_XPropertyMatcherFactory.xba
deleted file mode 100644
index 59cf541e3b34..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XPropertyMatcherFactory/ucb_XPropertyMatcherFactory.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XPropertyMatcherFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XPropertyMatcherFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSearchCriteria(0) As New com.sun.star.ucb.SearchCriterium
-    Dim oTerms(0) As New com.sun.star.ucb.RuleTerm
-    Dim oPropertyMatcher As Object
-
-
-    Test.StartMethod("createPropertyMatcher()")
-    bOK = true
-    oTerms(0).Property = "Name"
-    oTerms(0).Operand = 1
-    oTerms(0).Operator = "="
-    oTerms(0).CaseSensitive = false
-    oTerms(0).RegularExpression = false
-
-    oSearchCriteria(0).Terms = oTerms()
-    oPropertyMatcher = oObj.createPropertyMatcher(oSearchCriteria())
-
-    bOK = bOK AND hasUnoInterfaces(oPropertyMatcher, "com.sun.star.ucb.XPropertyMatcher")
-    Test.MethodTested("createPropertyMatcher()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/script.xlb
deleted file mode 100644
index e21cccfe01f9..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XPropertySetRegistryFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XPropertySetRegistryFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/ucb_XPropertySetRegistryFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/ucb_XPropertySetRegistryFactory.xba
deleted file mode 100644
index da9574f36b1b..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XPropertySetRegistryFactory/ucb_XPropertySetRegistryFactory.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XPropertySetRegistryFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XPropertySetRegistryFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createPropertySetRegistry()")
-    bOK = true
-
-    bOK = bOK AND hasUnoInterfaces(oObj.createPropertySetRegistry(""),_
-                  "com.sun.star.ucb.XPropertySetRegistry")
-
-    Test.MethodTested("createPropertySetRegistry()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/script.xlb
deleted file mode 100644
index ce7b93254b04..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XSimpleFileAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XSimpleFileAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/ucb_XSimpleFileAccess.xba b/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/ucb_XSimpleFileAccess.xba
deleted file mode 100644
index c4c24686f6c6..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess/ucb_XSimpleFileAccess.xba
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XSimpleFileAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XSimpleFileAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim testDir As String
-    Dim cSubFolder As String
-    Dim cFile1 As String
-    Dim cFile2 As String
-    Dim cFile3 As String
-    Dim oFC As Variant
-    Dim oDT As Object
-    Dim oOS As Object
-    Dim oIS As Object
-    Dim cFileName As String
-    Dim cCrDate As String
-    Dim cType As String
-    Dim i As Integer
-    Dim k As Integer
-    Dim oIH As Object
-
-    Dim Bytes(5) As Integer
-    for i = 0 to 5
-        Bytes(i) = i
-    next i
-
-    testDir = utils.Path2URL(cTestDocsDir + "XSimpleFileAccessBASIC")
-    Out.Log("Test directory is '" + testDir + "'")
-    cSubFolder = utils.getTempFileURL( + "/SubFolder")
-    cFile1 = utils.Path2URL(testDir + "/File1.txt")
-    cFile2 = utils.Path2URL(testDir + "/File2.txt")
-    cFile3 = utils.Path2URL(cSubFolder + "/File3.txt")
-    if FileExists(cFile3) then kill(cFile3)
-    if (FileExists(cSubFolder)) then rmDir(cSubFolder)
-
-    Out.Log("Test that files are in place...")
-    bOK = true
-    bOK = bOK AND FileExists(cFile1)
-    bOK = bOK AND FileExists(cFile2)
-    if (NOT bOK) then
-        Out.Log("Can't find '" + cFile1 + "' and/or '" + cFile2 + "'")
-        Exit Sub
-    end if
-
-    Test.StartMethod("createFolder()")
-    bOK = true
-    Out.Log("Creating subfolder '" + cSubFolder + "'")
-    oObj.createFolder(cSubFolder)
-    bOK = bOK AND FileExists(cSubFolder)
-    Test.MethodTested("createFolder()", bOK)
-
-    Test.StartMethod("isFolder()")
-    bOK = true
-    bOK = bOK AND oObj.isFolder(cSubFolder)
-    bOK = bOK AND NOT oObj.isFolder(cFile1)
-    Test.MethodTested("isFolder()", bOK)
-
-    Test.StartMethod("getFolderContents()")
-    bOK = true
-    Out.Log("Getting content of folder '" + utils.Path2URL(cTestDocsDir) + "'")
-    oFC = oObj.getFolderContents(utils.Path2URL(cTestDocsDir), False)
-    ' Getting files amount (without folders)
-    cFileName = Dir(utils.Path2URL(cTestDocsDir))
-    i = 0
-    Out.Log("File list :")
-    while (cFileName &lt;&gt; "")
-        Out.Log("   " + cFileName)
-        i = i + 1
-        cFileName = Dir()
-    wend
-
-    bOK = bOK AND ubound(oFC) = i - 1
-    if (bOK) then
-        for k = 0 to i - 1
-            bOK = bOK AND FileExists(oFC(k))
-        next k
-    else
-        Out.Log("Amount of files in list is wrong: " + (ubound(oFC) + 1) + "," + i)
-        
-    end if
-
-    Test.MethodTested("getFolderContents()", bOK)
-
-    Test.StartMethod("move()")
-    bOK = true
-    oObj.move(cFile2, cFile3)
-    bOK = bOK AND FileExists(cFile3) AND NOT FileExists(cFile2)
-    Test.MethodTested("move()", bOK)
-
-    Test.StartMethod("copy()")
-    bOK = true
-    oObj.copy(cFile3, cFile2)
-    bOK = bOK AND FileExists(cFile3) AND FileExists(cFile2)
-    Test.MethodTested("copy()", bOK)
-
-    Test.StartMethod("openFileWrite()")
-    bOK = true
-
-    Test.StartMethod("kill()")
-    bOK = true
-    oObj.kill(cFile3)
-    bOK = bOK AND NOT FileExists(cFile3)
-    Test.MethodTested("kill()", bOK)
-
-    Test.StartMethod("exists()")
-    bOK = true
-    bOK = bOK AND oObj.exists(cFile1) = FileExists(cFile1) AND oObj.exists(cFile3) = FileExists(cFile3)
-    Test.MethodTested("exists()", bOK)
-
-    Out.Log("creating a new file '" + cFile3 + "'")
-    oOS = oObj.openFileWrite(cFile3)
-    bOK = bOK AND NOT isNULL(oOS)
-    bOK = bOK AND FileExists(cFile3)
-    if (bOK) then
-        oOS.writeBytes(Bytes())
-        oOS.closeOutput()
-    end if
-    Test.MethodTested("openFileWrite()", bOK)
-
-    Test.StartMethod("getSize()")
-    bOK = true
-    Out.Log("Actual: " + oObj.getSize(cFile3) + " Expected: " + (ubound(Bytes()) + 1))
-    bOK = bOK AND oObj.getSize(cFile3) = (ubound(Bytes()) + 1)
-    Test.MethodTested("getSize()", bOK)
-
-    Test.StartMethod("setReadOnly()")
-    Test.StartMethod("isReadOnly()")
-    bOK = true
-    oObj.setReadOnly(cSubFolder, true)
-    bOK = bOK AND oObj.isReadOnly(cSubFolder)
-    oObj.setReadOnly(cSubFolder, false)
-    bOK = bOK AND NOT oObj.isReadOnly(cSubFolder)
-    Test.MethodTested("isReadOnly()", bOK)
-    Test.MethodTested("setReadOnly()", bOK)
-
-    Test.StartMethod("getContentType()")
-    bOK = true
-    cType = oObj.getContentType(cFile3)
-    Out.Log("Content Type is '" + cType + "'")
-    Test.MethodTested("getContentType()", bOK)
-
-    Test.StartMethod("getDateTimeModified()")
-    bOK = true
-    oDT = oObj.getDateTimeModified(cFile3)
-    cCrDate = Date()
-
-
-    bOK = bOK AND Day(cCrDate) = oDT.Day
-    bOK = bOK AND Month(cCrDate) = oDT.Month
-    bOK = bOK AND Year(cCrDate) = oDT.Year
-
-    if (NOT bOK) then
-        Out.Log("FileDateTime returned '" + cCrDate + "'")
-        Out.Log("getDateTimeModified returned '" + oDT.Day + "/" _
-                                                + oDT.Month + "/" _
-                                                + oDT.Year + " " _
-                                                + oDT.Hours + ":" _
-                                                + oDT.Minutes + ":" _
-                                                + oDT.Seconds + "'")
-    end if
-    Test.MethodTested("getDateTimeModified()", bOK)
-
-    Test.StartMethod("openFileRead()")
-    bOK = true
-    oIS = oObj.openFileRead(cFile3)
-    bOK = bOK AND NOT isNULL(oIS)
-    Dim rData(10) As Integer
-    Dim nRb As Integer
-    nRb = oIS.readBytes(rData(), 100)
-    bOK = bOK AND nRb = ubound(Bytes()) + 1
-    if (NOT bOK) then
-        Out.Log("Amount of read files is wrong")
-    else
-        for i = 0 to nRb - 1
-            bOK = bOK AND Bytes(i) = rData(i)
-        next i
-    end if
-    oIS.closeInput()
-    Test.MethodTested("openFileRead()", bOK)
-
-    Test.StartMethod("openFileReadWrite()")
-    bOK = true
-    oIS = oObj.openFileReadWrite(cFile3)
-    bOK = bOK AND hasUnoInterfaces(oIS, "com.sun.star.io.XStream")
-    Test.MethodTested("openFileReadWrite()", bOK)
-
-    Test.StartMethod("setInteractionHandler()")
-    bOK = true
-    oIH = createUNOInterface("com.sun.star.sdb.InteractionHandler")
-    oObj.setInteractionHandler(oIH)
-    Test.MethodTested("setInteractionHandler()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/script.xlb
deleted file mode 100644
index d7216c83c7f8..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XSimpleFileAccess2" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XSimpleFileAccess2"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/ucb_XSimpleFileAccess2.xba b/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/ucb_XSimpleFileAccess2.xba
deleted file mode 100644
index 95933450c149..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSimpleFileAccess2/ucb_XSimpleFileAccess2.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XSimpleFileAccess2" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XSimpleFileAccess2
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim urlFileForWrite As String
-    Dim urlFileForRead As String
-    Dim oInputStream As Object
-
-    Test.StartMethod("writeFile()")
-
-    urlFileForWrite = utils.getTempFileURL("XSimpleFileAccess_new.txt")
-    urlFileForRead = utils.Path2URL(cTestDocsDir + "\XSimpleFileAccess\XSimpleFileAccess.txt")
-
-    oInputStream = oObj.openFileRead(urlFileForRead)
-
-    if oObj.exists(urlFileForWrite) then
-        oObj.kill(urlFileForWrite)
-    endif
-
-    oObj.writeFile(urlFileForWrite, oInputStream)
-    wait(1000)
-
-    bOK = oObj.exists(urlFileForWrite)
-    oObj.kill(urlFileForWrite)
-
-    Test.MethodTested("writeFile()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/script.xlb b/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/script.xlb
deleted file mode 100644
index 60ad898df6de..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_XSortedDynamicResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_XSortedDynamicResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/ucb_XSortedDynamicResultSetFactory.xba b/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/ucb_XSortedDynamicResultSetFactory.xba
deleted file mode 100644
index d32aee8b52d9..000000000000
--- a/qadevOOo/tests/basic/ifc/ucb/XSortedDynamicResultSetFactory/ucb_XSortedDynamicResultSetFactory.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_XSortedDynamicResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ucb.XSortedDynamicResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("createSortedDynamicResultSet()")
-    
-    Dim oUCB As Object
-    oUCB = createUnoService("com.sun.star.ucb.UniversalContentBroker")
-    Dim args As Variant
-    args = Array("Local", "Office")
-    oUCB.initialize(args())
-
-    Dim sURL, sCntURL As String
-    sURL = utils.Path2URL(cTestDocsDir &amp; "solibrary.jar")
-    sURL = utils.utils.StrReplace(sURL, "/", "%2F")
-    sCntURL = "vnd.sun.star.pkg://" &amp; sURL &amp; "/"
-
-    Dim oCI, oContent As Object
-    oCI = oUCB.createContentIdentifier(sCntUrl)
-    oContent = oUCB.queryContent(oCI)
-
-    Dim props(0) As new com.sun.star.beans.Property
-    Dim cmd As new com.sun.star.ucb.Command
-    Dim ocArg As new com.sun.star.ucb.OpenCommandArgument2
-    Dim sortInfo(0) As new com.sun.star.ucb.NumberedSortingInfo
-    Dim oDynResSet As Object
-
-    props(0).Name = "Title"
-
-    ocArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    ocArg.Priority = 10000
-    ocArg.Properties = props()
-    ocArg.SortingInfo = sortInfo()
-
-    cmd.Name = "open"
-    cmd.Handle = -1
-    cmd.Argument = ocArg
-
-    oDynResSet = oContent.execute(cmd, 0, NULL_OBJECT)
-
-    Dim oSortedSet As Object
-    oSortedSet = oObj.createSortedDynamicResultSet(oDynResSet, sortInfo(), NULL_OBJECT)
-
-    If IsNULL(oSortedSet) Then
-        out.log("returns null")
-        bOK = False
-    Else
-        Dim oSet As Object
-        oSet = oSortedSet.getStaticResultSet()
-        oSet.last()
-        Dim rowCount As Integer
-        rowCount = oSet.getRow()
-        out.log("number of row : " + rowCount)
-        bOK = rowCount > 0
-    EndIf
-
-   Test.MethodTested("createSortedDynamicResultSet()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/script.xlb
deleted file mode 100644
index 97d3bbc7b5e1..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_FilePicker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_FilePicker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/ui_dialogs_FilePicker.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/ui_dialogs_FilePicker.xba
deleted file mode 100644
index e8405adf89ad..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/FilePicker/ui_dialogs_FilePicker.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_FilePicker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.ui.dialogs.FilePicker
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    PropertyTester.TestProperty("HelpURL")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/script.xlb
deleted file mode 100644
index c0953782f731..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XExecutableDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XExecutableDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/ui_dialogs_XExecutableDialog.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/ui_dialogs_XExecutableDialog.xba
deleted file mode 100644
index 95ec3646476b..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XExecutableDialog/ui_dialogs_XExecutableDialog.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XExecutableDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XExecutableDialog
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("setTitle()")
-    bOK = true
-    oObj.setTitle("XExecutableDialog")
-    Test.MethodTested("setTitle()", bOK)
-
-    Test.StartMethod("execute()")
-    bOK = true
-'    oObj.execute()
-    Out.Log("This method is excluded from automated test since we can't close the dialog")
-    Test.MethodTested("execute()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/script.xlb
deleted file mode 100644
index 36ee0adb752c..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFilePicker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFilePicker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/ui_dialogs_XFilePicker.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/ui_dialogs_XFilePicker.xba
deleted file mode 100644
index 9b3e99ffd411..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePicker/ui_dialogs_XFilePicker.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFilePicker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFilePicker
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim fileName As String, getDir As String
-    Dim getFiles As Variant, tempURL As String
-
-    tempURL = utils.Path2URL(cTestDocsDir)
-
-    Test.StartMethod("setMultiSelectionMode()")
-    bOK = true
-    oObj.setMultiSelectionMode(true)
-    oObj.setMultiSelectionMode(false)
-    Test.MethodTested("setMultiSelectionMode()", bOK)
-
-    Test.StartMethod("setDisplayDirectory()")
-    Out.Log("Trying to set dir : '" + tempURL + "'")
-    oObj.setDisplayDirectory(tempURL)
-
-    Test.StartMethod("getDisplayDirectory()")
-    bOK = true
-    getDir = oObj.getDisplayDirectory()
-    Out.Log("Returned directory : '" + getDir + "'")
-    bOK = bOK AND (getDir = tempURL)
-    Test.MethodTested("setDisplayDirectory()", bOK)
-    Test.MethodTested("getDisplayDirectory()", bOK)
-
-    Test.StartMethod("setDefaultName()")
-    bOK = true
-    fileName = "BasicBridge.sxw"
-    oObj.setDefaultName(fileName)
-    Test.MethodTested("setDefaultName()", bOK)
-
-    Test.StartMethod("getFiles()")
-    bOK = true
-    getFiles = oObj.getFiles()
-    Out.Log("Returned files count : " + ubound(getFiles()))
-    Out.Log("To have any files returned the FilePicker dialog must be executed, but this")
-    Out.Log("requires interactivity. Thus the fact that no files are selected is OK")
-    bOK = bOK AND (ubound(getFiles()) = -1)
-    Test.MethodTested("getFiles()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/script.xlb
deleted file mode 100644
index f51b76b90abc..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFilePickerControlAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFilePickerControlAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/ui_dialogs_XFilePickerControlAccess.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/ui_dialogs_XFilePickerControlAccess.xba
deleted file mode 100644
index 39e2ab6e8662..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerControlAccess/ui_dialogs_XFilePickerControlAccess.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFilePickerControlAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global controlId As Short
-'       Global controlInitVal As Variant
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFilePickerControlAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oldVal As Variant, newVal As Variant, resVal As Variant
-    Dim oldLabel As String, newLabel As String, resLabel As String
-
-    Test.StartMethod("setValue()")
-    Test.StartMethod("getValue()")
-    bOK = true
-    newVal = controlInitVal 'PropertyTester.Change(oldVal, oCoreRefl.getType(oldVal).Name)
-    oObj.setValue(controlId, 0, newVal)
-    wait(100)
-    resVal = oObj.getValue(controlId, 0)
-    Out.Log("New: " + newVal + ", Res: " + resVal)
-    bOK = bOK AND PropertyTester.equals(newVal, resVal)
-
-    Test.MethodTested("setValue()", bOK)
-    Test.MethodTested("getValue()", bOK)
-
-    Test.StartMethod("getLabel()")
-    bOK = true
-    oldLabel = oObj.getLabel(controlId)
-    Test.MethodTested("getLabel()", bOK)
-
-    Test.StartMethod("setLabel()")
-    bOK = true
-    newLabel = oldLabel + "_"
-    oObj.setLabel(controlId, newLabel)
-    resLabel = oObj.getLabel(controlId)
-    bOK = bOK AND (resLabel = newLabel)
-    Test.MethodTested("setLabel()", bOK)
-
-    Test.StartMethod("enableControl()")
-    bOK = true
-    oObj.enableControl(controlId, false)
-    oObj.enableControl(controlId, true)
-    Test.MethodTested("enableControl()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/script.xlb
deleted file mode 100644
index a02e56e88f95..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFilePickerNotifier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFilePickerNotifier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/ui_dialogs_XFilePickerNotifier.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/ui_dialogs_XFilePickerNotifier.xba
deleted file mode 100644
index f8f4e4093962..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePickerNotifier/ui_dialogs_XFilePickerNotifier.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFilePickerNotifier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFilePickerNotifier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim list1 As Object, list2 As Object
-    Dim dir1 As String, dir2 As String
-
-    dir1 = utils.Path2URL(cTestDocsDir)
-    dir2 = utils.getTempFileURL("")
-
-    Test.StartMethod("addFilePickerListener()")
-
-    list1 = createUnoListener("L1_", "com.sun.star.ui.dialogs.XFilePickerListener")
-    list2 = createUnoListener("L2_", "com.sun.star.ui.dialogs.XFilePickerListener")
-
-    oObj.addFilePickerListener(list1)
-    oObj.addFilePickerListener(list2)
-
-    Test.StartMethod("removeFilePickerListener()")
-    oObj.removeFilePickerListener(list1)
-
-    called1 = false
-    called2 = false
-    oObj.setDisplayDirectory(dir1)
-    oObj.setDisplayDirectory(dir2)
-
-    bOK = called2
-    Test.MethodTested("addFilePickerListener()", bOK)
-
-    bOK = called2 AND NOT called1
-    Test.MethodTested("removeFilePickerListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Dim called1 As Boolean, called2 As Boolean
-
-Sub L1_directoryChanged()
-    called1 = true
-End Sub
-
-Sub L2_directoryChanged()
-    called2 = true
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/script.xlb
deleted file mode 100644
index 14a8801eee69..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFilePreview" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFilePreview"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/ui_dialogs_XFilePreview.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/ui_dialogs_XFilePreview.xba
deleted file mode 100644
index 88e377aeed4d..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilePreview/ui_dialogs_XFilePreview.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFilePreview" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFilePreview
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim formats As Variant
-    Dim tmp As Integer
-    Dim state As Boolean, resState As Boolean
-    Dim i As Integer
-
-    Test.StartMethod("getSupportedImageFormats()")
-    bOK = true
-    formats = oObj.getSupportedImageFormats()
-    bOK = bOK AND NOT isNull(formats)
-    Out.Log("Supported image formats :")
-    for i = lbound(formats()) to ubound(formats())
-        Out.Log("    " + formats(i))
-    next i
-    Test.MethodTested("getSupportedImageFormats()", bOK)
-
-    Test.StartMethod("getTargetColorDepth()")
-    bOK = true
-    tmp = oObj.getTargetColorDepth()
-    Out.Log("ColorDepth = " + tmp)
-    Test.MethodTested("getTargetColorDepth()", bOK)
-
-    Test.StartMethod("getAvailableWidth()")
-    bOK = true
-    tmp = oObj.getAvailableWidth()
-    Out.Log("AvailableWidth = " + tmp)
-    Test.MethodTested("getAvailableWidth()", bOK)
-
-    Test.StartMethod("getAvailableHeight()")
-    bOK = true
-    tmp = oObj.getAvailableHeight()
-    Out.Log("AvailableHeight = " + tmp)
-    Test.MethodTested("getAvailableHeight()", bOK)
-
-    Test.StartMethod("setImage()")
-    bOK = true
-    Dim emptyImage As Variant
-    oObj.setImage(com.sun.star.ui.dialogs.FilePreviewImageFormats.BITMAP, emptyImage)
-    Out.Log("No documentation is available for this method !!!!")
-    Test.MethodTested("setImage()", bOK)
-
-    Test.StartMethod("getShowState()")
-    bOK = true
-    state = oObj.getShowState()
-    Out.Log("Was :" + state)
-
-    Dim bRet As Boolean
-    Test.StartMethod("setShowState()")
-    bOK = true
-    Out.Log("Set to :" + (NOT state))
-    bRet = oObj.setShowState(NOT state)
-    Out.Log("The returned value is " + bRet)
-    resState = oObj.getShowState()
-    Out.Log("Get : " + resState)
-    bOK = bOK AND ( NOT bRet OR (resState = NOT state))
-    Test.MethodTested("getShowState()", bOK)
-    Test.MethodTested("setShowState()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/script.xlb
deleted file mode 100644
index 084ccdf864d5..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFilterManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFilterManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/ui_dialogs_XFilterManager.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/ui_dialogs_XFilterManager.xba
deleted file mode 100644
index 41b2e9ffa4ab..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFilterManager/ui_dialogs_XFilterManager.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFilterManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFilterManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim gFilter As String
-
-
-    Test.StartMethod("appendFilter()")
-    bOK = true
-    oObj.appendFilter("TestFilter", "txt")
-    Test.MethodTested("appendFilter()", bOK)
-
-    Test.StartMethod("setCurrentFilter()")
-    bOK = true
-    oObj.setCurrentFilter("TestFilter")
-
-    Test.StartMethod("getCurrentFilter()")
-    gFilter = oObj.getCurrentFilter()
-    bOK = bOK AND (gFilter = "TestFilter")
-    Test.MethodTested("setCurrentFilter()", bOK)
-    Test.MethodTested("getCurrentFilter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/script.xlb b/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/script.xlb
deleted file mode 100644
index 1f831d352c46..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ui_dialogs_XFolderPicker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ui_dialogs_XFolderPicker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/ui_dialogs_XFolderPicker.xba b/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/ui_dialogs_XFolderPicker.xba
deleted file mode 100644
index c2802dbe2e8b..000000000000
--- a/qadevOOo/tests/basic/ifc/ui/dialogs/XFolderPicker/ui_dialogs_XFolderPicker.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ui_dialogs_XFolderPicker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.ui.dialogs.XFolderPicker
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sDir As String, gDir As String
-
-    sDir = utils.getTempFileURL("")
-
-    Test.StartMethod("setDisplayDirectory()")
-    bOK = true
-    oObj.setDisplayDirectory(sDir)
-    Test.MethodTested("setDisplayDirectory()", bOK)
-
-    Test.StartMethod("getDisplayDirectory()")
-    bOK = true
-    gDir = oObj.getDisplayDirectory()
-    out.log("Directory returned : " + gDir)
-    bOK = bOK AND (gDir = sDir)
-    Test.MethodTested("getDisplayDirectory()", bOK)
-
-    Test.StartMethod("getDirectory()")
-    bOK = true
-    gDir = oObj.getDirectory()
-    out.log("Directory returned : " + gDir)
-    Test.MethodTested("getDirectory()", bOK)
-
-    Test.StartMethod("setDescription()")
-    bOK = true
-    oObj.setDescription("XFolderPicker")
-    Test.MethodTested("setDescription()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/uno/XNamingService/script.xlb b/qadevOOo/tests/basic/ifc/uno/XNamingService/script.xlb
deleted file mode 100644
index aa7e55046616..000000000000
--- a/qadevOOo/tests/basic/ifc/uno/XNamingService/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="uno_XNamingService" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="uno_XNamingService"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/uno/XNamingService/uno_XNamingService.xba b/qadevOOo/tests/basic/ifc/uno/XNamingService/uno_XNamingService.xba
deleted file mode 100644
index 8eb5ad5c8606..000000000000
--- a/qadevOOo/tests/basic/ifc/uno/XNamingService/uno_XNamingService.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="uno_XNamingService" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oObjectToRegister As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.uno.XNamingService
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("registerObject()")
-    bOK = true
-    oObj.registerObject(cIfcShortName, oObjectToRegister)
-    Test.MethodTested("registerObject()", bOK)
-
-    Test.StartMethod("getRegisteredObject()")
-    bOK = true
-    objregObj = oObj.getRegisteredObject(cIfcShortName)
-    bOK = bOK AND NOT isNULL(objregObj)
-    bOK = bOK AND objregObj.implementationName = oObjectToRegister.implementationName
-    Test.MethodTested("getRegisteredObject()", bOK)
-
-    Test.StartMethod("revokeObject()")
-    bOK = true
-    oObj.revokeObject(cIfcShortName)
-    Out.Log("Object was revoked")
-    on Error goto GoodExc
-        Out.Log("Trying to getRegistered object ...")
-        objregObj = oObj.getRegisteredObject(cIfcShortName)
-        Out.Log("No exception.")
-        bOK = bOK AND isNULL(objregObj)
-        if (bOK) then Out.Log("But NULL was returned")
-    goto cont
-    GoodExc:
-        Out.Log("Expected exception - OK")
-    cont:
-    Test.MethodTested("revokeObject()", bOK)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/PathSettings/script.xlb b/qadevOOo/tests/basic/ifc/util/PathSettings/script.xlb
deleted file mode 100644
index 07a37da2ed37..000000000000
--- a/qadevOOo/tests/basic/ifc/util/PathSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_PathSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_PathSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/PathSettings/util_PathSettings.xba b/qadevOOo/tests/basic/ifc/util/PathSettings/util_PathSettings.xba
deleted file mode 100644
index bd2c5cfe2a45..000000000000
--- a/qadevOOo/tests/basic/ifc/util/PathSettings/util_PathSettings.xba
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_PathSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.util.PathSettings
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim values(1) As String
-    values(1) = oObj.Addin
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Addin", values())
-
-    values(1) = oObj.AutoCorrect
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("AutoCorrect", values())
-
-    values(1) = oObj.AutoText
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("AutoText", values())
-
-    values(1) = oObj.Backup
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Backup", values())
-
-    values(1) = oObj.Basic
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Basic", values())
-
-    values(1) = oObj.Bitmap
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Bitmap", values())
-
-    values(1) = oObj.Config
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Config", values())
-
-    values(1) = oObj.Dictionary
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Dictionary", values())
-
-    values(1) = oObj.Favorite
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Favorite", values())
-
-    values(1) = oObj.Filter
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Filter", values())
-
-    values(1) = oObj.Gallery
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Gallery", values())
-
-    values(1) = oObj.Graphic
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Graphic", values())
-
-    values(1) = oObj.Help
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Help", values())
-
-    values(1) = oObj.Linguistic
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Linguistic", values())
-
-    values(1) = oObj.Module
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Module", values())
-
-    values(1) = oObj.Palette
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Palette", values())
-
-    values(1) = oObj.Plugin
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Plugin", values())
-
-    values(1) = oObj.Storage
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Storage", values())
-
-    values(1) = oObj.Temp
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Temp", values())
-
-    values(1) = oObj.Template
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Template", values())
-
-    values(1) = oObj.UIConfig
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("UIConfig", values())
-
-    values(1) = oObj.UserConfig
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("UserConfig", values())
-
-    values(1) = oObj.UserDictionary
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("UserDictionary", values())
-
-    values(1) = oObj.Work
-    values(0) = values(1) + "New"
-    PropertyTester.TestProperty("Work", values())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/SearchDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/util/SearchDescriptor/script.xlb
deleted file mode 100644
index dd9c79134331..000000000000
--- a/qadevOOo/tests/basic/ifc/util/SearchDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_SearchDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_SearchDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/SearchDescriptor/util_SearchDescriptor.xba b/qadevOOo/tests/basic/ifc/util/SearchDescriptor/util_SearchDescriptor.xba
deleted file mode 100644
index 1a1a355275bd..000000000000
--- a/qadevOOo/tests/basic/ifc/util/SearchDescriptor/util_SearchDescriptor.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_SearchDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' SERVICE: 
-' com.sun.star.util.SearchDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    PropertyTester.TestProperty("SearchBackwards")
-
-    PropertyTester.TestProperty("SearchCaseSensitive")
-
-    PropertyTester.TestProperty("SearchWords")
-
-    PropertyTester.TestProperty("SearchRegularExpression")
-
-    PropertyTester.TestProperty("SearchStyles")
-
-    PropertyTester.TestProperty("SearchSimilarity")
-
-    PropertyTester.TestProperty("SearchSimilarityRelax")
-
-    PropertyTester.TestProperty("SearchSimilarityRemove")
-
-    PropertyTester.TestProperty("SearchSimilarityAdd")
-
-    PropertyTester.TestProperty("SearchSimilarityExchange")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XCancellable/script.xlb b/qadevOOo/tests/basic/ifc/util/XCancellable/script.xlb
deleted file mode 100644
index a65518a13481..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XCancellable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XCancellable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XCancellable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XCancellable/util_XCancellable.xba b/qadevOOo/tests/basic/ifc/util/XCancellable/util_XCancellable.xba
deleted file mode 100644
index 0887a9b674c6..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XCancellable/util_XCancellable.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XCancellable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XCancellable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("cancel()")
-    bOK = true
-    oObj.cancel()
-    Test.MethodTested("cancel()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XCloneable/script.xlb b/qadevOOo/tests/basic/ifc/util/XCloneable/script.xlb
deleted file mode 100644
index 08e7c9519719..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XCloneable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XCloneable" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="util_XCloneable"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XCloneable/util_XCloneable.xba b/qadevOOo/tests/basic/ifc/util/XCloneable/util_XCloneable.xba
deleted file mode 100644
index 0cdf04f59fa3..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XCloneable/util_XCloneable.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XCloneable" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-' NONE
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XCloneable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oClone as Object
-
-'
-    Test.StartMethod("createClone()")
-    bOK = TRUE
-    oClone = oObj.createClone()
-    bOK = bOK AND hasUnoInterfaces(oClone, "com.sun.star.util.XCloneable")
-    Test.MethodTested("createClone()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XFlushable/script.xlb b/qadevOOo/tests/basic/ifc/util/XFlushable/script.xlb
deleted file mode 100644
index df08bd96abed..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XFlushable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XFlushable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XFlushable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XFlushable/util_XFlushable.xba b/qadevOOo/tests/basic/ifc/util/XFlushable/util_XFlushable.xba
deleted file mode 100644
index b57ea89b80fd..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XFlushable/util_XFlushable.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XFlushable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-Dim iCB1_flushed As Integer
-Dim iCB2_flushed As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XFlushable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oListener1 As Object
-    Dim oListener2 As Object
-
-    oListener1 = createUnoListener("CB1_", "com.sun.star.util.XFlushListener")
-    oListener2 = createUnoListener("CB2_", "com.sun.star.util.XFlushListener")
-
-    Test.StartMethod("addFlushListener()")
-    bOK = true
-    iCB1_flushed = 0 : iCB2_flushed = 0
-    Out.Log("Adding two listeners...")
-    oObj.addFlushListener(oListener1)
-    oObj.addFlushListener(oListener2)
-    oObj.flush()
-    bOK = bOK AND iCB1_flushed = 1 AND iCB2_flushed = 1
-    Test.MethodTested("addFlushListener()", bOK)
-
-    Test.StartMethod("flush()")
-    bOK = true
-    oObj.flush()
-    Test.MethodTested("flush()", bOK)
-
-    Test.StartMethod("removeFlushListener()")
-    bOK = true
-    iCB1_flushed = 0 : iCB2_flushed = 0
-    Out.Log("Removing first listener")
-    oObj.removeFlushListener(oListener1)
-    oObj.flush()
-    bOK = bOK AND iCB1_flushed = 0 AND iCB2_flushed = 1
-    Test.MethodTested("removeFlushListener()", bOK)
-
-    Out.Log("Removing second listener")
-    oObj.removeFlushListener(oListener2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-Sub CB1_flushed(oEvent As Object)
-    iCB1_flushed = iCB1_flushed + 1
-    Out.Log("CallBack function for the first listener was called.")
-End Sub
-
-Sub CB2_flushed(oEvent As Object)
-    iCB2_flushed = iCB2_flushed + 1
-    Out.Log("CallBack function for the second listener was called.")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XMergeable/script.xlb b/qadevOOo/tests/basic/ifc/util/XMergeable/script.xlb
deleted file mode 100644
index 02a018fc1cec..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XMergeable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XMergeable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XMergeable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XMergeable/util_XMergeable.xba b/qadevOOo/tests/basic/ifc/util/XMergeable/util_XMergeable.xba
deleted file mode 100644
index 40d8e356db8d..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XMergeable/util_XMergeable.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XMergeable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XMergeable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim bMerged As Boolean
-
-    bMerged = false
-
-    Test.StartMethod("merge()")
-    bOK = true
-    oObj.merge(true)
-    bOk = bOk AND oObj.getIsMerged()
-    oObj.merge(false)
-    bOk = bOk AND NOT oObj.getIsMerged()
-
-    Test.MethodTested("merge()", bOK)
-
-    Test.StartMethod("getIsMerged()")
-    Test.MethodTested("getIsMerged()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XModeSelector/script.xlb b/qadevOOo/tests/basic/ifc/util/XModeSelector/script.xlb
deleted file mode 100644
index 6408972dd437..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XModeSelector/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XModeSelector" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XModeSelector"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XModeSelector/util_XModeSelector.xba b/qadevOOo/tests/basic/ifc/util/XModeSelector/util_XModeSelector.xba
deleted file mode 100644
index 5743050ff6a9..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XModeSelector/util_XModeSelector.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XModeSelector" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XModeSelector
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-    Dim modes As Variant
-    Dim oldMode As String, newMode As String, resMode As String
-
-    Test.StartMethod("getSupportedModes()")
-    bOK = true
-    modes = oObj.getSupportedModes()
-    for i = lbound(modes()) to ubound(modes())
-        out.Log("  " + modes(i))
-    next i
-    bOK = bOK AND ubound(modes()) &gt; 0
-    Test.MethodTested("getSupportedModes()", bOK)
-
-    Test.StartMethod("supportsMode()")
-    bOK = true
-    bOK = bOK AND oObj.supportsMode(modes(0))
-    Test.MethodTested("supportsMode()", bOK)
-
-    Test.StartMethod("getMode()")
-    Test.StartMethod("setMode()")
-    bOK = true
-    oldMode = oObj.getMode()
-    if oldMode = modes(0) then newMode = modes(1) else newMode = modes(0)
-    oObj.setMode(newMode)
-    resMode = oObj.getMode()
-    bOK = bOK AND (newMode = resMode)
-    Test.MethodTested("getMode()", bOK)
-    Test.MethodTested("setMode()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/script.xlb b/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/script.xlb
deleted file mode 100644
index e65d266ff846..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XModifyBroadcaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XModifyBroadcaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/util_XModifyBroadcaster.xba b/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/util_XModifyBroadcaster.xba
deleted file mode 100644
index dbca0d2ed013..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XModifyBroadcaster/util_XModifyBroadcaster.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XModifyBroadcaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-'Result checking is not performed. Modify listeners are called only in case of
-' interaction with UI.
-
-'*************************************************************************
-
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XModifyBroadcaster
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim listener As Object
-
-    listener = createUnoListener("TestListener_", "com.sun.star.util.XModifyListener")
-
-    Test.StartMethod("addModifyListener()")
-    bOK = true
-    oObj.addModifyListener(listener)
-    Test.MethodTested("addModifyListener()", bOK)
-
-    Test.StartMethod("removeModifyListener()")
-    bOK = true
-    oObj.removeModifyListener(listener)
-    Test.MethodTested("removeModifyListener()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub TestListener_modified()
-' dummy
-end sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/script.xlb
deleted file mode 100644
index 7142ba2bfb90..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XNumberFormatsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XNumberFormatsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/util_XNumberFormatsSupplier.xba b/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/util_XNumberFormatsSupplier.xba
deleted file mode 100644
index ad3a41ead80b..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XNumberFormatsSupplier/util_XNumberFormatsSupplier.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XNumberFormatsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XNumberFormatsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oNumberFormatSettings, oNumberFormats As Object
-
-    Test.StartMethod("getNumberFormatSettings()")
-    bOK = true
-    oNumberFormatSettings = oObj.getNumberFormatSettings()
-    bOK = bOK AND NOT isNULL(oNumberFormatSettings)
-    bOK = bOK AND hasUnoInterfaces(oNumberFormatSettings, "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getNumberFormatSettings()", bOK)
-
-    Test.StartMethod("getNumberFormats()")
-    bOK = true
-    oNumberFormats = oObj.getNumberFormats()
-    bOK = bOK AND NOT isNULL(oNumberFormats)
-    bOK = bOK AND hasUnoInterfaces(oNumberFormats, "com.sun.star.util.XNumberFormats")
-    Test.MethodTested("getNumberFormats()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XRefreshable/script.xlb b/qadevOOo/tests/basic/ifc/util/XRefreshable/script.xlb
deleted file mode 100644
index 3dce23efef3a..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XRefreshable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XRefreshable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XRefreshable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XRefreshable/util_XRefreshable.xba b/qadevOOo/tests/basic/ifc/util/XRefreshable/util_XRefreshable.xba
deleted file mode 100644
index 342bfabf3232..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XRefreshable/util_XRefreshable.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XRefreshable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim nCB1Val As Integer
-Dim nCB2Val As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XRefreshable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oListener1, oListener2 As Object
-    Dim nCount As Integer
-
-    bOK = true
-    nCount = 0
-    nCB1Val = 0
-    nCB2Val = 0
-
-    Out.Log("Create two listeners...")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.util.XRefreshListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.util.XRefreshListener")
-
-    Out.Log("Adding two refresh listeners")
-    oObj.addRefreshListener(oListener1)
-    oObj.addRefreshListener(oListener2)
-
-    Test.StartMethod("addRefreshListener()")
-    bOK = true
-    oObj.refresh()
-    bOK = bOK AND (nCB1Val = 1) AND (nCB2Val = 1)
-    Test.MethodTested("addRefreshListener()", bOK)
-
-    Test.StartMethod("removeRefreshListener()")
-    bOK = true
-    Out.Log("Removing second refresh listener")
-    oObj.removeRefreshListener(oListener2)
-    oObj.refresh()
-    bOK = bOK AND (nCB1Val = 2) AND (nCB2Val = 1)
-    Test.MethodTested("removeRefreshListener()", bOK)
-
-    Test.StartMethod("refresh()")
-    bOK = true
-    bOK = bOK AND (nCB1Val = 2) AND (nCB2Val = 1)
-    Test.MethodTested("refresh()", bOK)
-
-    Out.Log("Removing first refresh listener")
-    oObj.removeRefreshListener(oListener1)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub CB1_refreshed()
-  Out.Log("First listener CallBack called")
-  nCB1Val = nCB1Val + 1
-End Sub
-
-Sub CB2_refreshed()
-  Out.Log("Second listener CallBack called")
-  nCB2Val = nCB2Val + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/script.xlb
deleted file mode 100644
index 1f7fa245341a..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XReplaceDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XReplaceDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/util_XReplaceDescriptor.xba b/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/util_XReplaceDescriptor.xba
deleted file mode 100644
index e34fdb3015b5..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XReplaceDescriptor/util_XReplaceDescriptor.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XReplaceDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XReplaceDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim rStr As String
-
-    Test.StartMethod("setReplaceString()")
-    Test.StartMethod("getReplaceString()")
-    bOK = true
-
-    rStr = oObj.getReplaceString()
-    oObj.setReplaceString(rStr &amp; cIfcShortName)
-
-    bOK = bOK AND (rStr &amp; cIfcShortName = oObj.getReplaceString())
-    Test.MethodTested("getReplaceString()", bOK)
-    Test.MethodTested("setReplaceString()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XReplaceable/script.xlb b/qadevOOo/tests/basic/ifc/util/XReplaceable/script.xlb
deleted file mode 100644
index 63b382a66845..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XReplaceable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XReplaceable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XReplaceable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XReplaceable/util_XReplaceable.xba b/qadevOOo/tests/basic/ifc/util/XReplaceable/util_XReplaceable.xba
deleted file mode 100644
index 4a04437b8119..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XReplaceable/util_XReplaceable.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XReplaceable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cStringToSearch As String 
-'		should appears more than once
-'     - Global nSearchedEntriesAmount As Integer
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XReplaceable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oReplaceDescriptor As Object
-    Dim nReplace As Integer
-
-
-    Test.StartMethod("createReplaceDescriptor()")
-    bOK = true
-    oReplaceDescriptor = oObj.createReplaceDescriptor()
-    bOK = bOK AND hasUnoInterfaces(oReplaceDescriptor, "com.sun.star.util.XReplaceDescriptor")
-    Test.MethodTested("createReplaceDescriptor()", bOK)
-
-    Test.StartMethod("replaceAll()")
-    bOK = true
-    Out.Log("Prepearing descriptor...")
-    oReplaceDescriptor.SearchAll = true
-    oReplaceDescriptor.SearchCaseSensitive = true
-    oReplaceDescriptor.SearchWords = false
-    oReplaceDescriptor.SearchString = cStringToSearch
-    oReplaceDescriptor.ReplaceString = ucase(cStringToSearch)
-
-    nReplace = oObj.replaceAll(oReplaceDescriptor)
-    Out.Log("" &amp; nReplace &amp; " replaces were performed. Expected: " &amp; nSearchedEntriesAmount)
-    bOK = bOK AND nSearchedEntriesAmount = nReplace
-
-    Out.Log("Return to previous state...")
-    oReplaceDescriptor.SearchString = ucase(cStringToSearch)
-    oReplaceDescriptor.ReplaceString = cStringToSearch
-    nReplace = oObj.replaceAll(oReplaceDescriptor)
-    Test.MethodTested("replaceAll()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/script.xlb b/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/script.xlb
deleted file mode 100644
index 774469012875..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XSearchDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XSearchDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/util_XSearchDescriptor.xba b/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/util_XSearchDescriptor.xba
deleted file mode 100644
index 95b66d85774f..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSearchDescriptor/util_XSearchDescriptor.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XSearchDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XSearchDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sStr As String
-
-
-    Test.StartMethod("setSearchString()")
-    bOK = true
-    sStr = oObj.getSearchString()
-    oObj.setSearchString(sStr &amp; cIfcShortName)
-    bOK = bOK AND (sStr &lt;&gt; oObj.getSearchString())
-    Test.MethodTested("setSearchString()", bOK)
-
-    Test.StartMethod("getSearchString()")
-    bOK = true
-    bOK = bOK AND (oObj.getSearchString() = (sStr &amp; cIfcShortName))
-    Test.MethodTested("getSearchString()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XSearchable/script.xlb b/qadevOOo/tests/basic/ifc/util/XSearchable/script.xlb
deleted file mode 100644
index 2e4eb5ac7612..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSearchable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XSearchable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XSearchable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XSearchable/util_XSearchable.xba b/qadevOOo/tests/basic/ifc/util/XSearchable/util_XSearchable.xba
deleted file mode 100644
index 56b3c7c5601a..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSearchable/util_XSearchable.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XSearchable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global cStringToSearch As String
-'	 should appears more than once
-'     - Global nSearchedEntriesAmount As Integer
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XSearchable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim oMatch As Object
-    Dim oAllMatch As Object
-    Dim oSearchDescriptor As Object
-    Dim nCount As Long
-
-    Test.StartMethod("createSearchDescriptor()")
-    bOK = true
-    oSearchDescriptor = oObj.createSearchDescriptor()
-    bOK = bOK AND NOT isNULL(oSearchDescriptor)
-    bOK = bOK AND hasUnoInterfaces(oSearchDescriptor, "com.sun.star.util.XSearchDescriptor")
-    Test.MethodTested("createSearchDescriptor()", bOK)
-
-    Out.Log("Setting values to search descriptor")
-    oSearchDescriptor.SearchString = cStringToSearch
-    oSearchDescriptor.SearchWords = false
-    oSearchDescriptor.SearchCaseSensitive = true
-
-    Test.StartMethod("findAll()")
-    bOK = true
-    oAllMatch = oObj.findAll(oSearchDescriptor)
-    bOK = bOK AND hasUnoInterfaces(oAllMatch, "com.sun.star.container.XIndexAccess")
-    for i = 0 to oAllMatch.count - 1
-        bOK = bOK AND oAllMatch.getByIndex(i).String = cStringToSearch
-    next i
-    bOK = bOK AND oAllMatch.count = nSearchedEntriesAmount
-    Test.MethodTested("findAll()", bOK)
-
-    Test.StartMethod("findFirst()")
-    bOK = true
-    oMatch = oObj.findFirst(oSearchDescriptor)
-    bOK = bOK AND oMatch.String = cStringToSearch
-    Test.MethodTested("findFirst()", bOK)
-
-    Test.StartMethod("findNext()")
-    bOK = true
-    nCount = 0
-
-    While NOT isNULL(oMatch)
-        nCount = nCount + 1
-        bOK = bOK AND oMatch.String = cStringToSearch
-        oMatch = oObj.findNext(oMatch.end, oSearchDescriptor)
-    wend
-
-    bOK = bOK AND nSearchedEntriesAmount = nCount
-    Test.MethodTested("findNext()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XSortable/script.xlb b/qadevOOo/tests/basic/ifc/util/XSortable/script.xlb
deleted file mode 100644
index a50e2d2de419..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSortable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XSortable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XSortable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XSortable/util_XSortable.xba b/qadevOOo/tests/basic/ifc/util/XSortable/util_XSortable.xba
deleted file mode 100644
index dd998e38baab..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XSortable/util_XSortable.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XSortable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - modifyDescriptor(sortDescr As Variant)
-'       checkSort() As Boolean
-
-'*************************************************************************
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XSortable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSortDsc As Object, newDsc As Object
-
-    Test.StartMethod("createSortDescriptor()")
-    bOK = true
-    oSortDsc = oObj.createSortDescriptor()
-    bOK = bOK AND NOT isNULL(oSortDsc)
-    bOK = bOK AND isArray(oSortDsc)
-    Test.MethodTested("createSortDescriptor()", bOK)
-
-    Test.StartMethod("sort()")
-    newDsc = modifyDescriptor(oSortDsc)
-    bOK = true
-    oObj.sort(newDsc)
-    bOK = bOK AND checkSort()
-    Test.MethodTested("sort()", bOK)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XStringEscape/script.xlb b/qadevOOo/tests/basic/ifc/util/XStringEscape/script.xlb
deleted file mode 100644
index 45c2a0056092..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XStringEscape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XStringEscape" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="util_XStringEscape"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XStringEscape/util_XStringEscape.xba b/qadevOOo/tests/basic/ifc/util/XStringEscape/util_XStringEscape.xba
deleted file mode 100644
index 70ca52891aa0..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XStringEscape/util_XStringEscape.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="XStringEscape" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XStringEscape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    out.log("The Implementation of this Interface doesn't really do anything")
-    Dim toCheck as String
-    toCheck = ";:&lt;&gt;/*"            
-
-    Test.StartMethod("escapeString()")
-    bOK = TRUE
-    Dim eString as String
-    eString = oObj.escapeString(toCheck)
-    bOK = bOK AND (eString = toCheck)
-    Test.MethodTested("escapeString()", bOK)
-
-    Test.StartMethod("unescapeString()")
-    bOK = TRUE
-    Dim ueString as String
-    ueString = oObj.unescapeString(toCheck)
-    bOK = bOK AND (ueString = toCheck)
-    Test.MethodTested("unescapeString()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/util/XTextSearch/script.xlb b/qadevOOo/tests/basic/ifc/util/XTextSearch/script.xlb
deleted file mode 100644
index 923ac8c6cdd1..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XTextSearch/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="util_XTextSearch" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="util_XTextSearch"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/util/XTextSearch/util_XTextSearch.xba b/qadevOOo/tests/basic/ifc/util/XTextSearch/util_XTextSearch.xba
deleted file mode 100644
index 875e1e1d26a0..000000000000
--- a/qadevOOo/tests/basic/ifc/util/XTextSearch/util_XTextSearch.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="util_XTextSearch" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.util.XTextSearch
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Dim _Locale As new com.sun.star.lang.Locale
-    _Locale.Country = "US"
-    _Locale.Language = "en"
-
-    Test.StartMethod("setOptions()")
-    bOK = true
-    Dim aSearchOptions As new com.sun.star.util.SearchOptions
-    aSearchOptions.algorithmType = com.sun.star.util.SearchAlgorithms.REGEXP
-    aSearchOptions.searchFlag = com.sun.star.util.SearchFlags.ALL_IGNORE_CASE
-    aSearchOptions.searchString = "h[ae](k|l|j)+o" 'Should work because of ALL_IGNORE_CASE!
-    aSearchOptions.Locale = _Locale
-    oObj.setOptions(aSearchOptions)
-    Test.MethodTested("setOptions()", bOK)
-
-    Test.StartMethod("searchForward()")
-    bOK = true
-    Dim _string As String
-    Dim _result As Variant
-
-    _string = "String with 'Hello' and 'Hallo'."
-    _result = oObj.searchForward(_string, 0, len(_string))
-    if (ubound(_result.startOffset()) &gt;= 0) then
-        bOK = bOK AND _result.startOffset(0) = 13
-        bOK = bOK AND _result.endOffset(0) = 18
-        _result = oObj.searchForward(_string, 18, len(_string))
-        bOK = bOK AND _result.startOffset(0) = 25
-        bOK = bOK AND _result.endOffset(0) = 30
-    else
-        Out.Log("No matches were found!")
-        bOK = false
-    end if
-    Test.MethodTested("searchForward()", bOK)
-
-    Test.StartMethod("searchBackward()")
-    bOK = true
-    _result = oObj.searchBackward(_string, len(_string), 0)
-    if (ubound(_result.startOffset()) &gt;= 0) then
-        bOK = bOK AND _result.startOffset(0) = 30
-        bOK = bOK AND _result.endOffset(0) = 25
-        _result = oObj.searchBackward(_string, _result.endOffset(0), 0)
-        bOK = bOK AND _result.startOffset(0) = 18
-        bOK = bOK AND _result.endOffset(0) = 13
-    else
-        Out.Log("No matches were found!")
-        bOK = false
-    end if
-    Test.MethodTested("searchBackward()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XControlAccess/script.xlb b/qadevOOo/tests/basic/ifc/view/XControlAccess/script.xlb
deleted file mode 100644
index dd1dbb1dafa9..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XControlAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XControlAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XControlAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XControlAccess/view_XControlAccess.xba b/qadevOOo/tests/basic/ifc/view/XControlAccess/view_XControlAccess.xba
deleted file mode 100644
index f6d19697188f..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XControlAccess/view_XControlAccess.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XControlAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global oControlModel As Object
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XControlAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getControl()")
-    bOK = true
-    bOK = bOK AND NOT isNULL(oObj.getControl(oControlModel))
-    Test.MethodTested("getControl()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/script.xlb
deleted file mode 100644
index 47d9d0c85c3d..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XPrintSettingsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XPrintSettingsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/view_XPrintSettingsSupplier.xba b/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/view_XPrintSettingsSupplier.xba
deleted file mode 100644
index 968976bc314f..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XPrintSettingsSupplier/view_XPrintSettingsSupplier.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XPrintSettingsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XPrintSettingsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-
-    Test.StartMethod("getPrintSettings()")
-    bOK = true
-    bOK = bOK AND hasUnoInterfaces(oObj.getPrintSettings(), "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getPrintSettings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XPrintable/script.xlb b/qadevOOo/tests/basic/ifc/view/XPrintable/script.xlb
deleted file mode 100644
index 89ab8a254991..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XPrintable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XPrintable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XPrintable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XPrintable/view_XPrintable.xba b/qadevOOo/tests/basic/ifc/view/XPrintable/view_XPrintable.xba
deleted file mode 100644
index 19d74dacd651..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XPrintable/view_XPrintable.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XPrintable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XPrintable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim sFileName, sFileUrl As String
-    Dim aPrintingOptions(1) As New com.sun.star.beans.PropertyValue
-    Dim aPrinterProps As Variant
-    Dim i As Integer
-
-    Test.StartMethod("getPrinter()")
-    bOK = true
-    aPrinterProps = oObj.getPrinter()
-    bOK = bOK AND (ubound(aPrinterProps) &gt; 0)
-    Test.MethodTested("getPrinter()", bOK)
-
-
-    Test.StartMethod("print()")
-    bOK = true
-
-    sFileUrl = utils.getTempFileURL("/XPrintable.prt", true)
-    sFileName = utils.URL2Path(sFileUrl)
-
-    aPrintingOptions(0).Name = "FileName"
-    aPrintingOptions(0).Value = sFileName
-    aPrintingOptions(0).State = com.sun.star.beans.PropertyState.DEFAULT_VALUE
-
-    aPrintingOptions(1).Name = "Wait"
-    aPrintingOptions(1).Value = true
-    oObj.Print(aPrintingOptions())
-    
-    ' without waiting Office can hang on setPrinter() call.
-    wait(500)
-
-    bOK = bOK AND FileExists(sFileName)
-    Test.MethodTested("print()", bOK)
-
-    Test.StartMethod("setPrinter()")
-    bOK = true
-    Dim iPaperFormat As Integer
-    Dim iNewPaperFormat As Integer
-
-    for i = 0 to ubound(aPrinterProps())
-        if (aPrinterProps(i).Name = "PaperFormat") then
-            iPaperFormat = aPrinterProps(i).Value
-            exit for
-        endif
-    next i
-
-    if (iPaperFormat = com.sun.star.view.PaperFormat.A4) then
-        iNewPaperFormat = com.sun.star.view.PaperFormat.LETTER
-    else
-        iNewPaperFormat = com.sun.star.view.PaperFormat.A4
-    endif
-
-    aPrinterProps(i).Value = iNewPaperFormat
-
-    oObj.setPrinter(aPrinterProps())
-
-    aPrinterProps() = oObj.getPrinter()
-
-    for i = 0 to ubound(aPrinterProps())
-        if (aPrinterProps(i).Name = "PaperFormat") then
-            bOK = bOK AND (aPrinterProps(i).Value = iNewPaperFormat)
-            exit for
-        endif
-    next i
-    Test.MethodTested("setPrinter()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XScreenCursor/script.xlb b/qadevOOo/tests/basic/ifc/view/XScreenCursor/script.xlb
deleted file mode 100644
index 59d7873d04ee..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XScreenCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XScreenCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XScreenCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XScreenCursor/view_XScreenCursor.xba b/qadevOOo/tests/basic/ifc/view/XScreenCursor/view_XScreenCursor.xba
deleted file mode 100644
index 801ab47df947..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XScreenCursor/view_XScreenCursor.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XScreenCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XScreenCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("screenDown()")
-    bOK = true
-    bOK = bOK AND oObj.screenDown()
-    Test.MethodTested("screenDown()", bOK)
-
-    Test.StartMethod("screenUp()")
-    bOK = true
-    bOK = bOK AND oObj.screenUp()
-    Test.MethodTested("screenUp()", bOK)
-
-    DisposeObj()
-    CreateObj()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/script.xlb b/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/script.xlb
deleted file mode 100644
index 29b136c54fc0..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XSelectionSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XSelectionSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/view_XSelectionSupplier.xba b/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/view_XSelectionSupplier.xba
deleted file mode 100644
index 642eea896b9c..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XSelectionSupplier/view_XSelectionSupplier.xba
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XSelectionSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global SelectableObj1 As Object
-'     - Global SelectableObj2 As Object
-
-'*************************************************************************
-
-
-
-
-Dim nCB1Val, nCB2Val As Integer
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XSelectionSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK, bSelected As Boolean
-    Dim oListener1, oListener2, oSelection As Object
-
-    Out.Log("creating two Listeners")
-    oListener1 = createUNOListener("CB1_", "com.sun.star.view.XSelectionChangeListener")
-    oListener2 = createUNOListener("CB2_", "com.sun.star.view.XSelectionChangeListener")
-    bOK = NOT isNULL(oListener1) AND NOT isNULL(oListener2)
-    Out.Log("Listeners creation : " &amp; bOK)
-
-    Test.StartMethod("select()")
-    bOK = true
-    out.log("Trying to select ...")
-    bOK = bOK AND oObj.select(SelectableObj1)
-    Test.MethodTested("select()", bOK)
-
-    Test.StartMethod("getSelection()")
-    bOK = true
-    oSelection = oObj.getSelection()
-    bOK = bOK AND NOT isNULL(oSelection)
-
-    ' The selection is either specified by an object which is contained
-    ' in the component to which the view belongs or it is an interface of a
-    ' collection which contains such objects.
-
-    if bOK then
-        if (cObjectName = "sw.SwXTextView") then
-            bOK = bOK AND oSelection.hasElements()
-            bOK = bOK AND (oSelection.getByIndex(0).String = SelectableObj1.String)
-        elseif (hasUnoInterfaces(oSelection, "com.sun.star.container.XElementAccess")) then
-            bOK = bOK AND oSelection.hasElements()
-            if bOK then bOK = bOK AND (oSelection.getByIndex(0).dbg_methods = SelectableObj1.dbg_methods)
-        else
-            bOK = bOK AND (oSelection.dbg_methods = SelectableObj1.dbg_methods)
-        end if
-    end if
-
-    Test.MethodTested("getSelection()", bOK)
-
-    Test.StartMethod("addSelectionChangeListener()")
-    bOK = true
-    Out.Log("Adding two listeners...")
-    oObj.addSelectionChangeListener(oListener1)
-    oObj.addSelectionChangeListener(oListener2)
-
-    Out.Log("Select item...")
-    ResetCB()
-    bOK = bOK AND oObj.select(SelectableObj2)
-    bOK = bOK AND (nCB1Val &gt; 0) AND (nCB2Val &gt; 0)
-    Test.MethodTested("addSelectionChangeListener()", bOK)
-
-    Test.StartMethod("removeSelectionChangeListener()")
-    bOK = true
-    Out.Log("Remove first listener...")
-    oObj.removeSelectionChangeListener(oListener1)
-
-    Out.Log("Select item...")
-    ResetCB()
-    bOK = bOK AND oObj.select(SelectableObj1)
-    bOK = bOK AND (nCB1Val = 0) AND (nCB2Val &gt; 0)
-    Test.MethodTested("removeSelectionChangeListener()", bOK)
-
-    Out.Log("Remove last listener...")
-    oObj.removeSelectionChangeListener(oListener2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-
-Sub CB1_selectionChanged
-    Out.Log("Listener 1 was called")
-    nCB1Val = nCB1Val + 1
-end sub
-
-Sub CB2_selectionChanged
-    Out.Log("Listener 2 was called")
-    nCB2Val = nCB2Val + 1
-end sub
-
-Sub ResetCB()
-    nCB1Val = 0
-    nCB2Val = 0
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/script.xlb b/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/script.xlb
deleted file mode 100644
index 44bb4097f5f6..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="view_XViewSettingsSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="view_XViewSettingsSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/view_XViewSettingsSupplier.xba b/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/view_XViewSettingsSupplier.xba
deleted file mode 100644
index a30734c80fe9..000000000000
--- a/qadevOOo/tests/basic/ifc/view/XViewSettingsSupplier/view_XViewSettingsSupplier.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="view_XViewSettingsSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.view.XViewSettingsSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    Test.StartMethod("getViewSettings()")
-    bOK = true
-    oSettings = oObj.getViewSettings()
-    bOK = bOK AND NOT isNULL(oSettings)
-    bOK = bOK AND hasUnoInterfaces(oSettings, "com.sun.star.beans.XPropertySet")
-    Test.MethodTested("getViewSettings()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/script.xlb b/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/script.xlb
deleted file mode 100644
index 1d1c11a3687a..000000000000
--- a/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="xml_UserDefinedAttributeSupplier" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="xml_UserDefinedAttributeSupplier"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/xml_UserDefinedAttributeSupplier.xba b/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/xml_UserDefinedAttributeSupplier.xba
deleted file mode 100644
index e4ab382578be..000000000000
--- a/qadevOOo/tests/basic/ifc/xml/UserDefinedAttributeSupplier/xml_UserDefinedAttributeSupplier.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xml_UserDefinedAttributeSupplier" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.xml.UserDefinedAttributeSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim uda as Object
-    Dim attr as new com.sun.star.xml.AttributeData
-    Dim els as Variant
-
-    bOK = TRUE
-    Test.StartMethod("UserDefinedAttributes")
-    uda = oObj.getPropertyValue("UserDefinedAttributes")
-    attr.Namespace = "http://www.sun.com/staroffice/apitest/Chartprop"
-    attr.Type="CDATA"
-    attr.Value="true"
-    uda.insertByName("Chartprop:has-first-alien-attribute",attr)            
-    els = uda.getElementNames()            
-    oObj.setPropertyValue("UserDefinedAttributes",uda)
-    uda = oObj.getPropertyValue("UserDefinedAttributes")
-    els = uda.getElementNames()
-    uda.getByName("Chartprop:has-first-alien-attribute")
-    Test.MethodTested("UserDefinedAttributes",bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/script.xlb b/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/script.xlb
deleted file mode 100644
index bd86f9cb1f27..000000000000
--- a/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xml_sax_XDocumentHandler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xml_sax_XDocumentHandler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/xml_sax_XDocumentHandler.xba b/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/xml_sax_XDocumentHandler.xba
deleted file mode 100644
index 010e288d21e7..000000000000
--- a/qadevOOo/tests/basic/ifc/xml/sax/XDocumentHandler/xml_sax_XDocumentHandler.xba
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xml_sax_XDocumentHandler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' This Interface/Service test depends on the following GLOBAL variables,
-' which must be specified in the object creation:
-
-'     - Global vXMLData As Variant
-
-'*************************************************************************
-
-
-
-
-
-Sub RunTest()
-
-'*************************************************************************
-' INTERFACE: 
-' com.sun.star.xml.sax.XDocumentHandler
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i As Integer
-   
-    Test.StartMethod("startDocument()")
-    bOK = true
-    oObj.startDocument()
-    Test.MethodTested("startDocument()", bOK)
-    out.log("StartDocument")
-
-'  Imports the XML-data
-    For i = 0 to ubound(vXMLData)
-        Dim data As Variant
-        data = vXMLData(i)
-        If data(0) = "start" then
-            Dim oAttr As Object
-            oAttr = createUnoService("basichelper.AttributeList")
-
-            Dim upBound as Integer
-            upBound = ubound(data())
-            If upBound > 1 then
-                Dim j As Integer
-                Dim args As Variant
-                args = DimArray(upBound - 2)
-                For j = 0 to ubound(args())
-                    args(j) = data(2 + j)
-                Next j
-                oAttr.initialize(args())
-            EndIf
-
-            oObj.startElement(data(1), oAttr)
-            out.log("&lt;" + data(1) + "&gt;")
-        EndIf
-        If data(0) = "end" then
-            oObj.endElement(data(1))
-            out.log("&lt;/" + data(1) + "&gt;")
-        EndIf
-        If data(0) = "chars" then 
-            oObj.characters(data(1))
-            out.log(data(1))
-        EndIf
-    Next i
-
-    out.log("EndDocument")
-    Test.StartMethod("endDocument()")
-    oObj.endDocument()
-    bOK = CheckImport()
-    Test.MethodTested("endDocument()", bOK)    
-
-    Test.StartMethod("startElement()")
-    bOK = true
-    Test.MethodTested("startElement()", bOK)
-
-    Test.StartMethod("endElement()")
-    bOK = true
-    Test.MethodTested("endElement()", bOK)
-
-
-    Test.StartMethod("characters()")
-    bOK = true
-    Test.MethodTested("characters()", bOK)
-
-    Test.StartMethod("ignorableWhitespace()")
-    bOK = true
-    Test.MethodTested("ignorableWhitespace()", bOK)
-
-    Test.StartMethod("processingInstruction()")
-    bOK = true
-    Test.MethodTested("processingInstruction()", bOK)
-
-    Test.StartMethod("setDocumentLocator()")
-    bOK = true
-    Test.MethodTested("setDocumentLocator()", bOK)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    bOK = false
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/acceptor_uno_Acceptor.xba b/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/acceptor_uno_Acceptor.xba
deleted file mode 100644
index d3cf577383df..000000000000
--- a/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/acceptor_uno_Acceptor.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="acceptor_uno_Acceptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' acceptor.Acceptor
-'*************************************************************************
-    oObj = createUnoService("com.sun.star.connection.Acceptor")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/script.xlb b/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/script.xlb
deleted file mode 100644
index d14418d951e3..000000000000
--- a/qadevOOo/tests/basic/mod/acceptor.uno/Acceptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="acceptor_uno_Acceptor" library:readonly="false" library:passwordprotected="false">
-<library:element library:name="acceptor_uno_Acceptor"/>
-</library:library>
diff --git a/qadevOOo/tests/basic/mod/acceptor/Acceptor/acceptor_Acceptor.xba b/qadevOOo/tests/basic/mod/acceptor/Acceptor/acceptor_Acceptor.xba
deleted file mode 100644
index 53f50f3d014d..000000000000
--- a/qadevOOo/tests/basic/mod/acceptor/Acceptor/acceptor_Acceptor.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="acceptor_Acceptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' acceptor.Acceptor
-'*************************************************************************
-    oObj = createUnoService("com.sun.star.connection.Acceptor")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/acceptor/Acceptor/script.xlb b/qadevOOo/tests/basic/mod/acceptor/Acceptor/script.xlb
deleted file mode 100644
index 2e9396e490ce..000000000000
--- a/qadevOOo/tests/basic/mod/acceptor/Acceptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="acceptor_Acceptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="acceptor_Acceptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/adabas/ODriver/adabas_ODriver.xba b/qadevOOo/tests/basic/mod/adabas/ODriver/adabas_ODriver.xba
deleted file mode 100644
index 19188b8cf603..000000000000
--- a/qadevOOo/tests/basic/mod/adabas/ODriver/adabas_ODriver.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="adabas_ODriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' adabas.ODriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbcx.adabas.ODriver")
-
-    URL = adabasUrl
-
-    Dim inf(1) As new com.sun.star.beans.PropertyValue
-    inf(0).Name = "user" : inf(0).Value = adabasUser
-    inf(1).Name = "password" : inf(1).Value = adabasPassword
-
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/adabas/ODriver/script.xlb b/qadevOOo/tests/basic/mod/adabas/ODriver/script.xlb
deleted file mode 100644
index 95a44f640eea..000000000000
--- a/qadevOOo/tests/basic/mod/adabas/ODriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="adabas_ODriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="adabas_ODriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ado/ODriver/ado_ODriver.xba b/qadevOOo/tests/basic/mod/ado/ODriver/ado_ODriver.xba
deleted file mode 100644
index 414d42b5ba0e..000000000000
--- a/qadevOOo/tests/basic/mod/ado/ODriver/ado_ODriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ado_ODriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ado.ODriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.ado.ODriver")
-
-    URL = adoUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ado/ODriver/script.xlb b/qadevOOo/tests/basic/mod/ado/ODriver/script.xlb
deleted file mode 100644
index e4411785825c..000000000000
--- a/qadevOOo/tests/basic/mod/ado/ODriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ado_ODriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ado_ODriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/brdgfctr_BridgeFactory.xba b/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/brdgfctr_BridgeFactory.xba
deleted file mode 100644
index aaeecf914e7e..000000000000
--- a/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/brdgfctr_BridgeFactory.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="brdgfctr_BridgeFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-' Required for com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-' Required for com.sun.star.bridge.XBridgeFactory
-Global sProtocol As String 
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' brdgfctr.BridgeFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.bridge.BridgeFactory")
-
-    ' Required for com.sun.star.lang.XComponent:
-    oComponentInstance = oObj
-
-    ' Required for com.sun.star.bridge.XBridgeFactory
-    sProtocol = "urp"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/script.xlb b/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/script.xlb
deleted file mode 100644
index 51e25f8a2a15..000000000000
--- a/qadevOOo/tests/basic/mod/brdgfctr/BridgeFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="brdgfctr_BridgeFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="brdgfctr_BridgeFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/bridgefac_uno_BridgeFactory.xba b/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/bridgefac_uno_BridgeFactory.xba
deleted file mode 100644
index 99e3550df4bf..000000000000
--- a/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/bridgefac_uno_BridgeFactory.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="bridgefac_uno_BridgeFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-' Required for com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-' Required for com.sun.star.bridge.XBridgeFactory
-Global sProtocol As String 
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' brdgfctr.BridgeFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.bridge.BridgeFactory")
-
-    ' Required for com.sun.star.lang.XComponent:
-    oComponentInstance = oObj
-
-    ' Required for com.sun.star.bridge.XBridgeFactory
-    sProtocol = "urp"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/script.xlb b/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/script.xlb
deleted file mode 100644
index fc97a359ebcf..000000000000
--- a/qadevOOo/tests/basic/mod/bridgefac.uno/BridgeFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="bridgefac_uno_BridgeFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="bridgefac_uno_BridgeFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/cached_CachedContentResultSetFactory.xba b/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/cached_CachedContentResultSetFactory.xba
deleted file mode 100644
index 8104801121f7..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/cached_CachedContentResultSetFactory.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cached_CachedContentResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.ucb.XCachedContentResultSetFactory
-  Global oCachedContentResultSetStub As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cached.CachedContentResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oUCB, oCI, oContent As Object
-    Dim args As Variant
-    Dim sURL, sCntURL As String
-    
-    oObj = createUnoService("com.sun.star.ucb.CachedContentResultSetFactory")
-
-    args = Array("Local", "Office")
-    oUCB = createUnoService("com.sun.star.ucb.UniversalContentBroker")
-    oUCB.initialize(args())
-
-    sURL = utils.Path2URL(cTestDocsDir &amp; "solibrary.jar")
-    sURL = utils.utils.StrReplace(sURL, "/", "%2F")
-    sCntURL = "vnd.sun.star.pkg://" &amp; sURL &amp; "/"
-    
-    oCI = oUCB.createContentIdentifier(sCntUrl)
-    oContent = oUCB.queryContent(oCI)
-
-    Dim props(0) As new com.sun.star.beans.Property
-    Dim cmd As new com.sun.star.ucb.Command
-    Dim ocArg As new com.sun.star.ucb.OpenCommandArgument2
-    Dim sortInfo() As new com.sun.star.ucb.NumberedSortingInfo
-    Dim oResSet, oDynResSet, oStubFactory As Object
-
-    props(0).Name = "Title"
-
-    ocArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    ocArg.Priority = 10000
-    ocArg.Properties = props()
-    ocArg.SortingInfo = sortInfo()
-
-    cmd.Name = "open"
-    cmd.Handle = -1
-    cmd.Argument = ocArg
-
-    oDynResSet = oContent.execute(cmd, 0, NULL_OBJECT)
-    oResSet = oDynResSet.getStaticResultSet()
-
-    oResSet.first()
-    out.log("Is result set OK? " + (oResSet.getString(1) = "com") )
-
-    oStubFactory = createUnoService("com.sun.star.ucb.CachedContentResultSetStubFactory")
-    oCachedContentResultSetStub = oStubFactory.createCachedContentResultSetStub(oResSet)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/script.xlb b/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/script.xlb
deleted file mode 100644
index 32d0ebe1aa7d..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cached_CachedContentResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cached_CachedContentResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/cached_CachedContentResultSetStubFactory.xba b/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/cached_CachedContentResultSetStubFactory.xba
deleted file mode 100644
index 01e6bb7c72e3..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/cached_CachedContentResultSetStubFactory.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cached_CachedContentResultSetStubFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.ucb.XCachedContentResultSetStubFactory
-  Global oContentResultSet As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cached.CachedContentResultSetStubFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ucb.CachedContentResultSetStubFactory")
-
-    Dim args As Variant
-    Dim oUCB As Object
-    args = Array("Local", "Office")
-    oUCB = createUnoService("com.sun.star.ucb.UniversalContentBroker")
-    oUCB.initialize(args())    
-
-    Dim sURL, sCntURL As String
-    Dim oCI, oContent As Object
-    sURL = utils.Path2URL(cTestDocsDir &amp; "solibrary.jar")
-    sURL = utils.utils.StrReplace(sURL, "/", "%2F")
-    sCntURL = "vnd.sun.star.pkg://" &amp; sURL &amp; "/"
-    
-    oCI = oUCB.createContentIdentifier(sCntUrl)
-    oContent = oUCB.queryContent(oCI)
-    
-    Dim props(0) As new com.sun.star.beans.Property
-    Dim cmd As new com.sun.star.ucb.Command
-    Dim ocArg As new com.sun.star.ucb.OpenCommandArgument2
-    Dim sortInfo() As new com.sun.star.ucb.NumberedSortingInfo
-    Dim oDynResSet, oStubFactory As Object
-
-    props(0).Name = "Title"
-
-    ocArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    ocArg.Priority = 10000
-    ocArg.Properties = props()
-    ocArg.SortingInfo = sortInfo()
-
-    cmd.Name = "open"
-    cmd.Handle = -1
-    cmd.Argument = ocArg
-
-    oDynResSet = oContent.execute(cmd, 0, NULL_OBJECT)
-    oContentResultSet = oDynResSet.getStaticResultSet()    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/script.xlb b/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/script.xlb
deleted file mode 100644
index dcbc6cd85a94..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedContentResultSetStubFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cached_CachedContentResultSetStubFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cached_CachedContentResultSetStubFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/cached_CachedDynamicResultSetFactory.xba b/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/cached_CachedDynamicResultSetFactory.xba
deleted file mode 100644
index d5ec1571e159..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/cached_CachedDynamicResultSetFactory.xba
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cached_CachedDynamicResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.ucb.XCachedDynamicResultSetFactory
-  Global oResSetStub As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cached.CachedDynamicResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ucb.CachedDynamicResultSetFactory")
-    
-    Dim args As Variant
-    Dim oUCB As Object
-    args = Array("Local", "Office")
-    oUCB = createUnoService("com.sun.star.ucb.UniversalContentBroker")
-    oUCB.initialize(args())    
-
-    Dim sURL, sCntURL As String
-    Dim oCI, oContent As Object
-    sURL = utils.Path2URL(cTestDocsDir &amp; "solibrary.jar")
-    sURL = utils.utils.StrReplace(sURL, "/", "%2F")
-    sCntURL = "vnd.sun.star.pkg://" &amp; sURL &amp; "/"
-    
-    oCI = oUCB.createContentIdentifier(sCntUrl)
-    oContent = oUCB.queryContent(oCI)
-    
-    Dim props(0) As new com.sun.star.beans.Property
-    Dim cmd As new com.sun.star.ucb.Command
-    Dim ocArg As new com.sun.star.ucb.OpenCommandArgument2
-    Dim sortInfo() As new com.sun.star.ucb.NumberedSortingInfo
-    Dim oDynResSet, oStubFactory As Object
-
-    props(0).Name = "Title"
-
-    ocArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    ocArg.Priority = 10000
-    ocArg.Properties = props()
-    ocArg.SortingInfo = sortInfo()
-
-    cmd.Name = "open"
-    cmd.Handle = -1
-    cmd.Argument = ocArg
-
-    oDynResSet = oContent.execute(cmd, 0, NULL_OBJECT)
-
-    oStubFactory = createUnoService("com.sun.star.ucb.CachedDynamicResultSetStubFactory")
-    oResSetStub = oStubFactory.createCachedDynamicResultSetStub(oDynResSet)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/script.xlb b/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/script.xlb
deleted file mode 100644
index cce9bb842251..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cached_CachedDynamicResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cached_CachedDynamicResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/cached_CachedDynamicResultSetStubFactory.xba b/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/cached_CachedDynamicResultSetStubFactory.xba
deleted file mode 100644
index d979d506b638..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/cached_CachedDynamicResultSetStubFactory.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cached_CachedDynamicResultSetStubFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.ucb.XCachedDynamicResultSetStubFactory
-  Global oResSet As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cached.CachedDynamicResultSetStubFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ucb.CachedDynamicResultSetStubFactory")
-
-    Dim args As Variant
-    Dim oUCB As Object
-    args = Array("Local", "Office")
-    oUCB = createUnoService("com.sun.star.ucb.UniversalContentBroker")
-    oUCB.initialize(args())    
-
-    Dim sURL, sCntURL As String
-    Dim oCI, oContent As Object
-    sURL = utils.Path2URL(cTestDocsDir &amp; "solibrary.jar")
-    sURL = utils.utils.StrReplace(sURL, "/", "%2F")
-    sCntURL = "vnd.sun.star.pkg://" &amp; sURL &amp; "/"
-    
-    oCI = oUCB.createContentIdentifier(sCntUrl)
-    oContent = oUCB.queryContent(oCI)
-    
-    Dim props(0) As new com.sun.star.beans.Property
-    Dim cmd As new com.sun.star.ucb.Command
-    Dim ocArg As new com.sun.star.ucb.OpenCommandArgument2
-    Dim sortInfo() As new com.sun.star.ucb.NumberedSortingInfo
-    Dim oStubFactory As Object
-
-    props(0).Name = "Title"
-
-    ocArg.Mode = com.sun.star.ucb.OpenMode.ALL
-    ocArg.Priority = 10000
-    ocArg.Properties = props()
-    ocArg.SortingInfo = sortInfo()
-
-    cmd.Name = "open"
-    cmd.Handle = -1
-    cmd.Argument = ocArg
-
-    oResSet = oContent.execute(cmd, 0, NULL_OBJECT)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/script.xlb b/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/script.xlb
deleted file mode 100644
index 175495d2475a..000000000000
--- a/qadevOOo/tests/basic/mod/cached/CachedDynamicResultSetStubFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cached_CachedDynamicResultSetStubFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cached_CachedDynamicResultSetStubFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/cmdmail_SimpleCommandMail.xba b/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/cmdmail_SimpleCommandMail.xba
deleted file mode 100644
index 76bf3537af96..000000000000
--- a/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/cmdmail_SimpleCommandMail.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cmdmail_SimpleCommandMail" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cmdmail.SimpleCommandMail
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.system.SimpleCommandMail")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/script.xlb b/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/script.xlb
deleted file mode 100644
index d95fbd929c1f..000000000000
--- a/qadevOOo/tests/basic/mod/cmdmail/SimpleCommandMail/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cmdmail_SimpleCommandMail" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cmdmail_SimpleCommandMail"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/cnt_ChaosContentProvider.xba b/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/cnt_ChaosContentProvider.xba
deleted file mode 100644
index d25c14f513b3..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/cnt_ChaosContentProvider.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cnt_ChaosContentProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cnt.ChaosContentProvider
-'*************************************************************************
-    Dim oUCB As Object
-    oObj = createUNOService("com.sun.star.ucb.ChaosContentProvider")
-    oUCB = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-    ContentID1 = oUCB.createContentIdentifier("ftp://localhost")
-    ContentID2 = oUCB.createContentIdentifier("vnd.sun.star.help://")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/script.xlb b/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/script.xlb
deleted file mode 100644
index 8f605cbbca17..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/ChaosContentProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cnt_ChaosContentProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cnt_ChaosContentProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/cnt_CntUnoDataContainer.xba b/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/cnt_CntUnoDataContainer.xba
deleted file mode 100644
index 1d224492b1cc..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/cnt_CntUnoDataContainer.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cnt_CntUnoDataContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-' Required for com.sun.star.container.XIndexContainer:
-  Global oInstance As Variant 'for InsertByName
-
-' Required for XIndexReplace
-  Global oIdxReplaceInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cnt.CntUnoDataContainer
-'*************************************************************************
-    Dim oDataContainer1 As Object
-    Dim oDataContainer2 As Object
-    Dim oInputStream As Object
-    Dim cFileName As String
-    Dim oFileAcc As Object
-    Dim hFile As Integer
-
-    oObj = createUNOService("com.sun.star.ucb.DataContainer")
-    oDataContainer1 = createUNOService("com.sun.star.ucb.DataContainer")
-    oDataContainer2 = createUNOService("com.sun.star.ucb.DataContainer")
-    oIdxReplaceInstance = createUNOService("com.sun.star.ucb.DataContainer")
-
-    oInstance = createUNOService("com.sun.star.ucb.DataContainer")
-
-    oObj.Name = "oDataContainer0"
-    oDataContainer1.Name = "oDataContainer1"
-    oDataContainer2.Name = "oDataContainer2"
-    oInstance.Name = "XDataContainer3"
-    oIdxReplaceInstance.Name = "oIdxReplaceInstance"
-
-    oObj.insertByIndex(0, oDataContainer1)
-    oObj.insertByIndex(1, oDataContainer2)
-
-    cFileName = utils.getTempFileURL("CntUnoDataContainer.dat")
-    #hFile = freefile()
-    Open cFileName For Output As #hFile
-    print #hFile "String content from cnt.CntUnoDataContainer"
-    close #hFile
-
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    oInputStream = oFileAcc.openFileRead(cFileName)
-    oObj.setInputStream(oInputStream)
-    oObj.setContentType("text/plain")
-
-End Sub
-
-Sub ResetStreams()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/script.xlb b/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/script.xlb
deleted file mode 100644
index d806d1fad5d4..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/CntUnoDataContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cnt_CntUnoDataContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cnt_CntUnoDataContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/cnt_PropertyMatcherFactory.xba b/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/cnt_PropertyMatcherFactory.xba
deleted file mode 100644
index 144c36389578..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/cnt_PropertyMatcherFactory.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cnt_PropertyMatcherFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cnt.PropertyMatcherFactory
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.ucb.PropertyMatcherFactory")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/script.xlb b/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/script.xlb
deleted file mode 100644
index 090026c261d5..000000000000
--- a/qadevOOo/tests/basic/mod/cnt/PropertyMatcherFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cnt_PropertyMatcherFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cnt_PropertyMatcherFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/connector.uno/Connector/connector_uno_Connector.xba b/qadevOOo/tests/basic/mod/connector.uno/Connector/connector_uno_Connector.xba
deleted file mode 100644
index b7435bab594c..000000000000
--- a/qadevOOo/tests/basic/mod/connector.uno/Connector/connector_uno_Connector.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="connector_uno_Connector" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' connectr.Connector
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.connection.Connector")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/connector.uno/Connector/script.xlb b/qadevOOo/tests/basic/mod/connector.uno/Connector/script.xlb
deleted file mode 100644
index 4ace609e6092..000000000000
--- a/qadevOOo/tests/basic/mod/connector.uno/Connector/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="connector_uno_onnector" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="connector_uno_Connector"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/connectr/Connector/connectr_Connector.xba b/qadevOOo/tests/basic/mod/connectr/Connector/connectr_Connector.xba
deleted file mode 100644
index 900625d74de4..000000000000
--- a/qadevOOo/tests/basic/mod/connectr/Connector/connectr_Connector.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="connectr_Connector" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' connectr.Connector
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.connection.Connector")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/connectr/Connector/script.xlb b/qadevOOo/tests/basic/mod/connectr/Connector/script.xlb
deleted file mode 100644
index 0639ac0f938c..000000000000
--- a/qadevOOo/tests/basic/mod/connectr/Connector/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="connectr_Connector" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="connectr_Connector"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/corefl/CoreReflection/corefl_CoreReflection.xba b/qadevOOo/tests/basic/mod/corefl/CoreReflection/corefl_CoreReflection.xba
deleted file mode 100644
index 98333ea94bee..000000000000
--- a/qadevOOo/tests/basic/mod/corefl/CoreReflection/corefl_CoreReflection.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="corefl_CoreReflection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' corefl.CoreReflection
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.reflection.CoreReflection")
-
-    ' Required for com.sun.star.lang.XComponent
-    oComponentInstance = oObj
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/corefl/CoreReflection/script.xlb b/qadevOOo/tests/basic/mod/corefl/CoreReflection/script.xlb
deleted file mode 100644
index f29c9839c013..000000000000
--- a/qadevOOo/tests/basic/mod/corefl/CoreReflection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="corefl_CoreReflection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="corefl_CoreReflection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/corereflection_uno_CoreReflection.xba b/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/corereflection_uno_CoreReflection.xba
deleted file mode 100644
index ce69bd070877..000000000000
--- a/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/corereflection_uno_CoreReflection.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="corereflection_uno_CoreReflection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' corefl.CoreReflection
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.reflection.CoreReflection")
-
-    ' Required for com.sun.star.lang.XComponent
-    oComponentInstance = oObj
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/script.xlb b/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/script.xlb
deleted file mode 100644
index 1d7d7a488a49..000000000000
--- a/qadevOOo/tests/basic/mod/corereflection.uno/CoreReflection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="corereflection_uno_CoreReflection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="corereflection_uno_CoreReflection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/cpld_DLLComponentLoader.xba b/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/cpld_DLLComponentLoader.xba
deleted file mode 100644
index 9a5544f9f2b0..000000000000
--- a/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/cpld_DLLComponentLoader.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="cpld_DLLComponentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global cImpLoader As String
-Global cImpURL As String
-Global cImpName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cpld.DLLComponentLoader
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.loader.SharedLibrary")
-    
-    cImpLoader = "com.sun.star.loader.SharedLibrary"
-    cImpURL = Path2URL(cTestDocsDir + "XImpReg.dll")
-    cImpName = "com.sun.star.comp.stoc.JavaComponentLoader"
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/script.xlb b/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/script.xlb
deleted file mode 100644
index 1d673ffb7d71..000000000000
--- a/qadevOOo/tests/basic/mod/cpld/DLLComponentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="cpld_DLLComponentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="cpld_DLLComponentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/dbaccess_ConnectionLineAccessibility.xba b/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/dbaccess_ConnectionLineAccessibility.xba
deleted file mode 100644
index 751479fca4ab..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/dbaccess_ConnectionLineAccessibility.xba
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ConnectionLineAccessibility" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cancelButton As Object
-Global queryWindow As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ConnectionLineAccessibility
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    Dim dbSource As Object
-    dbSource = createUnoService("com.sun.star.sdb.DataSource")
-
-    Dim info(2) As new com.sun.star.beans.PropertyValue
-    info(0).Name = "JavaDriverClass"
-    info(0).Value = "org.gjt.mm.mysql.Driver"
-    info(1).Name = "user"
-    info(1).Value = jdbcUser
-    info(2).Name = "password"
-    info(2).Value = jdbcPassword
-    dbSource.info = info()
-    dbSource.URL = jdbcUrl
-
-    Dim dbContext As Object
-    dbContext = createUnoService("com.sun.star.sdb.DatabaseContext")
-
-    Dim sourceName As String
-    sourceName = "AAADBSource for dbu-accessibility"
-
-    if dbContext.hasByName(sourceName) then
-        dbContext.revokeObject(sourceName)
-    endif
-
-    dbContext.registerObject(sourceName, dbSource)
-
-    Dim connection As Object
-    connection = dbSource.getIsolatedConnection(jdbcUser, jdbcPassword)
-
-    Dim statement As Object
-    statement = connection.createStatement()
-
-    statement.executeUpdate("drop table if exists tst_table1")
-    statement.executeUpdate("drop table if exists tst_table2")
-    statement.executeUpdate("create table tst_table1 (id1 int)")
-    statement.executeUpdate("create table tst_table2 (id2 int)")
-
-    Dim defContainer As Object
-    defContainer = dbSource.getQueryDefinitions()
-
-    Dim newQuery As Object
-    newQuery = createUnoService("com.sun.star.sdb.QueryDefinition")
-    newQuery.Command = "select * from tst_table1, tst_table2 where " + _
-                       "tst_table1.id1=tst_table2.id2"
-
-    defContainer.insertByName("Query1", newQuery)
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    thRunner.initialize(Array("ExecuteDialog", "com.sun.star.sdb.DatasourceAdministrationDialog"))
-    wait(3000)
-
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    Dim pageTabList As Object
-    pageTabList = utils.at_getAccessibleObjectForRole(xRoot, 31)
-
-    pageTabList.selectAccessibleChild(3)
-    wait(500)
-
-    Dim editQueryButton As Object
-    editQueryButton = utils.at_getAccessibleObjectForRole(xRoot, 35, "Edit Query")
-
-    cancelButton = utils.at_getAccessibleObjectForRole(xRoot, 35, "Cancel")
-
-    editQueryButton.doAccessibleAction(0)
-    wait(1000)
-
-    oWin = tk.getActiveTopWindow()
-    queryWindow = oWin
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, 0, "Relation")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    queryWindow.dispose()
-    if NOT isNull(cancelButton) then
-        cancelButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/script.xlb
deleted file mode 100644
index 66ba217e7f6c..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ConnectionLineAccessibility/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ConnectionLineAccessibility" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ConnectionLineAccessibility"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/dbaccess_DBContentLoader.xba b/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/dbaccess_DBContentLoader.xba
deleted file mode 100644
index 5c7722b265bd..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/dbaccess_DBContentLoader.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_DBContentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' For XFrameLoader
-Global FrameLoaderURL As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.DBContentLoader
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdb.ContentLoader")
-
-    ' For XFrameLoader
-    FrameLoaderURL = ".component:DB/DataSourceBrowser"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/script.xlb
deleted file mode 100644
index 16dc4304c46c..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/DBContentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_DBContentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_DBContentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/dbaccess_JoinViewAccessibility.xba b/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/dbaccess_JoinViewAccessibility.xba
deleted file mode 100644
index 3b2b98a28618..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/dbaccess_JoinViewAccessibility.xba
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_JoinViewAccessibility" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global cancelButton As Object
-Global queryWindow As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.JoinViewAccessibility
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    Dim dbSource As Object
-    dbSource = createUnoService("com.sun.star.sdb.DataSource")
-
-    Dim info(2) As new com.sun.star.beans.PropertyValue
-    info(0).Name = "JavaDriverClass"
-    info(0).Value = "org.gjt.mm.mysql.Driver"
-    info(1).Name = "user"
-    info(1).Value = jdbcUser
-    info(2).Name = "password"
-    info(2).Value = jdbcPassword
-    dbSource.info = info()
-    dbSource.URL = jdbcUrl
-
-    Dim dbContext As Object
-    dbContext = createUnoService("com.sun.star.sdb.DatabaseContext")
-
-    Dim sourceName As String
-    sourceName = "AAADBSource for dbu-accessibility"
-
-    if dbContext.hasByName(sourceName) then
-        dbContext.revokeObject(sourceName)
-    endif
-
-    dbContext.registerObject(sourceName, dbSource)
-
-    Dim connection As Object
-    connection = dbSource.getIsolatedConnection(jdbcUser, jdbcPassword)
-
-    Dim statement As Object
-    statement = connection.createStatement()
-
-    statement.executeUpdate("drop table if exists tst_table1")
-    statement.executeUpdate("drop table if exists tst_table2")
-    statement.executeUpdate("create table tst_table1 (id1 int)")
-    statement.executeUpdate("create table tst_table2 (id2 int)")
-
-    Dim defContainer As Object
-    defContainer = dbSource.getQueryDefinitions()
-
-    Dim newQuery As Object
-    newQuery = createUnoService("com.sun.star.sdb.QueryDefinition")
-    newQuery.Command = "select * from tst_table1, tst_table2 where " + _
-                       "tst_table1.id1=tst_table2.id2"
-
-    defContainer.insertByName("Query1", newQuery)
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    thRunner.initialize(Array("ExecuteDialog", "com.sun.star.sdb.DatasourceAdministrationDialog"))
-    wait(3000)
-
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    Dim pageTabList As Object
-    pageTabList = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB_LIST)
-
-    pageTabList.selectAccessibleChild(3)
-    wait(500)
-
-    Dim editQueryButton As Object
-    editQueryButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Edit Query")
-
-    cancelButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Cancel")
-
-    editQueryButton.doAccessibleAction(0)
-    wait(1000)
-
-    oWin = tk.getActiveTopWindow()
-    queryWindow = oWin
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.VIEW_PORT)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(queryWindow)
-    if NOT isNull(cancelButton) then
-        cancelButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/script.xlb
deleted file mode 100644
index 8617aa03de8b..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/JoinViewAccessibility/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_JoinViewAccessibility" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_JoinViewAccessibility"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/dbaccess_OCommandDefinition.xba b/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/dbaccess_OCommandDefinition.xba
deleted file mode 100644
index 5635743679e1..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/dbaccess_OCommandDefinition.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_OCommandDefinition" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.OCommandDefinition
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdb.QueryDefinition")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/script.xlb
deleted file mode 100644
index c4d19d9c021c..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OCommandDefinition/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_OCommandDefinition" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_OCommandDefinition"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/dbaccess_ODatabaseContext.xba b/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/dbaccess_ODatabaseContext.xba
deleted file mode 100644
index c90fc39d63ee..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/dbaccess_ODatabaseContext.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ODatabaseContext" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.uno.XNamingService:
-  Global oObjectToRegister As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ODatabaseContext
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.sdb.DatabaseContext")
-    oObjectToRegister = createUNOService("com.sun.star.sdb.DataSource")
-    oObjectToRegister.URL = "sdbc:dbase:" + utils.getTempFileURL("")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/script.xlb
deleted file mode 100644
index f1a5f0302285..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseContext/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ODatabaseContext" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ODatabaseContext"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/dbaccess_ODatabaseSource.xba b/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/dbaccess_ODatabaseSource.xba
deleted file mode 100644
index b3fad24fc39f..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/dbaccess_ODatabaseSource.xba
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ODatabaseSource" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for object disposing (the name of the source)
-Global sourceName as String 
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ODatabaseSource
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim tmpDir as String, dbSrc as Object, dbContext as Object
-
-    sourceName = "BasicODatabaseSource"
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    dbContext =createUnoService("com.sun.star.sdb.DatabaseContext")
-    tmpDir = utils.getTempFileURL("")
-
-    Out.Log("Creating datasource in " + tmpDir)
-
-    dbSrc = createUnoService("com.sun.star.sdb.DataSource")
-    dbSrc.URL = "sdbc:dbase:" + tmpDir
-
-    if dbContext.hasByName(sourceName) then
-        dbContext.revokeObject(sourceName)
-    endif
-
-    dbContext.registerObject(sourceName, dbSrc)
-
-    oObj = dbSrc 
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    Dim dbContext as Object 
-    
-    dbContext =createUnoService("com.sun.star.sdb.DatabaseContext")
-    if dbContext.hasByName(sourceName) then
-        dbContext.revokeObject(sourceName)
-    endif
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/script.xlb
deleted file mode 100644
index 6e67dd8ee35a..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatabaseSource/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ODatabaseSource" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ODatabaseSource"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/dbaccess_ODatasourceAdministrationDialog.xba b/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/dbaccess_ODatasourceAdministrationDialog.xba
deleted file mode 100644
index 7260d239d673..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/dbaccess_ODatasourceAdministrationDialog.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ODatasourceAdministrationDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' relation for com.sun.star.lang.XInitialization
-Global aInitArgs As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ODatasourceAdministrationDialog
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdb.DatasourceAdministrationDialog")
-
-    ' setting relation for com.sun.star.lang.XInitialization
-    Dim arg As new com.sun.star.beans.PropertyValue
-    arg.Name = "Title"
-    arg.Value = "ODatasourceAdministrationDialog"
-    
-    aInitArgs = Array(arg)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/script.xlb
deleted file mode 100644
index b70e65c3d620..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceAdministrationDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ODatasourceAdministrationDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ODatasourceAdministrationDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/dbaccess_ODatasourceBrowser.xba b/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/dbaccess_ODatasourceBrowser.xba
deleted file mode 100644
index db96d88a4c2d..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/dbaccess_ODatasourceBrowser.xba
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ODatasourceBrowser" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' variable for XComponent
-Global oComponentInstance As Object
-
-' variable for XFormController
-Global otherWin As Object
-
-' variable for XDispatchProvider
-Global dispatchUrl As String
-
-' variable for frame.XController
-Global oFrameToAttach As Object 
-Global oModelToAttach As Object 
-Global bHasNoViewData As Boolean
-Global oObjToSuspend As Object  
-Global bHasNoModel As Boolean
-
-' variables for awt.XTabController
-Global oXTabControllerModel as Object    
-Global oXTabControllerContainer as Object
-
-' variable for lang.XInitialization
-Global aInitArgs As Variant 
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ODatasourceBrowser
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim cntrlr As Object
-    Dim frame1 As Object, frame2 As Object
-    Dim url As new com.sun.star.util.URL
-    Dim dispatcher As Object
-    Dim oShape As Object, oDrawPage As Object, oModel As Object
-    Dim oController As Object, oCtrll As Object
-    Dim params(2) as new com.sun.star.beans.PropertyValue
-    Dim list1 as object, ctrl as object
-
-'    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc = StarDesktop.loadComponentFromUrl("private:factory/swriter", "_blank",0 , args())
-
-    wait(500)
-
-    cntrlr = oDoc.getCurrentController()
-    frame1 = StarDesktop.getCurrentFrame()
-    url.Complete = ".component:DB/DataSourceBrowser"
-    dispatcher = frame1.queryDispatch(url, "_beamer", 12)
-    dispatcher.dispatch(url, DimArray())
-    
-    frame2 = frame1.findFrame("_beamer", 4)
-    frame2.setName("ODatasourceBrowser")
-    
-    oObj = frame2.getController()
-
-    ' now initialize the browser to make him displaying a table in its gtrid.
-    ' This is required for activating of this control
-    params(0).Name = "DataSourceName"
-    params(0).Value = "Bibliography"
-    params(1).Name = "CommandType"
-    params(1).Value = com.sun.star.sdb.CommandType.TABLE
-    params(2).Name = "Command"
-    params(2).Value = "biblio"
-    
-    oObj.initialize(params())
-    ' waiting while data loading ...
-    wait(2000)
-
-'setting variable for XComponent
-    oComponentInstance = oObj
-
-'setting variable for XDispatchProvider
-    dispatchUrl = ".uno:DataSourceBrowser/FormLetter"
-
-'setting variable for XController
-    oFrameToAttach = frame1
-    oModelToAttach = oDoc
-    bHasNoViewData = true
-    oObjToSuspend = oObj
-    bHasNoModel = true
-
-'setting variables for awt.XTabController and for XFormController
-    oShape = toolkittools.createUNOControlShape("CommandButton", "UnoControlButton")
-    toolkittools.addShape(oShape)
-    oDrawPage = oDoc.getDrawPage()
-
-    oModel = oShape.getControl()
-    oController = oDoc.getCurrentController()
-    otherWin = oController.getControl(oModel)
-    oXTabControllerContainer = otherWin.getContext()
-    oXTabControllerModel = oDrawPage.getForms().getByIndex(0)
-
-' setting variable for lang.XInitialization
-    aInitArgs = params()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/script.xlb
deleted file mode 100644
index 1a70f0bd7f8f..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ODatasourceBrowser/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ODatasourceBrowser" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ODatasourceBrowser"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/dbaccess_OInteractionHandler.xba b/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/dbaccess_OInteractionHandler.xba
deleted file mode 100644
index f9d73c83c5ac..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/dbaccess_OInteractionHandler.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_OInteractionHandler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.OInteractionHandler
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdb.InteractionHandler")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/script.xlb
deleted file mode 100644
index 019f9dc617cc..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OInteractionHandler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_OInteractionHandler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_OInteractionHandler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ORowSet/dbaccess_ORowSet.xba b/qadevOOo/tests/basic/mod/dbaccess/ORowSet/dbaccess_ORowSet.xba
deleted file mode 100644
index 60ef6a794bce..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ORowSet/dbaccess_ORowSet.xba
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_ORowSet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.sdbc.XColumnLocate:
-  Global cExistantColumnName As String
-
-' Required for com.sun.star.sdbc.XResultSet
-  Global cXResultSetFirstRecord as String
-  Global cXResultSetLastRecord as String
-  Global cXResultSetRecord1 as String
-  Global cXResultSetRecord2 as String
-  Global cXResultSet2BeforeLastRecord as String
-
-' Required for com.sun.star.sdbc.XParameters
-  Global paramTypes as Variant
-
-' Required for com.sun.star.sdbc.XRow and com.sun.star.sdbc.XRowUpdate
-  Global rowTypes as Variant
-  Global rowTypesCol as Variant
-
-' Required for com.sun.star.sdbc.XResultSetUpdate
-  Global textColumn As String
-
-  Global oConnection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.ORowSet
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oRowSet As Object, facc As Object, dbSource As Object
-    Dim srcFile As String, dstFile As String, dbSrcURL As String
-
-    ' Copying DB file to temp location
-    srcFile = utils.Path2URL(cTestDocsDir) + "TestDB/testDB.dbf"
-    dstFile = utils.getTempFileURL("TestDB.dbf")
-    dbSrcURL = "sdbc:dbase:" + utils.StrReplace(dstFile, "/testDB.dbf", "")
-
-    facc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    if not facc.exists(srcFile) then 
-        Out.log("could not find source of testDB.dbf: " + srcFile)
-    end if
-    if (facc.exists(dstFile)) then facc.kill(dstFile)
-    facc.copy(srcFile, dstFile)
-
-    dbtools.RegisterDataSource("DBTest", dbSrcURL)
-
-    oRowSet = createUnoService("com.sun.star.sdb.RowSet")
-
-    oRowSet.DataSourceName = "DBTest"
-    oRowSet.Command = "TestDB"
-    oRowSet.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oRowSet.execute()
-
-    wait(200)
-
-    oConnection = oRowSet.ActiveConnection
-
-    if NOT isObject(oConnection) then
-        Out.Log("oConnection wasn't retrieved properly !!!")
-    end if
-
-    oRowSet.first()
-
-    Out.Log("The first record has: '" + oRowSet.getString(1) + "'")
-
-    oObj = oRowSet
-
-    oComponentInstance = createUnoService("com.sun.star.sdb.RowSet")
-    cExistantColumnName = "_TEXT"
-    cXResultSetFirstRecord = "text1"
-    cXResultSetLastRecord = "text3"
-    cXResultSetRecord1 = "text1"
-    cXResultSetRecord2 = "text2"
-    cXResultSet2BeforeLastRecord = "text2"
-
-    paramTypes = DimArray()
-
-'    paramTypes = Array("boolean", "byte", "short", "int", "long", "float", "double", "string", _
-'        "bytes", "date", "time", "timestamp", "binarystream", "characterstream", "object", _
-'        "ref", "blob", "clob", "array")
-
-
-'    Dim dat As new com.sun.star.util.Date
-'    Dim tim As new com.sun.star.util.Time
-'    Dim datTim As new com.sun.star.util.DateTime
-
-'    dat.Year = 2001
-'    dat.Month = 1
-'    dat.Day = 1
-
-'    tim.Hours = 1
-'    tim.Minutes = 1
-'    tim.Seconds = 1
-
-'    paramVal = Array(true, 11, 11, 111, NULL, 1.1, 11.11, "text1", NULL, dat, tim, NULL, NULL, NULL, NULL,
-'        NULL, NULL, NULL, NULL)
-
-    ' for XRow and XRowUpdate
-    rowTypes = Array("string", "int", "long", "double", "float", "date", "datetm", "boolean")
-    rowTypesCol = Array(1, 2, 3, 4, 5, 6, 7, 9)
-'    rowTypes = Array("boolean", "byte", "short", "int", "long", "float", "double", "string", _
-'        "bytes", "date", "time", "timestamp", "binarystream", "characterstream", "object", _
-'        "numericobject")
-
-
-
-' Required for com.sun.star.sdbc.XResultSetUpdate
-    textColumn = "_TEXT"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error Goto ErrHndl
-    Out.Log("Closing DB connection ...")
-    oConnection.close()
-
-    Out.Log("Revoking 'DBTest' datasource ...")
-    dbtools.RevokeDB("DBTest")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/ORowSet/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/ORowSet/script.xlb
deleted file mode 100644
index 74871382da1c..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/ORowSet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_ORowSet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_ORowSet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/dbaccess_OSQLMessageDialog.xba b/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/dbaccess_OSQLMessageDialog.xba
deleted file mode 100644
index 6a3b67c51849..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/dbaccess_OSQLMessageDialog.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_OSQLMessageDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.OSQLMessageDialog
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdb.ErrorMessageDialog")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/script.xlb
deleted file mode 100644
index d4d9ae335fc4..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/OSQLMessageDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_OSQLMessageDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_OSQLMessageDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/dbaccess_SbaXGridControl.xba b/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/dbaccess_SbaXGridControl.xba
deleted file mode 100644
index 1ba1f7cac92d..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/dbaccess_SbaXGridControl.xba
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_SbaXGridControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for view.XSelectionSupplier
-Global SelectableObj1 as Variant
-Global SelectableObj2 as Variant
-    
-' Required for awt.XControl
-Global oModel As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-
-' Required for awt.XWindow
-Global oXWindow As Object
-Global oCtrlShape As Variant
-
-' Required for awt.XView
-Global oGraphics As Object
-
-' Required for frame.XDispatch
-Global dispatchURL As String
-
-' Required for XContainer
-Global oElementToInsert As Object
-Global oContainer As Object ' in case if the 
- ' component tested doesn't support XNameContainer
-
-' Required for XComponent
-Global oComponentInstance As Object 'it will be disposed
-
-' Required for form.XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.SbaXGridControl
-'*************************************************************************
-    Dim cntrlShape as Object, grid as Object
-    Dim size as new com.sun.star.awt.Size
-    Dim pos as new com.sun.star.awt.Point
-    Dim drawPage as Object, aForm as Object
-    Dim aColumn1 as Object, aColumn2 as Object
-    Dim theAccess as Object
-    Dim sel1(0) as Long, sel2(0) as Long
-    Dim device as Object
-    
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    
-    ' creating ControlShape with GridControl inside it
-    cntrlShape = oDoc.createInstance("com.sun.star.drawing.ControlShape")
-    grid = oDoc.createInstance("com.sun.star.form.component.GridControl")
-    grid.DefaultControl = "com.sun.star.form.control.InteractionGridControl"
-    pos.X = 15000
-    pos.Y = 10000
-    size.Width = 4500
-    size.Height = 3000
-    cntrlShape.setPosition(pos)
-    cntrlShape.setSize(size)
-    cntrlShape.setControl(grid)
-    
-    ' adding the shape with grid into the document
-    drawPage = oDoc.getDrawPage()
-    drawPage.add(cntrlShape)
-    
-    ' binding the form which contains a grid model to
-    ' the Bibliography database
-    aForm = drawPage.getForms().getByName("Standard")
-    aForm.DataSourceName = "Bibliography"
-    aForm.Command = "biblio"
-    aForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-    
-    ' creating and inserting some columns
-    aColumn1 = grid.createColumn("TextField")
-    aColumn1.DataField = "Identifier"
-    aColumn1.Label = "Identifier"
-    grid.insertByName("First", aColumn1)
-    aColumn2 = grid.createColumn("TextField")
-    aColumn2.DataField = "Address"
-    aColumn2.Label = "Address"
-    grid.insertByName("Second", aColumn2)
-    
-    ' Getting the controller of the Grid
-    theAccess = oDoc.getCurrentController()
-    oObj = theAccess.getControl(grid)
-
-    ' setting variable for XSelectionSupplier
-    sel1(0) = 2
-    sel2(0) = 5
-    SelectableObj1 = sel1()
-    SelectableObj2 = sel2()
-
-    ' setting variable for XControl
-    oContext = oDoc
-    oModel = grid
-    oWinpeer = oObj.getPeer()
-    oToolkit = oWinpeer.getToolkit()
-
-    ' setting variable for XWindow
-    oXWindow = theAccess.getControl(cntrlShape.getControl())
-    oCtrlShape = cntrlShape
-
-    ' setting variable for XView
-    device = oToolkit.createScreenCompatibleDevice(200, 200)
-    oGraphics = device.createGraphics()
-
-    'setting variable for XDispatch
-    dispatchURL = ".uno:FormSlots/moveToNext"
-    
-    'setting variables for XContainer
-    oElementToInsert = grid.createColumn("TextField")
-    oElementToInsert.DataField = "Author"
-    oElementToInsert.Label = "Author"
-    oContainer = grid
-
-    'setting variable for XComponent
-    cntrlShape = oDoc.createInstance("com.sun.star.drawing.ControlShape")
-    grid = oDoc.createInstance("com.sun.star.form.component.GridControl")
-    grid.DefaultControl = "com.sun.star.form.control.InteractionGridControl"
-    cntrlShape.setControl(grid)
-    drawPage.add(cntrlShape)
-
-
-   'setting variable for XUpdateBroadcaster
-    bCustomUpdate = True
-
-    oComponentInstance = theAccess.getControl(grid)
-
-    ' Switching to non-design mode
-    switchDesignMode(oDoc)
-    
-    wait(200)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub UpdateComponent()
-    oObj.commit
-End Sub
-
-Sub switchDesignMode(xDoc as Object)
-On Error Goto ErrHndl
-
-        Dim frame as Variant, disp as Variant, transf as Object
-        Dim URL as new com.sun.star.util.URL
-        Dim noProps()
-        Dim res as Boolean
-        
-        frame = xDoc.getCurrentController().getFrame()
-        URL.Complete = ".uno:SwitchControlDesignMode"
-        transf = createUnoService("com.sun.star.util.URLTransformer")
-        res = transf.parseStrict(URL)
-        
-        out.log("URL parsed :" + res)
-        
-        disp = frame.queryDispatch(URL, "", com.sun.star.frame.FrameSearchFlag.SELF _
-                OR com.sun.star.frame.FrameSearchFlag.CHILDREN)
-
-        out.log("disp get.")
-
-        disp.dispatch(URL, noProps())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Sub prepareCommit()
-    Out.Log("prepareCommit() called")
-    Out.Log("can be checked only interactively")
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-    checkCommit() = True
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/script.xlb
deleted file mode 100644
index b4f0a13080d7..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/SbaXGridControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_SbaXGridControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_SbaXGridControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/dbaccess_TableWindowAccessibility.xba b/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/dbaccess_TableWindowAccessibility.xba
deleted file mode 100644
index b1db74c7a5cf..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/dbaccess_TableWindowAccessibility.xba
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbaccess_TableWindowAccessibility" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cancelButton As Object
-Global queryWindow As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbaccess.TableWindowAccessibility
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    Dim dbSource As Object
-    dbSource = createUnoService("com.sun.star.sdb.DataSource")
-
-    Dim info(2) As new com.sun.star.beans.PropertyValue
-    info(0).Name = "JavaDriverClass"
-    info(0).Value = "org.gjt.mm.mysql.Driver"
-    info(1).Name = "user"
-    info(1).Value = jdbcUser
-    info(2).Name = "password"
-    info(2).Value = jdbcPassword
-    dbSource.info = info()
-    dbSource.URL = jdbcUrl
-
-    Dim dbContext As Object
-    dbContext = createUnoService("com.sun.star.sdb.DatabaseContext")
-
-    Dim sourceName As String
-    sourceName = "AAADBSource for dbu-accessibility"
-
-    if dbContext.hasByName(sourceName) then
-        dbContext.revokeObject(sourceName)
-    endif
-
-    dbContext.registerObject(sourceName, dbSource)
-
-    Dim connection As Object
-    connection = dbSource.getIsolatedConnection(jdbcUser, jdbcPassword)
-
-    Dim statement As Object
-    statement = connection.createStatement()
-
-    statement.executeUpdate("drop table if exists tst_table1")
-    statement.executeUpdate("drop table if exists tst_table2")
-    statement.executeUpdate("create table tst_table1 (id1 int)")
-    statement.executeUpdate("create table tst_table2 (id2 int)")
-
-    Dim defContainer As Object
-    defContainer = dbSource.getQueryDefinitions()
-
-    Dim newQuery As Object
-    newQuery = createUnoService("com.sun.star.sdb.QueryDefinition")
-    newQuery.Command = "select * from tst_table1, tst_table2 where " + _
-                       "tst_table1.id1=tst_table2.id2"
-
-    defContainer.insertByName("Query1", newQuery)
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    thRunner.initialize(Array("ExecuteDialog", "com.sun.star.sdb.DatasourceAdministrationDialog"))
-    wait(3000)
-
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    Dim pageTabList As Object
-    pageTabList = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB_LIST)
-
-    pageTabList.selectAccessibleChild(3)
-    wait(500)
-
-    Dim editQueryButton As Object
-    editQueryButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Edit Query")
-
-    cancelButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Cancel")
-
-    editQueryButton.doAccessibleAction(0)
-    wait(1000)
-
-    oWin = tk.getActiveTopWindow()
-    queryWindow = oWin
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(queryWindow)
-    if NOT isNull(cancelButton) then
-        cancelButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/script.xlb b/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/script.xlb
deleted file mode 100644
index cb2d0914c866..000000000000
--- a/qadevOOo/tests/basic/mod/dbaccess/TableWindowAccessibility/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbaccess_TableWindowAccessibility" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbaccess_TableWindowAccessibility"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/dbpool_OConnectionPool.xba b/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/dbpool_OConnectionPool.xba
deleted file mode 100644
index c50dfb3c9db8..000000000000
--- a/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/dbpool_OConnectionPool.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dbpool_OConnectionPool" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dbpool.OConnectionPool
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sdbc.ConnectionPool")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/script.xlb b/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/script.xlb
deleted file mode 100644
index e13dd569d793..000000000000
--- a/qadevOOo/tests/basic/mod/dbpool/OConnectionPool/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dbpool_OConnectionPool" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dbpool_OConnectionPool"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/defreg/NestedRegistry/defreg_NestedRegistry.xba b/qadevOOo/tests/basic/mod/defreg/NestedRegistry/defreg_NestedRegistry.xba
deleted file mode 100644
index dfc9864cc068..000000000000
--- a/qadevOOo/tests/basic/mod/defreg/NestedRegistry/defreg_NestedRegistry.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="defreg_NestedRegistry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XInitialization
-Global aInitArgs As Variant
-
-Global oReg1 As Object
-Global oReg2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' defreg.NestedRegistry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim cURL1 As String
-    Dim cURL2 As String
-
-    oObj = createUnoService("com.sun.star.registry.NestedRegistry")
-
-    oReg1 = createUnoService("com.sun.star.registry.SimpleRegistry")
-    oReg2 = createUnoService("com.sun.star.registry.SimpleRegistry")
-    cURL1 = utils.getTempFileURL("BAS_forNestedRegistry1.rdb")
-    cURL2 = utils.getTempFileURL("BAS_forNestedRegistry2.rdb")
-
-    if FileExists(cURL1) then
-        kill(cURL1)
-    end if
-
-    if FileExists(cURL2) then
-        kill(cURL2)
-    end if
-
-    oReg1.open(cURL1, true, true)
-    oReg2.open(cURL2, false, true)
-
-    Dim aArgs(1) As Object
-    aArgs(0) = oReg1
-    aArgs(1) = oReg2
-
-    aInitArgs = aArgs()
-    
-    oObj.initialize(aInitArgs())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oReg1.close()
-    oReg2.close()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/defreg/NestedRegistry/script.xlb b/qadevOOo/tests/basic/mod/defreg/NestedRegistry/script.xlb
deleted file mode 100644
index de1c9e0f9cfb..000000000000
--- a/qadevOOo/tests/basic/mod/defreg/NestedRegistry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="defreg_NestedRegistry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="defreg_NestedRegistry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dtrans/generic/dtrans_generic.xba b/qadevOOo/tests/basic/mod/dtrans/generic/dtrans_generic.xba
deleted file mode 100644
index 48d73cc7a8fa..000000000000
--- a/qadevOOo/tests/basic/mod/dtrans/generic/dtrans_generic.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dtrans_generic" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dtrans.generic
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.datatransfer.clipboard.GenericClipboard")
-    if ( NOT hasUnoInterfaces(oObj,"com.sun.star.uno.XInterface")) then 
-       Out.log("[ERROR!] System type is *nix, unable to create object...")
-    endif
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dtrans/generic/script.xlb b/qadevOOo/tests/basic/mod/dtrans/generic/script.xlb
deleted file mode 100644
index d843008a52d5..000000000000
--- a/qadevOOo/tests/basic/mod/dtrans/generic/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dtrans_generic" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dtrans_generic"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/dynamicloader_uno_Dynamic.xba b/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/dynamicloader_uno_Dynamic.xba
deleted file mode 100644
index 6e442178a2e4..000000000000
--- a/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/dynamicloader_uno_Dynamic.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dynamicloader_uno_Dynamic" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-'!!! Doesnt currently work as service can't be instantiated.
-
-'*************************************************************************
-
-
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dynamicloader.Dynamic
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.loader.Dynamic")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/script.xlb b/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/script.xlb
deleted file mode 100644
index f5273b902284..000000000000
--- a/qadevOOo/tests/basic/mod/dynamicloader.uno/Dynamic/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dynamicloader_uno_Dynamic" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dynamicloader_uno_Dynamic"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/dynamicloader_Dynamic.xba b/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/dynamicloader_Dynamic.xba
deleted file mode 100644
index 077d98e6dfc9..000000000000
--- a/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/dynamicloader_Dynamic.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="dynamicloader_Dynamic" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-'!!! Doesnt currently work as service can't be instantiated.
-
-'*************************************************************************
-
-
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' dynamicloader.Dynamic
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.loader.Dynamic")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/script.xlb b/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/script.xlb
deleted file mode 100644
index 2543c346ec17..000000000000
--- a/qadevOOo/tests/basic/mod/dynamicloader/Dynamic/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="dynamicloader_Dynamic" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="dynamicloader_Dynamic"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/file/calc/ODriver/file_calc_ODriver.xba b/qadevOOo/tests/basic/mod/file/calc/ODriver/file_calc_ODriver.xba
deleted file mode 100644
index 8f291cf47a0f..000000000000
--- a/qadevOOo/tests/basic/mod/file/calc/ODriver/file_calc_ODriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="file_calc_ODriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' file.calc.ODriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.calc.ODriver")
-
-    URL = calcUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/file/calc/ODriver/script.xlb b/qadevOOo/tests/basic/mod/file/calc/ODriver/script.xlb
deleted file mode 100644
index 0afe2c82b6d1..000000000000
--- a/qadevOOo/tests/basic/mod/file/calc/ODriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="file_calc_ODriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="file_calc_ODriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/file/dbase/ODriver/file_dbase_ODriver.xba b/qadevOOo/tests/basic/mod/file/dbase/ODriver/file_dbase_ODriver.xba
deleted file mode 100644
index 466c820fabe4..000000000000
--- a/qadevOOo/tests/basic/mod/file/dbase/ODriver/file_dbase_ODriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="file_dbase_ODriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' file.dbase.ODriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.dbase.ODriver")
-
-    URL = dbaseUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/file/dbase/ODriver/script.xlb b/qadevOOo/tests/basic/mod/file/dbase/ODriver/script.xlb
deleted file mode 100644
index 19753bcaac05..000000000000
--- a/qadevOOo/tests/basic/mod/file/dbase/ODriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="file_dbase_ODriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="file_dbase_ODriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/file/flat/ODriver/file_flat_ODriver.xba b/qadevOOo/tests/basic/mod/file/flat/ODriver/file_flat_ODriver.xba
deleted file mode 100644
index e055e9024316..000000000000
--- a/qadevOOo/tests/basic/mod/file/flat/ODriver/file_flat_ODriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="file_flat_ODriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' file.flat.ODriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.flat.ODriver")
-
-    URL = flatUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/file/flat/ODriver/script.xlb b/qadevOOo/tests/basic/mod/file/flat/ODriver/script.xlb
deleted file mode 100644
index 5022f4ac0e9e..000000000000
--- a/qadevOOo/tests/basic/mod/file/flat/ODriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="file_flat_ODriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="file_flat_ODriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/fileacc_SimpleFileAccess.xba b/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/fileacc_SimpleFileAccess.xba
deleted file mode 100644
index fe9a7855fd36..000000000000
--- a/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/fileacc_SimpleFileAccess.xba
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fileacc_SimpleFileAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fileacc.SimpleFileAccess
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.ucb.SimpleFileAccess")
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/script.xlb b/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/script.xlb
deleted file mode 100644
index 09d867dc9f66..000000000000
--- a/qadevOOo/tests/basic/mod/fileacc/SimpleFileAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fileacc_SimpleFileAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fileacc_SimpleFileAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fop/FolderPicker/fop_FolderPicker.xba b/qadevOOo/tests/basic/mod/fop/FolderPicker/fop_FolderPicker.xba
deleted file mode 100644
index 41a08c3c44a8..000000000000
--- a/qadevOOo/tests/basic/mod/fop/FolderPicker/fop_FolderPicker.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fop_FolderPicker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fop.FolderPicker
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ui.dialogs.FolderPicker")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fop/FolderPicker/script.xlb b/qadevOOo/tests/basic/mod/fop/FolderPicker/script.xlb
deleted file mode 100644
index d8eceef973c1..000000000000
--- a/qadevOOo/tests/basic/mod/fop/FolderPicker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fop_FolderPicker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fop_FolderPicker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OButtonControl/forms_OButtonControl.xba b/qadevOOo/tests/basic/mod/forms/OButtonControl/forms_OButtonControl.xba
deleted file mode 100644
index b571308e576e..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OButtonControl/forms_OButtonControl.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OButtonControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OButtonControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Out.Log("try to insert some shapes...")
-    oShape1 = toolkittools.addControlToDefaultForm("CommandButton", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("CommandButton", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-'Sub DisposeObj()
-'    'Re-open this document to close it successfully
-'    oDoc2 = utils.createDocument("swriter", cObjectName + "2")
-'    oDoc2.Dispose()
-'End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OButtonControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OButtonControl/script.xlb
deleted file mode 100644
index c0f46b692949..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OButtonControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OButtonControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OButtonControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OButtonModel/forms_OButtonModel.xba b/qadevOOo/tests/basic/mod/forms/OButtonModel/forms_OButtonModel.xba
deleted file mode 100644
index 89a96c9e2467..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OButtonModel/forms_OButtonModel.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oComponentInstance As Object
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim ctrlShape As Object
-    
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    ctrlShape = toolkittools.addControlToDefaultForm("CommandButton", 1000, 1000, 2000, 1000)
-    oObj = ctrlShape.getControl()
-    ctrlShape = toolkittools.addControlToDefaultForm("CommandButton", 1000, 3000, 2000, 1000)
-    oComponentInstance = ctrlShape.getControl()
-    ctrlShape = toolkittools.addControlToDefaultForm("CommandButton", 1000, 5000, 2000, 1000)
-    oPersistInstance = ctrlShape.getControl()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OButtonModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OButtonModel/script.xlb
deleted file mode 100644
index 1e6a3faf31f0..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/forms_OCheckBoxControl.xba b/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/forms_OCheckBoxControl.xba
deleted file mode 100644
index 9bb51ee2f615..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/forms_OCheckBoxControl.xba
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OCheckBoxControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-' Required for awt.XItemListener
-  Global bIL_itemStateChanged As Boolean
-  Global oEventItemListener As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OCheckBoxControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-    Dim oIListener As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-'    oDoc2 = utils.createDocument("swriter", cObjectName + "2")
-
-    oShape1 = toolkittools.addControlToDefaultForm("CheckBox", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("CheckBox", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-    oObj.addItemListener(oIListener)    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub IL_itemStateChanged(rEvent As Object)
-    bIL_itemStateChanged = True
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    oEventItemListener = rEvent
-End Sub
-
-
-'Sub DisposeObj()
-'    'Re-open this document to close it successfully
-'    oDoc2 = utils.createDocument("swriter", cObjectName + "2")
-'    oDoc2.Dispose()
-'End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/script.xlb
deleted file mode 100644
index bd422e9fb66e..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCheckBoxControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OCheckBoxControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OCheckBoxControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/forms_OCheckBoxModel.xba b/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/forms_OCheckBoxModel.xba
deleted file mode 100644
index 85c12933d4bb..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/forms_OCheckBoxModel.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OCheckBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oComponentInstance As Object
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OCheckBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oDrawPage as Object
-    Dim oCntrlShape as Object
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oCntrlShape = toolkittools.addControlToDefaultForm("CheckBox", 1000, 1000, 2000, 1000)
-    oObj = oCntrlShape.getControl()
-    oCntrlShape = toolkittools.addControlToDefaultForm("CheckBox", 1000, 3000, 2000, 1000)
-    oComponentInstance = oCntrlShape.getControl()
-    oCntrlShape = toolkittools.addControlToDefaultForm("CheckBox", 1000, 5000, 2000, 1000)
-    oPersistInstance = oCntrlShape.getControl()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/script.xlb
deleted file mode 100644
index b81cae2daec5..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCheckBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OCheckBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OCheckBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OComboBoxControl/forms_OComboBoxControl.xba b/qadevOOo/tests/basic/mod/forms/OComboBoxControl/forms_OComboBoxControl.xba
deleted file mode 100644
index bd3436e0c3d7..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OComboBoxControl/forms_OComboBoxControl.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OComboBoxControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OComboBoxControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-'    oDoc2 = utils.createDocument("swriter", cObjectName + "2")
-
-    oShape1 = toolkittools.addControlToDefaultForm("ComboBox", 1000, 1000, 3000, 1500)
-    oShape2 = toolkittools.addControlToDefaultForm("ComboBox", 1000, 3000, 3000, 1500)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 3000, 1500)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OComboBoxControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OComboBoxControl/script.xlb
deleted file mode 100644
index 10d3c4651c86..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OComboBoxControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OComboBoxControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OComboBoxControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OComboBoxModel/forms_OComboBoxModel.xba b/qadevOOo/tests/basic/mod/forms/OComboBoxModel/forms_OComboBoxModel.xba
deleted file mode 100644
index 973aa92f5e73..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OComboBoxModel/forms_OComboBoxModel.xba
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OComboBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-' for relation function checkCommit
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OComboBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCntrlShape As Object, oDrawPage As Object
-
-    bOK = true
-    ' --- create a document if needed
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oCntrlShape = toolkittools.addControlToDefaultForm("ComboBox", 1000, 1000, 2000, 1000)
-    oObj = oCntrlShape.getControl()
-    oCntrlShape = toolkittools.addControlToDefaultForm("ComboBox", 1000, 3000, 2000, 1000)
-    oComponentInstance = oCntrlShape.getControl()
-    oCntrlShape = toolkittools.addControlToDefaultForm("ComboBox", 1000, 5000, 2000, 1000)
-    oPersistInstance = oCntrlShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Author"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global sChangedText As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    sChangedText = "_" + oObj.Text
-    oObj.Text = sChangedText
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowText As Variant
-    
-    rowText = oForm.getString(oForm.findColumn("Author"))
-    checkCommit() = (rowText = sChangedText)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Text = "_" + oObj.Text
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OComboBoxModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OComboBoxModel/script.xlb
deleted file mode 100644
index 8f59ecd5288a..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OComboBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OComboBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OComboBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OCurrencyControl/forms_OCurrencyControl.xba b/qadevOOo/tests/basic/mod/forms/OCurrencyControl/forms_OCurrencyControl.xba
deleted file mode 100644
index c0594708a070..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCurrencyControl/forms_OCurrencyControl.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OCurrencyControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OCurrencyControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("CurrencyField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("CurrencyField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OCurrencyControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OCurrencyControl/script.xlb
deleted file mode 100644
index a06c264fc157..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCurrencyControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OCurrencyControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OCurrencyControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OCurrencyModel/forms_OCurrencyModel.xba b/qadevOOo/tests/basic/mod/forms/OCurrencyModel/forms_OCurrencyModel.xba
deleted file mode 100644
index e4c47dbcbcd2..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCurrencyModel/forms_OCurrencyModel.xba
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OCurrencyModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OCurrencyModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-    
-    bOK = true
-' --- create a document if needed
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("CurrencyField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("CurrencyField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("CurrencyField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-    
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Pages"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global aChangedValue As Double
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    if NOT (isNull(oObj.Value) OR isEmpty(oObj.Value)) then
-        aChangedValue = oObj.Value + 1
-    else
-        aChangedValue = 1
-    end if
-    oObj.Value = aChangedValue
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowValue As Variant
-    
-    rowValue = oForm.getDouble(oForm.findColumn("Pages"))
-    Out.Log("Value was set to " + aChangedValue )
-    Out.Log("the value in current row is " + rowValue)
-    checkCommit() = (rowValue = aChangedValue)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Value = oObj.Value + 1
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OCurrencyModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OCurrencyModel/script.xlb
deleted file mode 100644
index 2ad36c4a5a60..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OCurrencyModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OCurrencyModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OCurrencyModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ODatabaseForm/forms_ODatabaseForm.xba b/qadevOOo/tests/basic/mod/forms/ODatabaseForm/forms_ODatabaseForm.xba
deleted file mode 100644
index c1f2102b06f5..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODatabaseForm/forms_ODatabaseForm.xba
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ODatabaseForm" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XPersistObject
-  Global oPersistInstance As Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-  ' Requiered for  com.sun.star.container.XNameContainer
-  Global oInstance As Object 'instance to insert
-
-  ' Required for com.sun.star.sdbc.XResultSet
-  Global cXResultSetFirstRecord as String
-  Global cXResultSetLastRecord as String
-  Global cXResultSetRecord1 as String
-  Global cXResultSetRecord2 as String
-  Global cXResultSet2BeforeLastRecord as String
-
-' Required for  com.sun.star.sdbc.XColumnLocate:
-  Global cExistantColumnName As String
-
-  ' Requiered for  com.sun.star.container.XNameReplace
-  Global cNameToReplace As String 'name of instance to be replased
-  Global oReplaceInstance As Object 'instance, that will be inserted
-                                    'instead old one
-
-  Global oIdxReplaceInstance As Object
-
-' Required for com.sun.star.sdbc.XParameters
-  Global paramTypes as Variant
-
-' Required for com.sun.star.sdbc.XRow and com.sun.star.sdbc.XRowUpdate
-  Global rowTypes as Variant
-  Global rowTypesCol as Variant
-
-' Required for com.sun.star.sdbc.XResultSetUpdate
-  Global textColumn As String
-
-' Required for com.sun.star.awt.XTabControllerModel
-  Global XTabControlModel1 As Object
-  Global XTabControlModel2 As Object
-
-  Global oConnection As Object
-  
-' Required for com.sun.star.container.XContainer
-  Global oElementToInsert As Object
-  Global oContainer As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ODatabaseForm
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oRowSet As Object, facc As Object, dbSource As Object
-    Dim srcFile As String, dstFile As String, dbSrcURL As String
-    Dim oDrawPage As Object, oForms As Object, oForm As Object
-    Dim oShape1 As Object, oShape2 As Object
-
-    bOK = true
-
-    ' Copying DB file to temp location
-    srcFile = utils.Path2URL(cTestDocsDir) + "TestDB/testDB.dbf"
-    dstFile = utils.getTempFileURL("TestDB.dbf")
-    dbSrcURL = "sdbc:dbase:" + utils.StrReplace(dstFile, "/testDB.dbf", "")
-
-    Out.Log("Copying file '" + srcFile + "' to '" + dstFile + "'")
-    facc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    if (facc.exists(dstFile)) then facc.kill(dstFile)
-    facc.copy(srcFile, dstFile)
-
-    dbtools.RegisterDataSource("DBTest", dbSrcURL)
-
-    ' Creating a form
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("ComboBox", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("TextField", 1000, 1000, 2000, 1000)
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForms = oDrawPage.getForms()
-
-    oForm = oForms.getByName("Standard")
-
-    oForms.insertByName("Instance1", oDoc.createInstance("com.sun.star.form.component.Form"))
-    oForms.insertByName("Instance2", oDoc.createInstance("com.sun.star.form.component.Form"))
-
-    oObj = oForm
-
-    'connect to a database
-    oForm.DataSourceName = "DBTest"
-    oForm.Command = "TestDB"
-    oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-    oForm.Load()
-
-    oConnection = oForm.ActiveConnection
-    Dim list as Object
-'    list = createUnoListener("C_", "com.sun.star.lang.XEventListener")
-'	oConnection.addEventListener(list)
-
-    'for XComponent
-    Out.Log("" + oForms.hasByName("Instance1") + "," + oForms.hasByName("Instance2"))
-    oComponentInstance = oForms.getByName("Instance1")
-    oPersistInstance = oForms.getByName("Instance2")
-
-    'for XNameContainer, XIndexContainer
-    oInstance = oDoc.createInstance("com.sun.star.form.component.ComboBox")
-    
-    'for XContainer
-    oElementToInsert = oDoc.createInstance("com.sun.star.form.component.ComboBox")
-    
-    'for XNameReplace
-    oReplaceInstance = oDoc.createInstance("com.sun.star.form.component.ComboBox")
-    oObj.insertByName(cObjectName + "Replace", oDoc.createInstance("com.sun.star.form.component.ComboBox"))
-    cNameToReplace = cObjectName + "Replace"
-
-    'for XIndexReplace
-    oIdxReplaceInstance = oDoc.createInstance("com.sun.star.form.component.ComboBox")
-
-    cExistantColumnName = "_TEXT"
-    cXResultSetFirstRecord = "text1"
-    cXResultSetLastRecord = "text3"
-    cXResultSetRecord1 = "text1"
-    cXResultSetRecord2 = "text2"
-    cXResultSet2BeforeLastRecord = "text2"
-
-    ' for XParameters
-    paramTypes = DimArray()
-'    paramTypes = Array("boolean", "byte", "short", "int", "long", "float", "double", "string", _
-'        "bytes", "date", "time", "timestamp", "binarystream", "characterstream", "object", "objectwithinfo", _
-'        "ref", "blob", "clob", "array")
-
-    ' for XRow and XRowUpdate
-    rowTypes = Array("string", "int", "long", "double", "float", "date", "datetm", "boolean")
-    rowTypesCol = Array(1, 2, 3, 4, 5, 6, 7, 9)
-'    rowTypes = Array("boolean", "byte", "short", "int", "long", "float", "double", "string", _
-'        "bytes", "date", "time", "timestamp", "binarystream", "characterstream", "object", "objectwithinfo", _
-'        "ref", "blob", "clob", "array")
-
-' Required for com.sun.star.sdbc.XResultSetUpdate
-    textColumn = "_TEXT"
-
-' Required for com.sun.star.awt.XTabControllerModel
-    XTabControlModel1 = oShape1.getControl()
-    XTabControlModel2 = oShape2.getControl()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error Goto ErrHndl
-'msgbox "Disposing ODatabaseForm"
-    Out.Log("Closing DB connection ...")
-    oConnection.close()
-
-    Out.Log("Revoking 'DBTest' datasource ...")
-    dbtools.RevokeDB("DBTest")
-'msgbox "ODatabaseForm disposed."
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub C_disposing()
-    Out.Log("!!! Connection disposed !!!")
-'    oConnection.close()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ODatabaseForm/script.xlb b/qadevOOo/tests/basic/mod/forms/ODatabaseForm/script.xlb
deleted file mode 100644
index 558bb6821d40..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODatabaseForm/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ODatabaseForm" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ODatabaseForm"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ODateControl/forms_ODateControl.xba b/qadevOOo/tests/basic/mod/forms/ODateControl/forms_ODateControl.xba
deleted file mode 100644
index 0a72fa971137..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODateControl/forms_ODateControl.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ODateControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ODateControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    
-    oShape1 = toolkittools.addControlToDefaultForm("DateField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("DateField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ODateControl/script.xlb b/qadevOOo/tests/basic/mod/forms/ODateControl/script.xlb
deleted file mode 100644
index 39760a22b6dc..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODateControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ODateControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ODateControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ODateModel/forms_ODateModel.xba b/qadevOOo/tests/basic/mod/forms/ODateModel/forms_ODateModel.xba
deleted file mode 100644
index c038d6f2bef9..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODateModel/forms_ODateModel.xba
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ODateModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ODateModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-    
-    bOK = true
-    ' --- create a document if needed
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("DateField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DateField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DateField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Custom1"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global aChangedValue As Variant
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Dim dat As New com.sun.star.util.Date
-
-    Out.Log("prepareCommit() called.")
-    if NOT (isNull(oObj.Date) OR isEmpty(oObj.Date)) then
-        aChangedValue = oObj.Date + 1
-    else
-        aChangedValue = 1
-    end if
-    oObj.Date = aChangedValue
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowValue As Variant
-    
-    oForm.updateRow()
-    oForm.reload()
-    rowValue = oObj.Date
-    Out.Log("Value was set to " + aChangedValue )
-    Out.Log("the value in current row is " + rowValue)
-    checkCommit() = (rowValue = aChangedValue)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Date = oObj.Date + 1
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ODateModel/script.xlb b/qadevOOo/tests/basic/mod/forms/ODateModel/script.xlb
deleted file mode 100644
index 52fb8db2a879..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ODateModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ODateModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ODateModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OEditControl/forms_OEditControl.xba b/qadevOOo/tests/basic/mod/forms/OEditControl/forms_OEditControl.xba
deleted file mode 100644
index 30881b177270..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OEditControl/forms_OEditControl.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OEditControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OEditControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("TextField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("TextField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OEditControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OEditControl/script.xlb
deleted file mode 100644
index 764079c52396..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OEditControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OEditControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OEditControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OEditModel/forms_OEditModel.xba b/qadevOOo/tests/basic/mod/forms/OEditModel/forms_OEditModel.xba
deleted file mode 100644
index d1aaab2517a4..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OEditModel/forms_OEditModel.xba
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OEditModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OEditModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("TextField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TextField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Author"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global sChangedText As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    sChangedText = "_" + oObj.Text
-    oObj.Text = sChangedText
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowText As Variant
-    
-    rowText = oForm.getString(oForm.findColumn("Author"))
-    checkCommit() = (rowText = sChangedText)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Text = "_" + oObj.Text
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OEditModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OEditModel/script.xlb
deleted file mode 100644
index 96715b5ae2e1..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OEditModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OEditModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OEditModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OFileControlModel/forms_OFileControlModel.xba b/qadevOOo/tests/basic/mod/forms/OFileControlModel/forms_OFileControlModel.xba
deleted file mode 100644
index 50ddc2c0e558..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFileControlModel/forms_OFileControlModel.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OFileControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OFileControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("FileControl", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("FileControl", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("FileControl", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OFileControlModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OFileControlModel/script.xlb
deleted file mode 100644
index 79c36ddf2a22..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFileControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OFileControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OFileControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OFixedTextModel/forms_OFixedTextModel.xba b/qadevOOo/tests/basic/mod/forms/OFixedTextModel/forms_OFixedTextModel.xba
deleted file mode 100644
index 1f4d518652e5..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFixedTextModel/forms_OFixedTextModel.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OFixedTextModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OFixedTextModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object
-    
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("FixedText", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("FixedText", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("FixedText", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OFixedTextModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OFixedTextModel/script.xlb
deleted file mode 100644
index 2181f2d0a32b..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFixedTextModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OFixedTextModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OFixedTextModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormattedControl/forms_OFormattedControl.xba b/qadevOOo/tests/basic/mod/forms/OFormattedControl/forms_OFormattedControl.xba
deleted file mode 100644
index 31ec92e4cc10..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormattedControl/forms_OFormattedControl.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OFormattedControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OFormattedControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("FormattedField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("FormattedField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormattedControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OFormattedControl/script.xlb
deleted file mode 100644
index f77a899327c0..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormattedControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OFormattedControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OFormattedControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/forms_OFormattedFieldWrapper.xba b/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/forms_OFormattedFieldWrapper.xba
deleted file mode 100644
index d76b0bdbfe00..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/forms_OFormattedFieldWrapper.xba
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OFormattedFieldWrapper" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.io.XPersistObject
- Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OFormattedFieldWrapper
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("DatabaseFormattedField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DatabaseFormattedField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DatabaseFormattedField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-    oForm.DataSourceName = "Bibliography"
-    oForm.Command = "biblio"
-    oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Custom2"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-    ' Switching to non-design mode
-    switchDesignMode(oDoc)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub switchDesignMode(xDoc as Object)
-On Error Goto ErrHndl
-
-        Dim frame as Variant, disp as Variant, transf as Object
-        Dim URL as new com.sun.star.util.URL
-        Dim noProps()
-        Dim res as Boolean
-        
-        frame = xDoc.getCurrentController().getFrame()
-        URL.Complete = ".uno:SwitchControlDesignMode"
-        transf = createUnoService("com.sun.star.util.URLTransformer")
-        res = transf.parseStrict(URL)
-        
-        out.log("URL parsed :" + res)
-        
-        disp = frame.queryDispatch(URL, "", com.sun.star.frame.FrameSearchFlag.SELF _
-                OR com.sun.star.frame.FrameSearchFlag.CHILDREN)
-
-        out.log("disp get.")
-
-        disp.dispatch(URL, noProps())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global sChangedText As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-
-    if isNull(oObj.EffectiveValue) OR isEmpty(oObj.EffectiveValue) then
-        oObj.EffectiveValue = "12"
-    endif 
-    sChangedText = "9" + oObj.EffectiveValue
-    
-    Out.Log("Text was: '" + oObj.EffectiveValue + "', set to '" + sChangedText + "'")
-
-    oObj.EffectiveValue = sChangedText
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowText As Variant
-    
-    rowText = oForm.getString(oForm.findColumn("Custom2"))
-    
-    Out.Log("Result test: '" + rowText + "'")
-    checkCommit() = (rowText = sChangedText)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.EffectiveValue = "_" + oObj.EffectiveValue
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/script.xlb b/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/script.xlb
deleted file mode 100644
index 3ec914585ae1..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormattedFieldWrapper/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OFormattedFieldWrapper" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OFormattedFieldWrapper"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormsCollection/forms_OFormsCollection.xba b/qadevOOo/tests/basic/mod/forms/OFormsCollection/forms_OFormsCollection.xba
deleted file mode 100644
index 4ecc02ce80cf..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormsCollection/forms_OFormsCollection.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OFormsCollection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.container.XNameContainer:
-Global oInstance As Object
-
-' Required for com.sun.star.container.XNameReplace:
-Global cNameToReplace As String
-Global oReplaceInstance As Object
-
-' Required for com.sun.star.container.XIndexReplace
-Global oIdxReplaceInstance As Object
-
-' Required for com.sun.star.io.XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OFormsCollection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDrawPage As Object, oForms As Object, oForm As Object
-    
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oDrawPage = oDoc.DrawPage
-    oForms = oDrawPage.Forms
-
-    oForm = oDoc.createInstance("com.sun.star.form.component.Form")
-    oForm.Name = "first form"
-    oForms.insertByIndex(0, oForm)
-
-    oForm = oDoc.createInstance("com.sun.star.form.component.Form")
-    oForm.Name = "second form"
-    oForms.insertByIndex(1, oForm)
-
-    oInstance = oDoc.createInstance("com.sun.star.form.component.Form")
-    oInstance.Name = "instance form"
-
-    oReplaceInstance = oDoc.createInstance("com.sun.star.form.component.Form")
-    oReplaceInstance.Name = "replace form"
-
-    oIdxReplaceInstance = oDoc.createInstance("com.sun.star.form.component.Form")
-    oIdxReplaceInstance.Name = "index replace form"
-
-    cNameToReplace = "second form"
-
-    oObj = oForms
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OFormsCollection/script.xlb b/qadevOOo/tests/basic/mod/forms/OFormsCollection/script.xlb
deleted file mode 100644
index d2d253b60998..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OFormsCollection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OFormsCollection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OFormsCollection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OGridControlModel/forms_OGridControlModel.xba b/qadevOOo/tests/basic/mod/forms/OGridControlModel/forms_OGridControlModel.xba
deleted file mode 100644
index 2631dd931902..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGridControlModel/forms_OGridControlModel.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OGridControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for XPersistObject
-Global oPersistInstance As Object
-
-' Required for XComponent
-Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.container.XNameContainer
- Global oInstance As Object 'instance to insert
-
-' Requiered for  com.sun.star.view.XSelectionSupplier
- Global SelectableObj1 As Variant
- Global SelectableObj2 As Variant
-
-' Requiered for  com.sun.star.container.XNameReplace
- Global cNameToReplace As String 'name of instance to be replased
- Global oReplaceInstance As Object 'instance, that will be inserted
-                                   'instead old one
-
-' Requiered for  com.sun.star.container.XIndexReplace
- Global oIdxReplaceInstance As Object
-
-' Requiered for XContainer
- Global oElementToInsert As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OGridControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean, i As Integer
-    Dim oShape As Object, oGridColumn As Object
-    
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("GridControl", 1000, 1000, 3000, 3000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("GridControl", 1000, 5000, 500, 500)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("GridControl", 1000, 9000, 500, 500)
-    oPersistInstance = oShape.getControl()
-
-    'insert Columns into Grid
-    for i = 0 to 10
-        oGridColumn = oObj.createColumn("TextField")
-        oGridColumn.Label = "Label" + Str(i)
-        oGridColumn.DataField = "Data" + Str(i)
-        oObj.insertByName("Field" + i , oGridColumn)
-        
-    next i
-
-    SelectableObj1 = oObj.getByName("Field" + 7)
-    SelectableObj2 = oObj.getByName("Field" + 5)
-
-    'for XNameContainer
-    oInstance = oObj.createColumn("TextField")
-    oInstance.Label = "LabelInstance"
-    oInstance.DataField = "DataInstance"
-
-    oElementToInsert = oObj.createColumn("TextField")
-    oElementToInsert.Label = "LabelInstance"
-    oElementToInsert.DataField = "DataInstance"
-
-    'for XNameReplace
-    cNameToReplace = "Field2"
-    oReplaceInstance = oObj.createColumn("TextField")
-    oReplaceInstance.Label = "LabelReplace"
-    oReplaceInstance.DataField = "LabelReplace"
-    
-    'for XIndexReplace
-    oIdxReplaceInstance = oObj.createColumn("TextField")
-    oIdxReplaceInstance.Label = "LabelIndexReplace"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OGridControlModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OGridControlModel/script.xlb
deleted file mode 100644
index c525093365aa..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGridControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OGridControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OGridControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/forms_OGroupBoxControl.xba b/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/forms_OGroupBoxControl.xba
deleted file mode 100644
index 39ab1062b729..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/forms_OGroupBoxControl.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OGroupBoxControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OGroupBoxControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("GroupBox", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("GroupBox", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/script.xlb
deleted file mode 100644
index 35becbb255d5..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGroupBoxControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OGroupBoxControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OGroupBoxControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/forms_OGroupBoxModel.xba b/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/forms_OGroupBoxModel.xba
deleted file mode 100644
index 101d322ab147..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/forms_OGroupBoxModel.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OGroupBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OGroupBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oShape = toolkittools.addControlToDefaultForm("GroupBox", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("GroupBox", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("GroupBox", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/script.xlb
deleted file mode 100644
index e2797e9989d0..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OGroupBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OGroupBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OGroupBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OHiddenModel/forms_OHiddenModel.xba b/qadevOOo/tests/basic/mod/forms/OHiddenModel/forms_OHiddenModel.xba
deleted file mode 100644
index 809c8eef80aa..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OHiddenModel/forms_OHiddenModel.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OHiddenModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OHiddenModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDrawPage As Object, oForm As Object
-    
-    bOK = true
-    
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    addHiddenControl()
-    addHiddenControl()
-    addHiddenControl()
-    addHiddenControl()
-    addHiddenControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByIndex(0)
-    'for xComponent
-    oComponentInstance = oForm.getByIndex(1)
-    oPersistInstance = oForm.getByIndex(2)
-
-    oObj = oForm.getByIndex(oForm.count - 1)
-    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub addHiddenControl()
-    Dim oDrawPage as Object
-    Dim oForm as Object, oForms as Object
-    Dim oControl as Object, oControlShape as Object
-
-    oDrawPage = oDoc.DrawPage
-    oControlShape = oDoc.createInstance("com.sun.star.drawing.ControlShape")
-    oControl = oDoc.createInstance("com.sun.star.form.component.HiddenControl")
-    oForm = oDoc.createInstance("com.sun.star.form.component.Form")
-    oforms = oDrawPage.Forms
-    if oForms.count = 0 then
-            oForm.Name = "Form1"
-            oForms.insertbyindex(0,oForm)
-    endif
-   oForm = oForms.getByIndex(0)
-   oForm.insertByIndex(oForm.count,oControl)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OHiddenModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OHiddenModel/script.xlb
deleted file mode 100644
index 84d3638e9666..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OHiddenModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OHiddenModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OHiddenModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageButtonControl/forms_OImageButtonControl.xba b/qadevOOo/tests/basic/mod/forms/OImageButtonControl/forms_OImageButtonControl.xba
deleted file mode 100644
index 6eb28793b0da..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageButtonControl/forms_OImageButtonControl.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OImageButtonControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OImageButtonControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("ImageButton", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("ImageButton", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageButtonControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OImageButtonControl/script.xlb
deleted file mode 100644
index c528e95c2999..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageButtonControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OImageButtonControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OImageButtonControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageButtonModel/forms_OImageButtonModel.xba b/qadevOOo/tests/basic/mod/forms/OImageButtonModel/forms_OImageButtonModel.xba
deleted file mode 100644
index 5a5592638500..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageButtonModel/forms_OImageButtonModel.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OImageButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OImageButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("ImageButton", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("ImageButton", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("ImageButton", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageButtonModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OImageButtonModel/script.xlb
deleted file mode 100644
index 52b34ca1effc..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OImageButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OImageButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageControlControl/forms_OImageControlControl.xba b/qadevOOo/tests/basic/mod/forms/OImageControlControl/forms_OImageControlControl.xba
deleted file mode 100644
index 6280f3c8f471..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageControlControl/forms_OImageControlControl.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OImageControlControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OImageControlControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.createControlShapeWithDefaultControl("DatabaseImageControl")
-    oShape2 = toolkittools.createControlShapeWithDefaultControl("DatabaseImageControl")
-    oShape3 = toolkittools.createControlShapeWithDefaultControl("TextField")
-    toolkittools.addShape(oShape1)
-    toolkittools.addShape(oShape2)
-    toolkittools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageControlControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OImageControlControl/script.xlb
deleted file mode 100644
index 5aaa204440bd..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageControlControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OImageControlControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OImageControlControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageControlModel/forms_OImageControlModel.xba b/qadevOOo/tests/basic/mod/forms/OImageControlModel/forms_OImageControlModel.xba
deleted file mode 100644
index 0f4d43f38c3d..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageControlModel/forms_OImageControlModel.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OImageControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OImageControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("DatabaseImageControl", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DatabaseImageControl", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("DatabaseImageControl", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OImageControlModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OImageControlModel/script.xlb
deleted file mode 100644
index 7c723d3c110d..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OImageControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OImageControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OImageControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OListBoxControl/forms_OListBoxControl.xba b/qadevOOo/tests/basic/mod/forms/OListBoxControl/forms_OListBoxControl.xba
deleted file mode 100644
index e5b2c3456baa..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OListBoxControl/forms_OListBoxControl.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OListBoxControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-' Required for awt.XItemListener
-  Global bIL_itemStateChanged As Boolean
-  Global oEventItemListener As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OListBoxControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oIListener As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("ListBox", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("ListBox", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 1000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-    oObj.addItemListener(oIListener)    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub IL_itemStateChanged(rEvent As Object)
-    bIL_itemStateChanged = True
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    oEventItemListener = rEvent
-End Sub
-
-Sub IL_disposing
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OListBoxControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OListBoxControl/script.xlb
deleted file mode 100644
index 04dc4fa3b92e..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OListBoxControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OListBoxControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OListBoxControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OListBoxModel/forms_OListBoxModel.xba b/qadevOOo/tests/basic/mod/forms/OListBoxModel/forms_OListBoxModel.xba
deleted file mode 100644
index 769466b6758b..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OListBoxModel/forms_OListBoxModel.xba
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OListBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-Global aList(1) As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OListBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aSelection(0 to 0) As Variant
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("ListBox", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("ListBox", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("ListBox", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'for UnoControlListBoxModel::SelectedItems
-    aList(0) = "Hello"
-    aList(1) = "World"
-    aSelection(0) = 1
-    oObj.DefaultSelection = aSelection()
-    oObj.ListSource = aList()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Author"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global sChangedText As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Dim items As Variant
-    Dim item As Variant
-    
-    Out.Log("prepareCommit() called.")
-    items = oObj.SelectedItems
-    if ubound(items()) &lt; 0 then
-        item = 0
-    else
-        if items(0) = 0 then item = 1 else item = 0
-    endif
-
-    sChangedText = aList(item)
-    oObj.SelectedItems = Array(item)
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowText As Variant
-    
-    rowText = oForm.getString(oForm.findColumn("Author"))
-    checkCommit() = (rowText = sChangedText)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    Out.Log("UpdateComponent() called.")
-
-    Dim items As Variant
-    Dim item As Variant
-    items = oObj.SelectedItems
-    if ubound(items()) &lt; 0 then
-        item = 0
-    else
-        if items(0) = 0 then item = 1 else item = 0
-    endif
-    oObj.SelectedItems = Array(item)
-
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OListBoxModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OListBoxModel/script.xlb
deleted file mode 100644
index 0c9c727d99e7..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OListBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OListBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OListBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ONumericControl/forms_ONumericControl.xba b/qadevOOo/tests/basic/mod/forms/ONumericControl/forms_ONumericControl.xba
deleted file mode 100644
index 949c1b52187b..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ONumericControl/forms_ONumericControl.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ONumericControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ONumericControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("NumericField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("NumericField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ONumericControl/script.xlb b/qadevOOo/tests/basic/mod/forms/ONumericControl/script.xlb
deleted file mode 100644
index 4dae412199e0..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ONumericControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ONumericControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ONumericControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ONumericModel/forms_ONumericModel.xba b/qadevOOo/tests/basic/mod/forms/ONumericModel/forms_ONumericModel.xba
deleted file mode 100644
index 117ba7bd2b7e..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ONumericModel/forms_ONumericModel.xba
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ONumericModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ONumericModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("NumericField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("NumericField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Pages"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global nChangedVal As Variant
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    nChangedVal = oObj.Value + 1
-    oObj.Value = nChangedVal
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowVal As Variant
-    
-    rowVal = oForm.getInt(oForm.findColumn("Pages"))
-    checkCommit() = (rowVal = nChangedVal)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Value = oObj.Value + 1
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ONumericModel/script.xlb b/qadevOOo/tests/basic/mod/forms/ONumericModel/script.xlb
deleted file mode 100644
index d44de2b54e64..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ONumericModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ONumericModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ONumericModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OPatternControl/forms_OPatternControl.xba b/qadevOOo/tests/basic/mod/forms/OPatternControl/forms_OPatternControl.xba
deleted file mode 100644
index 65c1cc774822..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OPatternControl/forms_OPatternControl.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OPatternControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OPatternControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("PatternField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("PatternField", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape2.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OPatternControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OPatternControl/script.xlb
deleted file mode 100644
index 1d7fd0303f27..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OPatternControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OPatternControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OPatternControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OPatternModel/forms_OPatternModel.xba b/qadevOOo/tests/basic/mod/forms/OPatternModel/forms_OPatternModel.xba
deleted file mode 100644
index 65ef760eed29..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OPatternModel/forms_OPatternModel.xba
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OPatternModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OPatternModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("PatternField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("PatternField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Author"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global sChangedText As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    sChangedText = "_" + oObj.Text
-    oObj.Text = sChangedText
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowText As Variant
-    
-    rowText = oForm.getString(oForm.findColumn("Author"))
-    checkCommit() = (rowText = sChangedText)
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.Text = "_" + oObj.Text
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OPatternModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OPatternModel/script.xlb
deleted file mode 100644
index c8b4f8d4b089..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OPatternModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OPatternModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OPatternModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/forms_ORadioButtonControl.xba b/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/forms_ORadioButtonControl.xba
deleted file mode 100644
index d614220e637d..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/forms_ORadioButtonControl.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ORadioButtonControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ORadioButtonControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("RadioButton", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("RadioButton", 1000, 3000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 5000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape2.getControl())
-    oCtrlShape = oShape1
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/script.xlb b/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/script.xlb
deleted file mode 100644
index 0c79cbf8481c..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ORadioButtonControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ORadioButtonControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ORadioButtonControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/forms_ORadioButtonModel.xba b/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/forms_ORadioButtonModel.xba
deleted file mode 100644
index 64379f607c50..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/forms_ORadioButtonModel.xba
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_ORadioButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.ORadioButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("RadioButton", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("RadioButton", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("RadioButton", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-	oForm.DataSourceName = "Bibliography"
-	oForm.Command = "biblio"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "Custom3"
-
-    oForm.load()
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global aChangedVal As String
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-    Out.Log("prepareCommit() called.")
-    aChangedVal = 1 - oObj.State
-    oObj.State = aChangedVal
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowVal As Variant
-    
-    rowVal = oForm.getBoolean(oForm.findColumn("Custom3"))
-    if rowVal = true then
-        checkCommit() = (aChangedVal = 1)  
-    else
-        checkCommit() = (aChangedVal = 0)
-    end if
-
-    exit function
-ErrHndl:
-    Test.Exception()
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    oObj.State = 1 - oObj.State
-    oObj.commit()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/script.xlb b/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/script.xlb
deleted file mode 100644
index a364a4442441..000000000000
--- a/qadevOOo/tests/basic/mod/forms/ORadioButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_ORadioButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_ORadioButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OTimeControl/forms_OTimeControl.xba b/qadevOOo/tests/basic/mod/forms/OTimeControl/forms_OTimeControl.xba
deleted file mode 100644
index d960cf290bc0..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OTimeControl/forms_OTimeControl.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OTimeControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics as Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OTimeControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = toolkittools.addControlToDefaultForm("TimeField", 1000, 1000, 2000, 1000)
-    oShape2 = toolkittools.addControlToDefaultForm("TimeField", 1000, 1000, 2000, 1000)
-    oShape3 = toolkittools.addControlToDefaultForm("TextField", 1000, 1000, 2000, 1000)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oCurrCtrl.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oCurrCtrl.getControl(oShape3.getControl())
-    oCtrlShape = oShape1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OTimeControl/script.xlb b/qadevOOo/tests/basic/mod/forms/OTimeControl/script.xlb
deleted file mode 100644
index 5ffb92c7d3e5..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OTimeControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OTimeControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OTimeControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/forms/OTimeModel/forms_OTimeModel.xba b/qadevOOo/tests/basic/mod/forms/OTimeModel/forms_OTimeModel.xba
deleted file mode 100644
index 003dd7d1f30f..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OTimeModel/forms_OTimeModel.xba
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="forms_OTimeModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' for XComponent
-Global oComponentInstance As Object
-
-' for XPersistObject
-Global oPersistInstance As Object
-
-' for XUpdateBroadcaster
-Global bCustomUpdate As Boolean
-
-Global oForm As Object
-
-Global oConnection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' forms.OTimeModel
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape As Object, oDrawPage As Object
-    
-    bOK = true
-    ' --- create a document if needed
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.addControlToDefaultForm("TimeField", 1000, 1000, 2000, 1000)
-    oObj = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TimeField", 1000, 3000, 2000, 1000)
-    oComponentInstance = oShape.getControl()
-    oShape = toolkittools.addControlToDefaultForm("TimeField", 1000, 5000, 2000, 1000)
-    oPersistInstance = oShape.getControl()
-
-    'get control from document
-    oDrawPage = oDoc.DrawPage
-    oForm = oDrawPage.Forms.getByName("Standard")
-    
-    Dim oRowSet As Object, facc As Object, dbSource As Object
-    Dim srcFile As String, dstFile As String, dbSrcURL As String
-
-    ' Copying DB file to temp location
-    srcFile = utils.Path2URL(cTestDocsDir) + "TestDB/testDB.dbf"
-    dstFile = utils.getTempFileURL("OTimeModelDB.dbf")
-    dbSrcURL = "sdbc:dbase:" + utils.StrReplace(dstFile, "/OTimeModelDB.dbf", "")
-
-    facc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    if (facc.exists(dstFile)) then facc.kill(dstFile)
-    facc.copy(srcFile, dstFile)
-
-    dbtools.RegisterDataSource("DBTest", dbSrcURL)
-
-	oForm.DataSourceName = "DBTest"
-	oForm.Command = "OTimeModelDB"
-	oForm.CommandType = com.sun.star.sdb.CommandType.TABLE
-
-    oObj.DataField = "_DOUBLE"
-
-    oForm.load()
-
-    oConnection = oForm.ActiveConnection
-    
-    ' for XUpdateBroadcaster
-    bCustomUpdate = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global aChangedValue As Variant
-
-' for XBoundComponent
-Sub prepareCommit() 
-On Error Goto ErrHndl
-
-    Out.Log("prepareCommit() called.")
-    if NOT (isNull(oObj.Time) OR isEmpty(oObj.Time)) then
-        Out.Log("The old value was: " + oObj.Time)
-        aChangedValue = oObj.Time + 150000 ' adding 15 minutes
-    else
-        aChangedValue = 150000 ' setting to 0:15
-    end if
-    oObj.Time = aChangedValue
-    
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' for XBoundComponent
-Function checkCommit() As Boolean
-On Error Goto ErrHndl
-    Out.Log("checkCommit() called.")
-    Dim rowValue As Variant
-    
-    oForm.updateRow()
-    oForm.reload()
-    rowValue = oObj.Time
-    Out.Log("Value was set to " + aChangedValue )
-    Out.Log("the value in current row is " + rowValue)
-    checkCommit() = abs(rowValue - aChangedValue) &lt; 100
-
-    exit function
-ErrHndl:
-    Test.Exception()
-    checkCommit() = false
-End Function
-
-' for XUpdateBroadcaster
-Sub UpdateComponent()
-    Out.Log("UpdateComponent() called.")
-    if NOT (isNull(oObj.Time) OR isEmpty(oObj.Time)) then
-        oObj.Time = oObj.Time + 150000
-    else
-        oObj.Time = 150000
-    end if
-    oObj.commit()
-
-    exit sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error Goto ErrHndl
-    Out.Log("Closing DB connection ...")
-    oConnection.close()
-
-    Out.Log("Revoking 'DBTest' datasource ...")
-    dbtools.RevokeDB("DBTest")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/forms/OTimeModel/script.xlb b/qadevOOo/tests/basic/mod/forms/OTimeModel/script.xlb
deleted file mode 100644
index bff6755c7966..000000000000
--- a/qadevOOo/tests/basic/mod/forms/OTimeModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="forms_OTimeModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="forms_OTimeModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fps/FilePicker/fps_FilePicker.xba b/qadevOOo/tests/basic/mod/fps/FilePicker/fps_FilePicker.xba
deleted file mode 100644
index bb80f58a4b2d..000000000000
--- a/qadevOOo/tests/basic/mod/fps/FilePicker/fps_FilePicker.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fps_FilePicker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' variable for XInitialization
-Global aInitArgs As Variant
-
-' variable for XFilePickerControlAccess
-Global controlId As Variant
-Global controlInitVal As Variant
-
-'variable for XComponent 
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fps.FilePicker
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ui.dialogs.FilePicker")
-
-' setting variable for XInitialization
-    aInitArgs = Array(com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE)
-
-' setting variable for XFilePickerControlAccess
-    controlId = com.sun.star.ui.dialogs.ExtendedFilePickerElementIds.CHECKBOX_LINK
-    controlInitVal = true
-
-    oObj.initialize(aInitArgs)
-    'oObj.setValue(com.sun.star.ui.dialogs.ExtendedFilePickerElementIds.CHECKBOX_READONLY, 0, false)
-    
-'  setting variable for XComponent 
-    oComponentInstance = createUnoService("com.sun.star.ui.dialogs.FilePicker")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fps/FilePicker/script.xlb b/qadevOOo/tests/basic/mod/fps/FilePicker/script.xlb
deleted file mode 100644
index fa0a9ddc26f3..000000000000
--- a/qadevOOo/tests/basic/mod/fps/FilePicker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fps_FilePicker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fps_FilePicker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/ftransl_DataFormatTranslator.xba b/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/ftransl_DataFormatTranslator.xba
deleted file mode 100644
index 9f00c440b26b..000000000000
--- a/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/ftransl_DataFormatTranslator.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ftransl_DataFormatTranslator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ftransl.DataFormatTranslator
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.datatransfer.DataFormatTranslator")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/script.xlb b/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/script.xlb
deleted file mode 100644
index bf5657a4d179..000000000000
--- a/qadevOOo/tests/basic/mod/ftransl/DataFormatTranslator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ftransl_DataFormatTranslator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ftransl_DataFormatTranslator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/Desktop/fwk_Desktop.xba b/qadevOOo/tests/basic/mod/fwk/Desktop/fwk_Desktop.xba
deleted file mode 100644
index 388bdd03d1d0..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/Desktop/fwk_Desktop.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_Desktop" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.Desktop
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.framework.Desktop")
-
-    dispatchUrl = ".uno:Open"
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/Desktop/script.xlb b/qadevOOo/tests/basic/mod/fwk/Desktop/script.xlb
deleted file mode 100644
index e2589c5e447f..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/Desktop/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_Desktop" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_Desktop"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/fwk_DispatchRecorder.xba b/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/fwk_DispatchRecorder.xba
deleted file mode 100644
index 5c7c6db078ec..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/fwk_DispatchRecorder.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_DispatchRecorder" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for frame.XDispatchRecorder
-Global dispRecFrame As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.DispatchRecorder
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    wait(1000)
-    Dim frame As Object
-    frame = createUnoService("com.sun.star.frame.Desktop").getCurrentFrame()
-    Dim dispRecSup As Object
-    dispRecSup = frame.getPropertyValue("DispatchRecorderSupplier")
-    if (isNull(dispRecSup)) then
-        dispRecSup = createUnoService("com.sun.star.comp.framework.DispatchRecorderSupplier")
-    end if
-
-    oObj = dispRecSup.getDispatchRecorder()
-
-    if (isNull(oObj)) then
-        oObj = createUnoService("com.sun.star.comp.framework.DispatchRecorder")
-        dispRecSup.setDispatchRecorder(oObj)
-    end if
-
-    dispRecFrame = frame
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/script.xlb b/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/script.xlb
deleted file mode 100644
index 7139de0f6773..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DispatchRecorder/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_DispatchRecorder" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_DispatchRecorder"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/fwk_DispatchRecorderSupplier.xba b/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/fwk_DispatchRecorderSupplier.xba
deleted file mode 100644
index d33203ea01d4..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/fwk_DispatchRecorderSupplier.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_DispatchRecorderSupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.DispatchRecorderSupplier
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.comp.framework.DispatchRecorderSupplier")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/script.xlb b/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/script.xlb
deleted file mode 100644
index fdcaffe4c80f..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DispatchRecorderSupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_DispatchRecorderSupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_DispatchRecorderSupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/DocumentProperties/fwk_DocumentProperties.xba b/qadevOOo/tests/basic/mod/fwk/DocumentProperties/fwk_DocumentProperties.xba
deleted file mode 100644
index a5736e5c8f51..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DocumentProperties/fwk_DocumentProperties.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_DocumentProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.DocumentProperties
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = createDocument("swriter", cObjectName)
-    oObj = oDoc.DocumentInfo
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/DocumentProperties/script.xlb b/qadevOOo/tests/basic/mod/fwk/DocumentProperties/script.xlb
deleted file mode 100644
index 78ea70b266be..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/DocumentProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_DocumentProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_DocumentProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/Frame/fwk_Frame.xba b/qadevOOo/tests/basic/mod/fwk/Frame/fwk_Frame.xba
deleted file mode 100644
index 87fb7b4b8d50..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/Frame/fwk_Frame.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_Frame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-'Required for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.Frame
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = createDocument("swriter", cObjectName)
-    oObj = oDoc.getCurrentController().getFrame()
-    dispatchUrl = ".uno:SwitchControlDesignMode"
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/Frame/script.xlb b/qadevOOo/tests/basic/mod/fwk/Frame/script.xlb
deleted file mode 100644
index d7113b845558..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/Frame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_Frame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_Frame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwk/JobHandler/fwk_JobHandler.xba b/qadevOOo/tests/basic/mod/fwk/JobHandler/fwk_JobHandler.xba
deleted file mode 100644
index 99b09c289a0b..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/JobHandler/fwk_JobHandler.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwk_JobHandler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwk.JobHandler
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.comp.framework.JobHandler")
-    dispatchUrl = "vnd.sun.star.job:event=onMyEvent,alias=AddressBookSourcePilot,service=css.Service"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwk/JobHandler/script.xlb b/qadevOOo/tests/basic/mod/fwk/JobHandler/script.xlb
deleted file mode 100644
index f1ec1b0141c9..000000000000
--- a/qadevOOo/tests/basic/mod/fwk/JobHandler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwk_JobHandler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwk_JobHandler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwl/FilterFactory/fwl_FilterFactory.xba b/qadevOOo/tests/basic/mod/fwl/FilterFactory/fwl_FilterFactory.xba
deleted file mode 100644
index ff2632fb4e87..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/FilterFactory/fwl_FilterFactory.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwl_FilterFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for lang.XMultiServiceFactory
-Global cServiceName As String
-Global bCreateInstanceWithoutArguments As Boolean
-Global aArguments() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwl.FilterFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.framework.FilterFactory")
-
-    Dim filterNames() As Variant
-    filterNames = oObj.getElementNames()
-
-    Dim i As Integer
-    Dim filterType As String
-    Dim filterProps As Object
-    Dim filterImpl As String
-    Dim filName As String
-    for i = 0 to ubound(filterNames)
-        filterProps = oObj.getByName(filterNames(i))
-        filterImpl = getPropertyValue(filterProps, "FilterService")
-        if Not isNULL(filterImpl) and len(filterImpl) > 0 then
-            filterType = getPropertyValue(filterProps, "Type")
-            Out.log("Found filter '" + filterNames(i) + "', type: " + _
-                filterType + ", service name: '" + filterImpl + "'")
-            cServiceName = filterType
-            bCreateInstanceWithoutArguments = false
-            Dim args(0) As new com.sun.star.beans.PropertyValue
-            args(0).Name = "FilterName"
-            args(0).Value = filterNames(i)
-        endif
-    next i
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getPropertyValue(byVal props As Variant, propName As String) As String
-    Dim i As Integer
-    for i = 0 to ubound(props)
-        if props(i).Name = propName then
-            getPropertyValue = props(i).Value
-            exit function
-        endif
-    next i
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwl/FilterFactory/script.xlb b/qadevOOo/tests/basic/mod/fwl/FilterFactory/script.xlb
deleted file mode 100644
index c217a3af39c3..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/FilterFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwl_FilterFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwl_FilterFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/fwl_FrameLoaderFactory.xba b/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/fwl_FrameLoaderFactory.xba
deleted file mode 100644
index 4ad75cd75e54..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/fwl_FrameLoaderFactory.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwl_FrameLoaderFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for lang.XMultiServiceFactory
-Global cServiceName As String
-Global bCreateInstanceWithoutArguments As Boolean
-Global aArguments() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwl.FrameLoaderFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.frame.FrameLoaderFactory")
-    Dim names As Variant
-    names = oObj.getElementNames()
-    bCreateInstanceWithoutArguments = true
-    cServiceName = names(0)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/script.xlb b/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/script.xlb
deleted file mode 100644
index 104c95ef3f4e..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/FrameLoaderFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwl_FrameLoaderFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwl_FrameLoaderFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwl/PathSettings/fwl_PathSettings.xba b/qadevOOo/tests/basic/mod/fwl/PathSettings/fwl_PathSettings.xba
deleted file mode 100644
index fc72372c21e7..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/PathSettings/fwl_PathSettings.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwl_PathSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwl.PathSettings
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.framework.PathSettings")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwl/PathSettings/script.xlb b/qadevOOo/tests/basic/mod/fwl/PathSettings/script.xlb
deleted file mode 100644
index b6a40766d988..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/PathSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwl_PathSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwl_PathSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/fwl/TypeDetection/fwl_TypeDetection.xba b/qadevOOo/tests/basic/mod/fwl/TypeDetection/fwl_TypeDetection.xba
deleted file mode 100644
index e8d3765fe108..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/TypeDetection/fwl_TypeDetection.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="fwl_TypeDetection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' fwl.TypeDetection
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.document.TypeDetection")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/fwl/TypeDetection/script.xlb b/qadevOOo/tests/basic/mod/fwl/TypeDetection/script.xlb
deleted file mode 100644
index c2278d2ce37a..000000000000
--- a/qadevOOo/tests/basic/mod/fwl/TypeDetection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="fwl_TypeDetection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="fwl_TypeDetection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/BreakIterator/i18n_BreakIterator.xba b/qadevOOo/tests/basic/mod/i18n/BreakIterator/i18n_BreakIterator.xba
deleted file mode 100644
index b312c8f0eb64..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/BreakIterator/i18n_BreakIterator.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_BreakIterator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.i18n.XBreakIterator:
-Global oLocale As Object
-Global UnicodeString As String
-Global ScriptType(2, 1) As Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.BreakIterator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim _Locale As new com.sun.star.lang.Locale
-    _Locale.Country = "US"
-    _Locale.Language = "en"
-    oLocale = _Locale
-
-    oDoc = utils.loadTestDocument("Iterator.sxw")
-    UnicodeString = oDoc.Text.String
-
-    ScriptType(0, 0) =  1 : ScriptType(0, 1) = com.sun.star.i18n.ScriptType.LATIN
-    ScriptType(1, 0) = 12 : ScriptType(1, 1) = com.sun.star.i18n.ScriptType.LATIN
-    ScriptType(2, 0) = 50 : ScriptType(2, 1) = com.sun.star.i18n.ScriptType.LATIN
-
-    oObj = createUnoService("com.sun.star.i18n.BreakIterator")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/BreakIterator/script.xlb b/qadevOOo/tests/basic/mod/i18n/BreakIterator/script.xlb
deleted file mode 100644
index 33ec5c154b27..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/BreakIterator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_BreakIterator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_BreakIterator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/CalendarImpl/i18n_CalendarImpl.xba b/qadevOOo/tests/basic/mod/i18n/CalendarImpl/i18n_CalendarImpl.xba
deleted file mode 100644
index 6cd29daedb96..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/CalendarImpl/i18n_CalendarImpl.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_CalendarImpl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.CalendarImpl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.i18n.LocaleCalendar")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/CalendarImpl/script.xlb b/qadevOOo/tests/basic/mod/i18n/CalendarImpl/script.xlb
deleted file mode 100644
index 1b18e9675b43..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/CalendarImpl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_CalendarImpl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_CalendarImpl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/ChapterCollator/i18n_ChapterCollator.xba b/qadevOOo/tests/basic/mod/i18n/ChapterCollator/i18n_ChapterCollator.xba
deleted file mode 100644
index 1116a9a08a2c..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/ChapterCollator/i18n_ChapterCollator.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_ChapterCollator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.i18n.XCollator:
-  Global oLocal As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.ChapterCollator
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim allLocales As Object
-
-    bOK = true
-
-    oLocaleData = createUnoService("com.sun.star.i18n.LocaleData")
-    allLocales = oLocaleData.getAllInstalledLocaleNames()
-    Out.Log("Found " &amp; ubound(allLocales) &amp; " Locales registered in the system")
-    Randomize
-    oLocale = allLocales(rnd * ubound(allLocales))
-    Out.Log("Choose for testing : " &amp; oLocale.Country)
-
-    oObj = createUnoService("com.sun.star.i18n.ChapterCollator")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/ChapterCollator/script.xlb b/qadevOOo/tests/basic/mod/i18n/ChapterCollator/script.xlb
deleted file mode 100644
index 506e3a58b291..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/ChapterCollator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_ChapterCollator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_ChapterCollator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/CharacterClassification/i18n_CharacterClassification.xba b/qadevOOo/tests/basic/mod/i18n/CharacterClassification/i18n_CharacterClassification.xba
deleted file mode 100644
index 88a31605c2ff..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/CharacterClassification/i18n_CharacterClassification.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_CharacterClassification" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.CharacterClassification
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oObj = createUnoService("com.sun.star.i18n.CharacterClassification")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/CharacterClassification/script.xlb b/qadevOOo/tests/basic/mod/i18n/CharacterClassification/script.xlb
deleted file mode 100644
index 2f1ed0d41f20..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/CharacterClassification/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_CharacterClassification" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_CharacterClassification"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/Collator/i18n_Collator.xba b/qadevOOo/tests/basic/mod/i18n/Collator/i18n_Collator.xba
deleted file mode 100644
index 63510e3802a6..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/Collator/i18n_Collator.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_Collator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.i18n.XCollator:
-  Global oLocal As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.Collator
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim allLocales As Object
-
-    bOK = true
-
-    oLocaleData = createUnoService("com.sun.star.i18n.LocaleData")
-    allLocales = oLocaleData.getAllInstalledLocaleNames()
-    Out.Log("Found " &amp; ubound(allLocales) &amp; " Loacales registered in the system")
-    Randomize
-    oLocale = allLocales(rnd * ubound(allLocales))
-    Out.Log("Choose for testing : " &amp; oLocale.Country)
-
-    oObj = createUnoService("com.sun.star.i18n.Collator")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/Collator/script.xlb b/qadevOOo/tests/basic/mod/i18n/Collator/script.xlb
deleted file mode 100644
index 8bb3b3f5b951..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/Collator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_Collator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_Collator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/i18n_IndexEntrySupplier.xba b/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/i18n_IndexEntrySupplier.xba
deleted file mode 100644
index f8d50fe85ee8..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/i18n_IndexEntrySupplier.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_IndexEntrySupplier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.i18n.XIndexEntrySupplier:
-  Global oLocale As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.IndexEntrySupplier
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim allLocales As Variant
-
-    bOK = true
-
-    oObj = createUnoService("com.sun.star.i18n.IndexEntrySupplier")
-
-    oLocaleData = createUnoService("com.sun.star.i18n.LocaleData")
-    allLocales = oLocaleData.getAllInstalledLocaleNames()
-    Out.Log("Found " &amp; ubound(allLocales) &amp; " Loacales registered in the system")
-    Randomize
-    oLocale = allLocales(rnd * ubound(allLocales))
-    Out.Log("Choose for testing : " &amp; oLocale.Country)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/script.xlb b/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/script.xlb
deleted file mode 100644
index 91614bb9cc38..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/IndexEntrySupplier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_IndexEntrySupplier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_IndexEntrySupplier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/LocaleData/i18n_LocaleData.xba b/qadevOOo/tests/basic/mod/i18n/LocaleData/i18n_LocaleData.xba
deleted file mode 100644
index 621f091a4c35..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/LocaleData/i18n_LocaleData.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_LocaleData" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.LocaleData
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oObj = createUnoService("com.sun.star.i18n.LocaleData")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/LocaleData/script.xlb b/qadevOOo/tests/basic/mod/i18n/LocaleData/script.xlb
deleted file mode 100644
index 770adbff147c..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/LocaleData/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_LocaleData" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_LocaleData"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/i18n_NumberFormatCodeMapper.xba b/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/i18n_NumberFormatCodeMapper.xba
deleted file mode 100644
index 724ec8bc4392..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/i18n_NumberFormatCodeMapper.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_NumberFormatCodeMapper" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.NumberFormatCodeMapper
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-
-    oObj = createUNOService("com.sun.star.i18n.NumberFormatCodeMapper")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/script.xlb b/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/script.xlb
deleted file mode 100644
index 8e45fd58ec26..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/NumberFormatCodeMapper/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_NumberFormatCodeMapper" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_NumberFormatCodeMapper"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/TextSearch/i18n_TextSearch.xba b/qadevOOo/tests/basic/mod/i18n/TextSearch/i18n_TextSearch.xba
deleted file mode 100644
index 38f377430352..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/TextSearch/i18n_TextSearch.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_TextSearch" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.TextSearch
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim allLocales As Variant
-
-    bOK = true
-
-    oObj = createUnoService("com.sun.star.util.TextSearch")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/TextSearch/script.xlb b/qadevOOo/tests/basic/mod/i18n/TextSearch/script.xlb
deleted file mode 100644
index 3b1681a015e4..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/TextSearch/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_TextSearch" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_TextSearch"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/i18n/Transliteration/i18n_Transliteration.xba b/qadevOOo/tests/basic/mod/i18n/Transliteration/i18n_Transliteration.xba
deleted file mode 100644
index e956662887ba..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/Transliteration/i18n_Transliteration.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="i18n_Transliteration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.i18n.XTransliteration:
-  Global oLocale As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' i18n.Transliteration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oLocaleData As Object
-    Dim allLocales As Variant
-
-    bOK = true
-
-    oObj = createUnoService("com.sun.star.i18n.Transliteration")
-
-    oLocaleData = createUnoService("com.sun.star.i18n.LocaleData")
-    allLocales = oLocaleData.getAllInstalledLocaleNames()
-    Out.Log("Found " &amp; ubound(allLocales) &amp; " Loacales registered in the system")
-    Randomize
-    oLocale = allLocales(rnd * ubound(allLocales))
-    Out.Log("Choose for testing : " &amp; oLocale.Country)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/i18n/Transliteration/script.xlb b/qadevOOo/tests/basic/mod/i18n/Transliteration/script.xlb
deleted file mode 100644
index 0eba236b2239..000000000000
--- a/qadevOOo/tests/basic/mod/i18n/Transliteration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="i18n_Transliteration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="i18n_Transliteration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/implreg_uno_ImplementationRegistration.xba b/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/implreg_uno_ImplementationRegistration.xba
deleted file mode 100644
index 9b563413b4ac..000000000000
--- a/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/implreg_uno_ImplementationRegistration.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="implreg_uno_ImplementationRegistration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' impreg.ImplementationRegistration
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.registry.ImplementationRegistration")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/script.xlb b/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/script.xlb
deleted file mode 100644
index d784018576be..000000000000
--- a/qadevOOo/tests/basic/mod/implreg.uno/ImplementationRegistration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="implreg_uno_ImplementationRegistration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="implreg_uno_ImplementationRegistration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/impreg_ImplementationRegistration.xba b/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/impreg_ImplementationRegistration.xba
deleted file mode 100644
index 85f0af96a2ec..000000000000
--- a/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/impreg_ImplementationRegistration.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="impreg_ImplementationRegistration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' impreg.ImplementationRegistration
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.registry.ImplementationRegistration")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/script.xlb b/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/script.xlb
deleted file mode 100644
index 041877695463..000000000000
--- a/qadevOOo/tests/basic/mod/impreg/ImplementationRegistration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="impreg_ImplementationRegistration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="impreg_ImplementationRegistration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/insp/Introspection/insp_Introspection.xba b/qadevOOo/tests/basic/mod/insp/Introspection/insp_Introspection.xba
deleted file mode 100644
index f638f5970e89..000000000000
--- a/qadevOOo/tests/basic/mod/insp/Introspection/insp_Introspection.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="insp_Introspection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' insp.Introspection
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOservice("com.sun.star.beans.Introspection")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/insp/Introspection/script.xlb b/qadevOOo/tests/basic/mod/insp/Introspection/script.xlb
deleted file mode 100644
index b8e2293cb2ff..000000000000
--- a/qadevOOo/tests/basic/mod/insp/Introspection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="insp_Introspection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="insp_Introspection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/introspection.uno/Introspection/introspection_uno_Introspection.xba b/qadevOOo/tests/basic/mod/introspection.uno/Introspection/introspection_uno_Introspection.xba
deleted file mode 100644
index 828dc00fd3aa..000000000000
--- a/qadevOOo/tests/basic/mod/introspection.uno/Introspection/introspection_uno_Introspection.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="introspection_uno_Introspection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' insp.Introspection
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOservice("com.sun.star.beans.Introspection")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/introspection.uno/Introspection/script.xlb b/qadevOOo/tests/basic/mod/introspection.uno/Introspection/script.xlb
deleted file mode 100644
index 4ab217cb167d..000000000000
--- a/qadevOOo/tests/basic/mod/introspection.uno/Introspection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="introspection_uno_Introspection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="introspection_uno_Introspection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/inv/Invocation/inv_Invocation.xba b/qadevOOo/tests/basic/mod/inv/Invocation/inv_Invocation.xba
deleted file mode 100644
index 2c09dc234e10..000000000000
--- a/qadevOOo/tests/basic/mod/inv/Invocation/inv_Invocation.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="inv_Invocation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for lang.XSingleServiceFactory
-Global aArguments As Variant 
-' Array of arguments for createInstanceWithArguments()
-
-Global aMustSupportInterface As Variant 
-' Array of Strings with names of interfaces which
-' must be supported by created instance.
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' inv.Invocation
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.comp.stoc.Invocation")
-    
-    aArguments = Array(createUnoService("com.sun.star.io.Pipe"))
-    aMustSupportInterface = Array("com.sun.star.script.XInvocation")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/inv/Invocation/script.xlb b/qadevOOo/tests/basic/mod/inv/Invocation/script.xlb
deleted file mode 100644
index 2e4c535b3d39..000000000000
--- a/qadevOOo/tests/basic/mod/inv/Invocation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="inv_Invocation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="inv_Invocation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/invadp_InvocationAdapterFactory.xba b/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/invadp_InvocationAdapterFactory.xba
deleted file mode 100644
index 9c06686f88a5..000000000000
--- a/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/invadp_InvocationAdapterFactory.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="invadp_InvocationAdapterFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' invadp.InvocationAdapterFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.script.InvocationAdapterFactory")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/script.xlb b/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/script.xlb
deleted file mode 100644
index 63c430d94c45..000000000000
--- a/qadevOOo/tests/basic/mod/invadp/InvocationAdapterFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="invadp_InvocationAdapterFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="invadp_InvocationAdapterFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/invocadapt_uno_InvocationAdapterFactory.xba b/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/invocadapt_uno_InvocationAdapterFactory.xba
deleted file mode 100644
index d370b7fc71bd..000000000000
--- a/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/invocadapt_uno_InvocationAdapterFactory.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="invocadapt_uno_InvocationAdapterFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' invadp.InvocationAdapterFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.script.InvocationAdapterFactory")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/script.xlb b/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/script.xlb
deleted file mode 100644
index 19b4c1f42cd9..000000000000
--- a/qadevOOo/tests/basic/mod/invocadapt.uno/InvocationAdapterFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="invocadapt_uno_InvocationAdapterFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="invocadapt_uno_InvocationAdapterFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/invocation.uno/Invocation/invocation_uno_Invocation.xba b/qadevOOo/tests/basic/mod/invocation.uno/Invocation/invocation_uno_Invocation.xba
deleted file mode 100644
index 4fa55415d165..000000000000
--- a/qadevOOo/tests/basic/mod/invocation.uno/Invocation/invocation_uno_Invocation.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="invocation_uno_Invocation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for lang.XSingleServiceFactory
-Global aArguments As Variant 
-' Array of arguments for createInstanceWithArguments()
-
-Global aMustSupportInterface As Variant 
-' Array of Strings with names of interfaces which
-' must be supported by created instance.
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' inv.Invocation
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.comp.stoc.Invocation")
-    
-    aArguments = Array(createUnoService("com.sun.star.io.Pipe"))
-    aMustSupportInterface = Array("com.sun.star.script.XInvocation")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/invocation.uno/Invocation/script.xlb b/qadevOOo/tests/basic/mod/invocation.uno/Invocation/script.xlb
deleted file mode 100644
index 4f2e7692c27d..000000000000
--- a/qadevOOo/tests/basic/mod/invocation.uno/Invocation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="invocation_uno_Invocation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="invocation_uno_Invocation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/javaloader_uno_JavaComponentLoader.xba b/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/javaloader_uno_JavaComponentLoader.xba
deleted file mode 100644
index c806734d4964..000000000000
--- a/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/javaloader_uno_JavaComponentLoader.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="javaloader_uno_JavaComponentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global cImpLoader As String
-Global cImpURL As String
-Global cImpName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' javaloader.JavaComponentLoader
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.comp.stoc.JavaComponentLoader")
-    
-    cImpLoader = "com.sun.star.loader.JavaComponentLoader"
-    cImpURL = Path2URL(cTestDocsDir + "qadevlibs/MyPersistObjectImpl.jar")
-    cImpName = "com.sun.star.cmp.MyPersistObject"
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/script.xlb b/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/script.xlb
deleted file mode 100644
index e0b833c7e263..000000000000
--- a/qadevOOo/tests/basic/mod/javaloader.uno/JavaComponentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="javaloader_uno_JavaComponentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="javaloader_uno_JavaComponentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/javaloader_JavaComponentLoader.xba b/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/javaloader_JavaComponentLoader.xba
deleted file mode 100644
index c14d2698ba7c..000000000000
--- a/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/javaloader_JavaComponentLoader.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="javaloader_JavaComponentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global cImpLoader As String
-Global cImpURL As String
-Global cImpName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' javaloader.JavaComponentLoader
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.comp.stoc.JavaComponentLoader")
-    
-    cImpLoader = "com.sun.star.loader.JavaComponentLoader"
-    cImpURL = Path2URL(cTestDocsDir + "qadevlibs/MyPersistObjectImpl.jar")
-    cImpName = "com.sun.star.cmp.MyPersistObject"
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/script.xlb b/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/script.xlb
deleted file mode 100644
index db572f55727b..000000000000
--- a/qadevOOo/tests/basic/mod/javaloader/JavaComponentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="javaloader_JavaComponentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="javaloader_JavaComponentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/javavm_uno_JavaVirtualMachine.xba b/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/javavm_uno_JavaVirtualMachine.xba
deleted file mode 100644
index 2c0279d2ecc6..000000000000
--- a/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/javavm_uno_JavaVirtualMachine.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="javavm_uno_JavaVirtualMachine" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' To test this object we have to run JVM first
-
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' jen.JavaVirtualMachine
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.comp.stoc.JavaVirtualMachine")
-
-    if NOT oObj.isVMEnabled() then
-        Out.Log("JavaVirtualMaschine is NOT Enabled!!!")
-        Exit Sub
-    end if
-
-    if NOT oObj.isVMStarted() then
-        Out.Log("JVM not started. Try to start it first...")
-        createUNOService("com.sun.star.loader.Java2")
-        Out.Log("JVM was started - " &amp; oObj.isVMStarted())
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/script.xlb b/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/script.xlb
deleted file mode 100644
index 48b0f6f52c5d..000000000000
--- a/qadevOOo/tests/basic/mod/javavm.uno/JavaVirtualMachine/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="javavm_uno_JavaVirtualMachine" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="javavm_uno_JavaVirtualMachine"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/jdbc_JDBCDriver.xba b/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/jdbc_JDBCDriver.xba
deleted file mode 100644
index d8a031ad9188..000000000000
--- a/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/jdbc_JDBCDriver.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="jdbc_JDBCDriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' jdbc.JDBCDriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.JDBCDriver")
-
-    URL = jdbcUrl
-
-    Dim inf(2) As new com.sun.star.beans.PropertyValue
-    inf(0).Name = "user" : inf(0).Value = jdbcUser
-    inf(1).Name = "password" : inf(1).Value = jdbcPassword
-    inf(2).Name = "JavaDriverClass" : inf(2).Value = "org.gjt.mm.mysql.Driver"
-
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/script.xlb b/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/script.xlb
deleted file mode 100644
index 9a68866b71da..000000000000
--- a/qadevOOo/tests/basic/mod/jdbc/JDBCDriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="jdbc_JDBCDriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="jdbc_JDBCDriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/jen_JavaVirtualMachine.xba b/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/jen_JavaVirtualMachine.xba
deleted file mode 100644
index 47bea5de3c8b..000000000000
--- a/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/jen_JavaVirtualMachine.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="jen_JavaVirtualMachine" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-' To test this object we have to run JVM first
-
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' jen.JavaVirtualMachine
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.comp.stoc.JavaVirtualMachine")
-
-    if NOT oObj.isVMEnabled() then
-        Out.Log("JavaVirtualMaschine is NOT Enabled!!!")
-        Exit Sub
-    end if
-
-    if NOT oObj.isVMStarted() then
-        Out.Log("JVM not started. Try to start it first...")
-        createUNOService("com.sun.star.loader.Java2")
-        Out.Log("JVM was started - " &amp; oObj.isVMStarted())
-    end if
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/script.xlb b/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/script.xlb
deleted file mode 100644
index ccc779c3c845..000000000000
--- a/qadevOOo/tests/basic/mod/jen/JavaVirtualMachine/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="jen_JavaVirtualMachine" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="jen_JavaVirtualMachine"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lng/DicList/lng_DicList.xba b/qadevOOo/tests/basic/mod/lng/DicList/lng_DicList.xba
deleted file mode 100644
index 27aeace995b7..000000000000
--- a/qadevOOo/tests/basic/mod/lng/DicList/lng_DicList.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lng_DicList" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lng.DicList
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oDic As Object
-    Dim oDic2 As Object
-    Dim vLocale As New com.sun.star.lang.Locale
-
-    bOK = true
-
-    vLocale.Language = "en"
-    vLocale.Country = "US"
-    vLocale.Variant = "WIN"
-
-    ' Insert object creation code here...
-
-    oObj = createUnoService("com.sun.star.lingu2.DicList")
-
-    ' creating a user defined dictionary for XSearchableDictionaryList
-
-    oObj.removeDictionary(oObj.getDictionaryByName("MyDictionary"))
-    oDic = oObj.createDictionary("NegativDic",vLocale,_
-                        com.sun.star.linguistic2.DictionaryType.NEGATIVE, "")
-    oDic2 = oObj.createDictionary("PositiveDic",vLocale,_
-                        com.sun.star.linguistic2.DictionaryType.POSITIVE, "")
-    oDic2.add("Positive", false, "")
-    oDic.add("Negative", true, "")
-    oObj.addDictionary(oDic)
-    oObj.addDictionary(oDic2)
-    oDic.setActive(true)
-    oDic2.setActive(true)
-
-    oComponentInstance = oObj
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lng/DicList/script.xlb b/qadevOOo/tests/basic/mod/lng/DicList/script.xlb
deleted file mode 100644
index 78260ca2ac31..000000000000
--- a/qadevOOo/tests/basic/mod/lng/DicList/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lng_DicList" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lng_DicList"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lng/LinguProps/lng_LinguProps.xba b/qadevOOo/tests/basic/mod/lng/LinguProps/lng_LinguProps.xba
deleted file mode 100644
index c7a6ae9a5d94..000000000000
--- a/qadevOOo/tests/basic/mod/lng/LinguProps/lng_LinguProps.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lng_LinguProps" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lng.LinguProps
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.linguistic2.LinguProperties")
-    oComponentInstance = createUnoService("com.sun.star.linguistic2.LinguProperties")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lng/LinguProps/script.xlb b/qadevOOo/tests/basic/mod/lng/LinguProps/script.xlb
deleted file mode 100644
index fd747fc2dde0..000000000000
--- a/qadevOOo/tests/basic/mod/lng/LinguProps/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lng_LinguProps" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lng_LinguProps"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lng/LngSvcMgr/lng_LngSvcMgr.xba b/qadevOOo/tests/basic/mod/lng/LngSvcMgr/lng_LngSvcMgr.xba
deleted file mode 100644
index 70d406def0fc..000000000000
--- a/qadevOOo/tests/basic/mod/lng/LngSvcMgr/lng_LngSvcMgr.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lng_LngSvcMgr" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lng.LngSvcMgr
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.linguistic2.LinguServiceManager")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lng/LngSvcMgr/script.xlb b/qadevOOo/tests/basic/mod/lng/LngSvcMgr/script.xlb
deleted file mode 100644
index 94a10ab5f22b..000000000000
--- a/qadevOOo/tests/basic/mod/lng/LngSvcMgr/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lng_LngSvcMgr" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lng_LngSvcMgr"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lnn/Hyphenator/lnn_Hyphenator.xba b/qadevOOo/tests/basic/mod/lnn/Hyphenator/lnn_Hyphenator.xba
deleted file mode 100644
index b6e6c0be7744..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/Hyphenator/lnn_Hyphenator.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lnn_Hyphenator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lnn.Hyphenator
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.linguistic2.Hyphenator")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lnn/Hyphenator/script.xlb b/qadevOOo/tests/basic/mod/lnn/Hyphenator/script.xlb
deleted file mode 100644
index ac0d1ff48be1..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/Hyphenator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lnn_Hyphenator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lnn_Hyphenator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lnn/SpellChecker/lnn_SpellChecker.xba b/qadevOOo/tests/basic/mod/lnn/SpellChecker/lnn_SpellChecker.xba
deleted file mode 100644
index 4afb7eb5a0b8..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/SpellChecker/lnn_SpellChecker.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lnn_SpellChecker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lnn.SpellChecker
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.linguistic2.SpellChecker")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lnn/SpellChecker/script.xlb b/qadevOOo/tests/basic/mod/lnn/SpellChecker/script.xlb
deleted file mode 100644
index 649d2228e69b..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/SpellChecker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lnn_SpellChecker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lnn_SpellChecker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/lnn/Thesaurus/lnn_Thesaurus.xba b/qadevOOo/tests/basic/mod/lnn/Thesaurus/lnn_Thesaurus.xba
deleted file mode 100644
index 624d0a04a1d0..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/Thesaurus/lnn_Thesaurus.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="lnn_Thesaurus" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' lnn.Thesaurus
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.linguistic2.Thesaurus")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/lnn/Thesaurus/script.xlb b/qadevOOo/tests/basic/mod/lnn/Thesaurus/script.xlb
deleted file mode 100644
index 73e702b69b8e..000000000000
--- a/qadevOOo/tests/basic/mod/lnn/Thesaurus/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="lnn_Thesaurus" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="lnn_Thesaurus"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/mcnttype_MimeContentTypeFactory.xba b/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/mcnttype_MimeContentTypeFactory.xba
deleted file mode 100644
index 596831c9b3bc..000000000000
--- a/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/mcnttype_MimeContentTypeFactory.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="mcnttype_MimeContentTypeFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' mcnttype.MimeContentTypeFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.datatransfer.MimeContentTypeFactory")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/script.xlb b/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/script.xlb
deleted file mode 100644
index bdafdf64beb3..000000000000
--- a/qadevOOo/tests/basic/mod/mcnttype/MimeContentTypeFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="mcnttype_MimeContentTypeFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="mcnttype_MimeContentTypeFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/mozab/MozabDriver/mozab_MozabDriver.xba b/qadevOOo/tests/basic/mod/mozab/MozabDriver/mozab_MozabDriver.xba
deleted file mode 100644
index f15577a2b910..000000000000
--- a/qadevOOo/tests/basic/mod/mozab/MozabDriver/mozab_MozabDriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="mozab_MozabDriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' mozab.MozabDriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.MozabDriver")
-
-    URL = mozabUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/mozab/MozabDriver/script.xlb b/qadevOOo/tests/basic/mod/mozab/MozabDriver/script.xlb
deleted file mode 100644
index d69d6176afdd..000000000000
--- a/qadevOOo/tests/basic/mod/mozab/MozabDriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="mozab_MozabDriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="mozab_MozabDriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/namingservice_uno_NamingService.xba b/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/namingservice_uno_NamingService.xba
deleted file mode 100644
index bcd63a1ae16d..000000000000
--- a/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/namingservice_uno_NamingService.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="namingservice_uno_NamingService" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XNamingService
- Global oObjectToRegister As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' namingservice.NamingService
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.uno.NamingService")
-    oObjectToRegister = createUNOService("com.sun.star.lang.ServiceManager")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/script.xlb b/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/script.xlb
deleted file mode 100644
index 58b5bd8cb372..000000000000
--- a/qadevOOo/tests/basic/mod/namingservice.uno/NamingService/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="namingservice_uno_NamingService" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="namingservice_uno_NamingService"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/namingservice/NamingService/namingservice_NamingService.xba b/qadevOOo/tests/basic/mod/namingservice/NamingService/namingservice_NamingService.xba
deleted file mode 100644
index 9ff3065b86eb..000000000000
--- a/qadevOOo/tests/basic/mod/namingservice/NamingService/namingservice_NamingService.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="namingservice_NamingService" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XNamingService
- Global oObjectToRegister As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' namingservice.NamingService
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.uno.NamingService")
-    oObjectToRegister = createUNOService("com.sun.star.lang.ServiceManager")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/namingservice/NamingService/script.xlb b/qadevOOo/tests/basic/mod/namingservice/NamingService/script.xlb
deleted file mode 100644
index 502c319672a2..000000000000
--- a/qadevOOo/tests/basic/mod/namingservice/NamingService/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="namingservice_NamingService" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="namingservice_NamingService"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/nestedreg_uno_NestedRegistry.xba b/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/nestedreg_uno_NestedRegistry.xba
deleted file mode 100644
index 8ad17d7dfe0c..000000000000
--- a/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/nestedreg_uno_NestedRegistry.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="nestedreg_uno_NestedRegistry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XInitialization
-Global aInitArgs As Variant
-
-Global oReg1 As Object
-Global oReg2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' defreg.NestedRegistry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim cURL1 As String
-    Dim cURL2 As String
-
-    oObj = createUnoService("com.sun.star.registry.NestedRegistry")
-
-    oReg1 = createUnoService("com.sun.star.registry.SimpleRegistry")
-    oReg2 = createUnoService("com.sun.star.registry.SimpleRegistry")
-    cURL1 = utils.getTempFileURL("BAS_forNestedRegistry1.rdb")
-    cURL2 = utils.getTempFileURL("BAS_forNestedRegistry2.rdb")
-
-    if FileExists(cURL1) then
-        kill(cURL1)
-    end if
-
-    if FileExists(cURL2) then
-        kill(cURL2)
-    end if
-
-    oReg1.open(cURL1, true, true)
-    oReg2.open(cURL2, false, true)
-
-    Dim aArgs(1) As Object
-    aArgs(0) = oReg1
-    aArgs(1) = oReg2
-
-    aInitArgs = aArgs()
-    
-    oObj.initialize(aInitArgs())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oReg1.close()
-    oReg2.close()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/script.xlb b/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/script.xlb
deleted file mode 100644
index 0364e36368b5..000000000000
--- a/qadevOOo/tests/basic/mod/nestedreg.uno/NestedRegistry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="nestedreg_uno_NestedRegistry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="nestedreg_uno_NestedRegistry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/odbc/ODBCDriver/odbc_ODBCDriver.xba b/qadevOOo/tests/basic/mod/odbc/ODBCDriver/odbc_ODBCDriver.xba
deleted file mode 100644
index 0641b2e47246..000000000000
--- a/qadevOOo/tests/basic/mod/odbc/ODBCDriver/odbc_ODBCDriver.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="odbc_ODBCDriver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for sdbc.XDriver
-Global URL as String
-Global info As Variant
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' odbc.ODBCDriver
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sdbc.ODBCDriver")
-
-    URL = odbcUrl
-
-    Dim inf(0) As new com.sun.star.beans.PropertyValue
-    info = inf()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/odbc/ODBCDriver/script.xlb b/qadevOOo/tests/basic/mod/odbc/ODBCDriver/script.xlb
deleted file mode 100644
index 079fa0e2e137..000000000000
--- a/qadevOOo/tests/basic/mod/odbc/ODBCDriver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="odbc_ODBCDriver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="odbc_ODBCDriver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_ProxyFactory.xba b/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_ProxyFactory.xba
deleted file mode 100644
index 504d2f79ed59..000000000000
--- a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_ProxyFactory.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="proxyfac_ProxyFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' proxyfac.ProxyFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.reflection.ProxyFactory")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_uno_ProxyFactory.xba b/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_uno_ProxyFactory.xba
deleted file mode 100644
index c5b82d26730b..000000000000
--- a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/proxyfac_uno_ProxyFactory.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="proxyfac_uno_ProxyFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' proxyfac.ProxyFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.reflection.ProxyFactory")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/script.xlb b/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/script.xlb
deleted file mode 100644
index 9347b77b091a..000000000000
--- a/qadevOOo/tests/basic/mod/proxyfac.uno/ProxyFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="proxyfac_uno_ProxyFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="proxyfac_uno_ProxyFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/proxyfac_ProxyFactory.xba b/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/proxyfac_ProxyFactory.xba
deleted file mode 100644
index 504d2f79ed59..000000000000
--- a/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/proxyfac_ProxyFactory.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="proxyfac_ProxyFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' proxyfac.ProxyFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.reflection.ProxyFactory")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/script.xlb b/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/script.xlb
deleted file mode 100644
index 6409722182a9..000000000000
--- a/qadevOOo/tests/basic/mod/proxyfac/ProxyFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="proxyfac_ProxyFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="proxyfac_ProxyFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/proxyset_SOffice52ProxySettings.xba b/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/proxyset_SOffice52ProxySettings.xba
deleted file mode 100644
index 93c228c9e5e0..000000000000
--- a/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/proxyset_SOffice52ProxySettings.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="proxyset_SOffice52ProxySettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' proxyset.SOffice52ProxySettings
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.system.SOffice52ProxySettings")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/script.xlb b/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/script.xlb
deleted file mode 100644
index dcea633df74f..000000000000
--- a/qadevOOo/tests/basic/mod/proxyset/SOffice52ProxySettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="proxyset_SOffice52ProxySettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="proxyset_SOffice52ProxySettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/proxyset_SystemProxySettings.xba b/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/proxyset_SystemProxySettings.xba
deleted file mode 100644
index 3a0c9c414bda..000000000000
--- a/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/proxyset_SystemProxySettings.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="proxyset_SystemProxySettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' proxyset.SystemProxySettings
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.system.SystemProxySettings")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/script.xlb b/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/script.xlb
deleted file mode 100644
index 1d816d0e69d0..000000000000
--- a/qadevOOo/tests/basic/mod/proxyset/SystemProxySettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="proxyset_SystemProxySettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="proxyset_SystemProxySettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/rdbtdp_RegistryTypeDescriptionProvider.xba b/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/rdbtdp_RegistryTypeDescriptionProvider.xba
deleted file mode 100644
index 046e71f73d02..000000000000
--- a/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/rdbtdp_RegistryTypeDescriptionProvider.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="rdbtdp_RegistryTypeDescriptionProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' rdbtdp.RegistryTypeDescriptionProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim smgr As Object, context As Object, tdmgr As Object
-    Dim tdmgrEnum As Object
-
-    oObj = createUNOService("com.sun.star.comp.stoc.ORegistryServiceManager")
-    
-    context = oObj.getPropertyValue("DefaultContext")
-    tdmgr = context.getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager")
-
-    tdmgrEnum = tdmgr.createEnumeration()
-    
-    oObj = tdmgrEnum.nextElement()
-    
-    oComponentInstance = tdmgrEnum.nextElement()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/script.xlb b/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/script.xlb
deleted file mode 100644
index f6b31b98c4f3..000000000000
--- a/qadevOOo/tests/basic/mod/rdbtdp/RegistryTypeDescriptionProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="rdbtdp_RegistryTypeDescriptionProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="rdbtdp_RegistryTypeDescriptionProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/regtypeprov_uno_RegistryTypeDescriptionProvider.xba b/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/regtypeprov_uno_RegistryTypeDescriptionProvider.xba
deleted file mode 100644
index 391e49f5d03c..000000000000
--- a/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/regtypeprov_uno_RegistryTypeDescriptionProvider.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="regtypeprov_uno_RegistryTypeDescriptionProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' rdbtdp.RegistryTypeDescriptionProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim smgr As Object, context As Object, tdmgr As Object
-    Dim tdmgrEnum As Object
-
-    oObj = createUNOService("com.sun.star.comp.stoc.ORegistryServiceManager")
-    
-    context = oObj.getPropertyValue("DefaultContext")
-    tdmgr = context.getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager")
-
-    tdmgrEnum = tdmgr.createEnumeration()
-    
-    oObj = tdmgrEnum.nextElement()
-    
-    oComponentInstance = tdmgrEnum.nextElement()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/script.xlb b/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/script.xlb
deleted file mode 100644
index 00a836dff3e7..000000000000
--- a/qadevOOo/tests/basic/mod/regtypeprov.uno/RegistryTypeDescriptionProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="regtypeprov_uno_RegistryTypeDescriptionProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="regtypeprov_uno_RegistryTypeDescriptionProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/remotebridge.uno/various/remotebridge_uno_various.xba b/qadevOOo/tests/basic/mod/remotebridge.uno/various/remotebridge_uno_various.xba
deleted file mode 100644
index 8533660ce26a..000000000000
--- a/qadevOOo/tests/basic/mod/remotebridge.uno/various/remotebridge_uno_various.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="remotebridge_uno_various" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs(3) As Variant
-  Global aNoInit()
-
-' Required for  com.sun.star.bridge.XBridge:
-  Global sBridgeName As String
-  Global sConnectionString As String
-
-Dim xConnection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' remotebridge.various
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim protocol As String
-    Dim iPos1 As Integer
-    Dim iPos2 As Integer
-
-    oObj = createUNOService("com.sun.star.bridge.Bridge")
-    oComponentInstance = createUNOService("com.sun.star.bridge.Bridge")
-
-    sBridgeName = "remotebridge"
-    protocol = "urp"
-    xConnection = createUNOService("com.sun.star.connection.Connector")
-
-    iPos1 = inStr(CNCSTR, "socket")
-    iPos2 = inStr(iPos1, CNCSTR, ";")
-    sConnectionString = mid(CNCSTR, iPos1, iPos2 - iPos1)
-    Out.Log("Creating connection with parameters: " + sConnectionString)
-    xConnection = xConnection.Connect(sConnectionString)
-
-    aInitArgs(0) = sBridgeName
-    aInitArgs(1) = protocol
-    aInitArgs(2) = xConnection
-    aInitArgs(3) = ""
-    
-    oObj.initialize(aInitArgs())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    Out.Log("Disposing object...")
-    utils.closeObject(oObj)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/remotebridge.uno/various/script.xlb b/qadevOOo/tests/basic/mod/remotebridge.uno/various/script.xlb
deleted file mode 100644
index 06f251ba787f..000000000000
--- a/qadevOOo/tests/basic/mod/remotebridge.uno/various/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="remotebridge_uno_various" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="remotebridge_uno_various"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/remotebridge/various/remotebridge_various.xba b/qadevOOo/tests/basic/mod/remotebridge/various/remotebridge_various.xba
deleted file mode 100644
index 97871221fc93..000000000000
--- a/qadevOOo/tests/basic/mod/remotebridge/various/remotebridge_various.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="remotebridge_various" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs(3) As Variant
-  Global aNoInit()
-
-' Required for  com.sun.star.bridge.XBridge:
-  Global sBridgeName As String
-  Global sConnectionString As String
-
-Dim xConnection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' remotebridge.various
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim protocol As String
-    Dim iPos1 As Integer
-    Dim iPos2 As Integer
-
-    oObj = createUNOService("com.sun.star.bridge.Bridge")
-    oComponentInstance = createUNOService("com.sun.star.bridge.Bridge")
-
-    sBridgeName = "remotebridge"
-    protocol = "urp"
-    xConnection = createUNOService("com.sun.star.connection.Connector")
-
-    iPos1 = inStr(CNCSTR, "socket")
-    iPos2 = inStr(iPos1, CNCSTR, ";")
-    sConnectionString = mid(CNCSTR, iPos1, iPos2 - iPos1)
-    Out.Log("Creating connection with parameters: " + sConnectionString)
-    xConnection = xConnection.Connect(sConnectionString)
-
-    aInitArgs(0) = sBridgeName
-    aInitArgs(1) = protocol
-    aInitArgs(2) = xConnection
-    aInitArgs(3) = ""
-    
-    oObj.initialize(aInitArgs())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    Out.Log("Disposing object...")
-    if (NOT isNULL(xConnection)) then
-        xConnection.close()
-    end if
-    oObj.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/remotebridge/various/script.xlb b/qadevOOo/tests/basic/mod/remotebridge/various/script.xlb
deleted file mode 100644
index bcea53bcdf0b..000000000000
--- a/qadevOOo/tests/basic/mod/remotebridge/various/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="remotebridge_various" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="remotebridge_various"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/sc_AccessibleEditableTextPara_HeaderFooter.xba b/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/sc_AccessibleEditableTextPara_HeaderFooter.xba
deleted file mode 100644
index e2cdce0cb2b5..000000000000
--- a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/sc_AccessibleEditableTextPara_HeaderFooter.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_AccessibleEditableTextPara_HeaderFooter" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::accessibility::XAccessibleEditableText#optional"
- ' needs the following Global variables:
-global hasChangeableAttrs as boolean
-
-' "com::sun::star::accessibility::XAccessibleSelection#optional"
- ' needs the following Global variables:
-'	Global multiSelection As Boolean
-
-' "com::sun::star::accessibility::XAccessibleText"
- ' needs the following Global variables:
-global accText as String
-Global readOnly as Boolean
-
-Global accButton as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.sc.AccessibleEditableTextPara_HeaderFooter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    thRunner.initialize(Array("OpenToolkitDialog",".uno:EditHeaderAndFooter",oDoc))
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-'    utils.at_printAccessibleTree(xRoot)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-             com.sun.star.accessibility.AccessibleRole.PARAGRAPH,"Paragraph 0")
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, _
-             com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")             
-    accText = "My AccessibleEditableTextPara_HeaderFooter text"
-    oObj.setText(accText)
-    readOnly = false
-    
-    hasChangeableAttrs = false
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim myText as String
-    myText = oObj.getText()
-    oObj.setText(myText + "dummy")
-    wait(1000)
-    oObj.setText(myText)
-    wait(1000)
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/script.xlb b/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/script.xlb
deleted file mode 100644
index 3b36862130f2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_HeaderFooter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_AccessibleEditableTextPara_HeaderFooter" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sc_AccessibleEditableTextPara_HeaderFooter"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/sc_AccessibleEditableTextPara_PreviewCell.xba b/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/sc_AccessibleEditableTextPara_PreviewCell.xba
deleted file mode 100644
index c844bc7a607d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/sc_AccessibleEditableTextPara_PreviewCell.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_AccessibleEditableTextPara_PreviewCell" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::accessibility::XAccessibleEventBroadcaster"
- ' needs the following Global variables:
-
-' "com::sun::star::accessibility::XAccessibleEditableText#optional"
- ' needs the following Global variables:
- ' global hasChangeableAttrs as boolean
-
-' "com::sun::star::accessibility::XAccessibleSelection#optional"
- ' needs the following Global variables:
- ' Global multiSelection As Boolean
-
-' "com::sun::star::accessibility::XAccessibleText"
- ' needs the following Global variables:
-Global accText as String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.sc.AccessibleEditableTextPara_PreviewCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-
-    accText = "ScAccessibleEditableTextPara_PreviewCell"
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula(accText)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        ' get the  first cell
-        xRoot = utils.at_getAccessibleObjectForRole(xRoot, _
-             com.sun.star.accessibility.AccessibleRole.TABLE_CELL,"Cell A1")
-        ' the the Paragraph
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-             com.sun.star.accessibility.AccessibleRole.PARAGRAPH,"Paragraph 0")
-        utils.at_printAccessibleTree(xRoot)
-        readOnly = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-Sub fireEvent()
-    Dim dispatcher as Object
-    dispatcher = createUnoService("com.sun.star.frame.DispatchHelper")
-    
-    rem ----------------------------------------------------------------------
-    dispatcher.executeDispatch(oDoc.CurrentController.Frame, ".uno:ZoomIn", "", 0, Array())
-    wait(500)
-    rem ----------------------------------------------------------------------
-    dispatcher.executeDispatch(oDoc.CurrentController.Frame, ".uno:ZoomOut", "", 0, Array())
-end Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/script.xlb b/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/script.xlb
deleted file mode 100644
index 8c7e38f9c97c..000000000000
--- a/qadevOOo/tests/basic/mod/sc/AccessibleEditableTextPara_PreviewCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_AccessibleEditableTextPara_PreviewCell" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sc_AccessibleEditableTextPara_PreviewCell"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/sc_ScAccessibleCell.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/sc_ScAccessibleCell.xba
deleted file mode 100644
index ea0312ef25e3..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/sc_ScAccessibleCell.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object
-    Dim xRoot As Object, xCell As Object
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    accText = "Testing object sc.ScAccessibleCell"
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(1,0)
-    xCell.setFormula(accText)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE_CELL,"B1")
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/script.xlb
deleted file mode 100644
index bcaaedb7e755..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/sc_ScAccessibleCsvCell.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/sc_ScAccessibleCsvCell.xba
deleted file mode 100644
index 200bd87b790a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/sc_ScAccessibleCsvCell.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleCsvCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleCsvCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object, oParent As Object
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    thRunner.initialize(Array("OpenDialogFromFile","10test.csv"))
-    wait(3000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oParent = utils.at_getAccessibleObjectForRole(xRoot,_
-                                com.sun.star.accessibility.AccessibleRole.TABLE)
-    oObj = oParent.getAccessibleChild(3).getAccessibleContext()
-    Out.Log("Child: "+oObj.getAccessibleName())
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-    accButton = utils.at_getAccessibleObjectForRole(xRoot,_
-                 com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    accText = oObj.getText()
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-   if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/script.xlb
deleted file mode 100644
index a60430d23b5c..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleCsvCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleCsvCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/sc_ScAccessibleCsvGrid.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/sc_ScAccessibleCsvGrid.xba
deleted file mode 100644
index 66dc29ca3dd2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/sc_ScAccessibleCsvGrid.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleCsvGrid" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleCsvGrid
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    thRunner.initialize(Array("OpenDialogFromFile","10test.csv"))
-    wait(3000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE)
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    multiSelection = false
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-   if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-   End If
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/script.xlb
deleted file mode 100644
index c01906dc9cf7..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvGrid/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleCsvGrid" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleCsvGrid"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/sc_ScAccessibleCsvRuler.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/sc_ScAccessibleCsvRuler.xba
deleted file mode 100644
index 4e3ad1e21c18..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/sc_ScAccessibleCsvRuler.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleCsvRuler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleCsvRuler
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object, accRB As Object
-
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    thRunner.initialize(Array("OpenDialogFromFile","10test.csv"))
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    accButton = utils.at_getAccessibleObjectForRole(xRoot,_
-                 com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    accRB = utils.at_getAccessibleObjectForRole(xRoot,_
-                 com.sun.star.accessibility.AccessibleRole.RADIO_BUTTON,"Fixed")
-    accRB.doAccessibleAction(0)
-    wait(1000)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot,_
-                         com.sun.star.accessibility.AccessibleRole.TEXT,"Ruler")
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-    accText = oObj.getText()
-    Out.Log("Text: "+accText)
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-   if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-   End If
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/script.xlb
deleted file mode 100644
index 976e91250eb7..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleCsvRuler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleCsvRuler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleCsvRuler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/sc_ScAccessibleDocument.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/sc_ScAccessibleDocument.xba
deleted file mode 100644
index 743c8ea54c77..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/sc_ScAccessibleDocument.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oWin As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-    multiSelection = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    oWin.setFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/script.xlb
deleted file mode 100644
index 2ac95235aea5..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/sc_ScAccessibleDocumentPagePreview.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/sc_ScAccessibleDocumentPagePreview.xba
deleted file mode 100644
index 782145294bfa..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/sc_ScAccessibleDocumentPagePreview.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleDocumentPagePreview" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global win As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleDocumentPagePreview
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(1).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessibleDocumentPagePreview - Page 2")
-    xCell = oDoc.getSheets().getByIndex(2).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessibleDocumentPagePreview - Page 3")
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessibleDocumentPagePreview - Page 1")
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-        win = oDoc.getCurrentController().getFrame().getComponentWindow()
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim oRect As New com.sun.star.awt.Rectangle
-    oRect = win.getPosSize()
-    win.setPosSize(oRect.X,oRect.Y,oRect.Height-1,oRect.Width-1,15)
-    win.setPosSize(oRect.X,oRect.Y,oRect.Height,oRect.Width,15)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/script.xlb
deleted file mode 100644
index 05863e0ea819..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleDocumentPagePreview/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleDocumentPagePreview" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleDocumentPagePreview"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/sc_ScAccessiblePageHeader.xba b/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/sc_ScAccessiblePageHeader.xba
deleted file mode 100644
index 44b3b4c29039..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/sc_ScAccessiblePageHeader.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessiblePageHeader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cLeft As Object
-Global cRight As Object
-Global cCenter As Object
-Global oStyle As Object
-Global RPHC2 As Object
-Global textIndex As Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessiblePageHeader
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-    Dim RPHC As Variant
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessiblePageHeader")
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.HEADER)
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-    oStyle = oDoc.getStyleFamilies().getByName("PageStyles").getByName("Default")
-    RPHC = oStyle.getPropertyValue("RightPageHeaderContent")
-    RPHC2 = RPHC
-    cLeft = RPHC2.getLeftText()
-    cRight = RPHC2.getRightText()
-    cCenter = RPHC2.getCenterText()    
-    textIndex = 0
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    cLeft.setString("LEFT"+textIndex)
-    cRight.setString("RIGHT"+textIndex)
-    cCenter.setString("CENTER"+textIndex)
-    oStyle.setPropertyValue("RightPageHeaderContent",RPHC2)
-    textIndex = textIndex + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/script.xlb
deleted file mode 100644
index a89b24f86daa..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessiblePageHeader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessiblePageHeader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/sc_ScAccessiblePageHeaderArea.xba b/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/sc_ScAccessiblePageHeaderArea.xba
deleted file mode 100644
index 71479b48e379..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/sc_ScAccessiblePageHeaderArea.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessiblePageHeaderArea" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessiblePageHeaderArea
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xCell As Object, xController As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-    Dim stateSet As Object
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessiblePageHeaderArea")
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.HEADER).getAccessibleChild(0)
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-
-    stateSet = oObj.getAccessibleStateSet()
-    if (stateSet.contains(27)) then
-         Out.Log("Object is transient.")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/script.xlb
deleted file mode 100644
index c71e58e7d86f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePageHeaderArea/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessiblePageHeaderArea" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessiblePageHeaderArea"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/sc_ScAccessiblePreviewCell.xba b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/sc_ScAccessiblePreviewCell.xba
deleted file mode 100644
index 751e01e71482..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/sc_ScAccessiblePreviewCell.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessiblePreviewCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessiblePreviewCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessiblePreviewCell")
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE_CELL)
-        multiSelection = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/script.xlb
deleted file mode 100644
index 334b9b6d9de2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessiblePreviewCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessiblePreviewCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/sc_ScAccessiblePreviewHeaderCell.xba b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/sc_ScAccessiblePreviewHeaderCell.xba
deleted file mode 100644
index 1c7c54a23160..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/sc_ScAccessiblePreviewHeaderCell.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessiblePreviewHeaderCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessiblePreviewHeaderCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-    Dim oStyle As Object
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessiblePreviewHeaderCell")
-    oStyle = oDoc.getStyleFamilies().getByName("PageStyles").getByName("Default")
-    oStyle.setPropertyValue("PrintHeaders",true)
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE_CELL,"A")
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        multiSelection = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/script.xlb
deleted file mode 100644
index daf4facec606..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewHeaderCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessiblePreviewHeaderCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessiblePreviewHeaderCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/sc_ScAccessiblePreviewTable.xba b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/sc_ScAccessiblePreviewTable.xba
deleted file mode 100644
index 79c406d08113..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/sc_ScAccessiblePreviewTable.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessiblePreviewTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessiblePreviewTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, xCell As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, oWin As Object
-    Dim noProps()
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(0,0)
-    xCell.setFormula("ScAccessiblePreviewTable")
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = utils.at_getCurrentWindow(oDoc)
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE)
-        multiSelection = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-        Exit Sub
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/script.xlb
deleted file mode 100644
index 15fe7ccbcc7e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessiblePreviewTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessiblePreviewTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessiblePreviewTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/sc_ScAccessibleSpreadsheet.xba b/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/sc_ScAccessibleSpreadsheet.xba
deleted file mode 100644
index 26a4030d0eed..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/sc_ScAccessibleSpreadsheet.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAccessibleSpreadsheet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Global xCell As Object
-Global evId As Integer
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAccessibleSpreadsheet
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.createDocument("scalc",cObjectName)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE)
-    xCell = oDoc.getSheets().getByIndex(0).getCellByPosition(2,2)
-    xCell.setFormula("ScAccessibleSpreadsheet")
-    evId = 1
-    multiSelection = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oDoc.dispose()
-End Sub
-
-Sub fireEvent()
-    Dim outStr As String
-    outStr = " "+evId+" event(s) fired"
-    xCell.setFormula(outStr)
-    evId = evId + 1
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/script.xlb
deleted file mode 100644
index 2ba52eec6917..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAccessibleSpreadsheet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAccessibleSpreadsheet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAccessibleSpreadsheet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/sc_ScAnnotationObj.xba b/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/sc_ScAnnotationObj.xba
deleted file mode 100644
index 4429028264f1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/sc_ScAnnotationObj.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAnnotationObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAnnotationObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet, oCell As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(1,1)
-    oObj = oCell.Annotation
-    oObj.setString("sheet_XSheetAnnotation")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/script.xlb
deleted file mode 100644
index 74cb4fa7e3f9..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAnnotationObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAnnotationObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAnnotationObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/sc_ScAnnotationsObj.xba b/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/sc_ScAnnotationsObj.xba
deleted file mode 100644
index 7543de57f267..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/sc_ScAnnotationsObj.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAnnotationsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAnnotationsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet as Object, oCell1 as Object, oCell2 as Object
-	Dim oAnno1 as Object, oAnno2 As Object
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    Out.Log("Creating two annotations...")
-    
-    oCell1 = oSheet.getCellByPosition(3, 5)
-    oAnno1 = oCell1.Annotation
-    oAnno1.setString("ScAnnotationsObj Anno 1")
-
-    oCell2 = oSheet.getCellByPosition(3, 6)
-    oAnno2 = oCell2.Annotation
-    oAnno2.setString("ScAnnotationsObj Anno 2")
-
-    oObj = oSheet.Annotations
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/script.xlb
deleted file mode 100644
index 3df96db95d8a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAnnotationsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAnnotationsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAnnotationsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/sc_ScAreaLinkObj.xba b/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/sc_ScAreaLinkObj.xba
deleted file mode 100644
index 3bb8912f9770..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/sc_ScAreaLinkObj.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAreaLinkObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAreaLinkObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oLinks As Variant
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    Dim aSourceArea as String
-    aSourceArea = utils.Path2URL(cTestDocsDir + "/" + "calcshapes.sxc")
-    oLinks = oDoc.AreaLinks
-    oLinks.InsertAtPosition(com.sun.star.table.CellAddress(1, 2, 3), aSourceArea, "a1:b2", "", "")
-
-    oObj = oLinks.getByIndex(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/script.xlb
deleted file mode 100644
index 26457c41950c..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAreaLinkObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAreaLinkObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAreaLinkObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/sc_ScAreaLinksObj.xba b/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/sc_ScAreaLinksObj.xba
deleted file mode 100644
index 8265b08838bd..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/sc_ScAreaLinksObj.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAreaLinksObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAreaLinksObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oLinks As Variant
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    Dim aSourceArea as String
-    aSourceArea = utils.Path2URL(cTestDocsDir + "/" + "calcshapes.sxc")
-    oLinks = oDoc.AreaLinks
-    oLinks.InsertAtPosition(com.sun.star.table.CellAddress(1, 2, 3), aSourceArea, "a1:b2", "", "")
-
-    oObj = oLinks
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/script.xlb
deleted file mode 100644
index 99ec3f15080e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAreaLinksObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAreaLinksObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAreaLinksObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/sc_ScAutoFormatFieldObj.xba b/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/sc_ScAutoFormatFieldObj.xba
deleted file mode 100644
index c22a84578d36..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/sc_ScAutoFormatFieldObj.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAutoFormatFieldObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAutoFormatFieldObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oFormats, oFormat, oField As Variant
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oFormats = createUnoService("com.sun.star.sheet.TableAutoFormats")
-    oFormat = oFormats.getByIndex(0)
-    oField = oFormat.getByIndex(0)
-
-    oObj = oField
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/script.xlb
deleted file mode 100644
index a0824100b00d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatFieldObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAutoFormatFieldObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAutoFormatFieldObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/sc_ScAutoFormatObj.xba b/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/sc_ScAutoFormatObj.xba
deleted file mode 100644
index fa2f2ee42465..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/sc_ScAutoFormatObj.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAutoFormatObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Global oFormats As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAutoFormatObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oNewFormat As Object
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oFormats = createUnoService("com.sun.star.sheet.TableAutoFormats")
-
-    oNewFormat = oDoc.createInstance("com.sun.star.sheet.TableAutoFormat")
-
-    if oFormats.hasByName(cObjectName) then
-    	oFormats.removeByName(cObjectName)
-    end if
-
-    oFormats.insertByName(cObjectName, oNewFormat)
-
-    oObj = oNewFormat
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error Goto ErrHndl
-    oFormats.removeByName(cObjectName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/script.xlb
deleted file mode 100644
index 0439c64222ed..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAutoFormatObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAutoFormatObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/sc_ScAutoFormatsObj.xba b/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/sc_ScAutoFormatsObj.xba
deleted file mode 100644
index aa2796fae9ae..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/sc_ScAutoFormatsObj.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScAutoFormatsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oInstance As Object
-Global oReplaceInstance as Object
-Global cNameToReplace as String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScAutoFormatsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oObj = createUNOService("com.sun.star.sheet.TableAutoFormats")
-    oInstance = oDoc.createInstance("com.sun.star.sheet.TableAutoFormat")
-    oReplaceInstance = oDoc.createInstance("com.sun.star.sheet.TableAutoFormat")
-    cNameToReplace = "XNameReplace Test"
-    If oObj.hasByName(cNameToReplace) Then oObj.removeByName(cNameToReplace)
-    oObj.insertByName(cNameToReplace, oDoc.createInstance("com.sun.star.sheet.TableAutoFormat"))
-
-    If oObj.hasByName(cObjectName &amp; "1") Then oObj.removeByName(cObjectName &amp; "1")
-    oObj.insertByName(cObjectName &amp; "1", oDoc.createInstance("com.sun.star.sheet.TableAutoFormat"))
-    If oObj.hasByName(cObjectName &amp; "2") Then oObj.removeByName(cObjectName &amp; "2")
-    oObj.insertByName(cObjectName &amp; "2", oDoc.createInstance("com.sun.star.sheet.TableAutoFormat"))
-    nGlobalLong = oObj.count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/script.xlb
deleted file mode 100644
index f402ede287dc..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScAutoFormatsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScAutoFormatsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScAutoFormatsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/sc_ScCellCursorObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/sc_ScCellCursorObj.xba
deleted file mode 100644
index 6caf2e62956f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/sc_ScCellCursorObj.xba
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellCursorObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nCellCursorCol As Long
-Global nCellCursorRow As Long
-
-' Required for com.sun.star.chart.XChartData
-Global oCellToChange As Object
-
-'com.sun.star.sheet.XCellSeries
-Global aCellSeries(2) as Integer
-
-' com.sun.star.sheet.XCellRangeData
-Global newData As Variant
-
-Global oSheet as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellCursorObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheetCursor as Object, oRange As Object
-    Dim n as Integer, m As Integer
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oCellToChange = oSheet.getCellByPosition(2, 3)
-    oRange = oSheet.getCellRangeByName("$A$1:$D$4")
-    oSheetCursor = oSheet.createCursorByRange(oRange)
-
-    For m = 1 to 2
-		For n = 10 to 15
-	      oSheet.getCellByPosition(m,n).setValue(n)
-		Next n
-	Next m
-
-	'XSheetCellCursor::colapseToCurrentRegion() :
-	nCellCursorRow = 12
-	nCellCursorCol 2
-
-    aCellSeries(0) = 3
-    aCellSeries(1) = 3
-
-    'Required for XCellRangeData
-    newData = Array(_
-                Array(2.5, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 5.0),_
-                Array(2.5, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 5.0))_
-
-    oObj = oSheetCursor
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function modifyDescriptor(descr As Variant) As Variant
-On Error Goto ErrHndl
-    Dim i As Integer, n as Integer
-    Dim oCell As Object
-    Dim vFields(0) as new com.sun.star.table.TableSortField
-    
-    for i = 0 to aCellSeries(0) - 1
-        oCell = oSheet.getCellByPosition(0, i)
-        oCell.String = "" + (aCellSeries(0) - i)
-        oCell.setFormula(aCellSeries(0) - i)
-    next i
-    'ShowNameValuePair(descr)
-    vFields(0).IsCaseSensitive = false
-    vFields(0).IsAscending = true
-    vFields(0).FieldType = com.sun.star.table.TableSortFieldType.ALPHANUMERIC    
-    for i = 0 to ubound(descr)
-        if descr(i).Name = "IsSortColumns" then descr(i).Value = false
-        if descr(i).Name = "SortFields" then descr(i).Value = vFields()
-    next i
-
-    modifyDescriptor() = descr
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScCellCursorObj.modifyDescriptor() :")
-    Test.Exception()
-end Function
-
-Function checkSort() As Boolean
-On Error Goto ErrHndl
-    Dim i As Integer, oCell As Object
-    Dim bOK As Boolean
-
-    bOK = true
-    for i = 0 to aCellSeries(0) - 1
-        oCell = oSheet.getCellByPosition(0,i)
-        bOK = bOK AND oCell.String = "" + (i + 1)
-        out.dbg(oCell.String + ":" + (i+1))
-    next i
-
-    checkSort() = bOK
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScCellCursorObj.checkSort() :")
-    Test.Exception()
-end Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/script.xlb
deleted file mode 100644
index b25b0c373308..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellCursorObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellCursorObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellCursorObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/sc_ScCellFieldObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/sc_ScCellFieldObj.xba
deleted file mode 100644
index a47cbd050e70..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/sc_ScCellFieldObj.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellFieldObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance as Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellFieldObj
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oSheet, oCell As Object
-	Dim oTextField, oTextField1 As Object
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oTextField = oDoc.createInstance("com.sun.star.text.TextField.URL")
-
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(5, 5)
-    oCell.insertTextContent(oCell.createTextCursor, oTextField, true)
-
-    oObj = oTextField
-
-	'again for XComponent
-    oTextField1 = oDoc.createInstance("com.sun.star.text.TextField.URL")
-
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(4, 5)
-    oCell.insertTextContent(oCell.createTextCursor, oTextField1, true)
-
-    oComponentInstance = oTextField1
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextField.URL")
-	oXTextContentRange = oCell.createTextCursor()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/script.xlb
deleted file mode 100644
index 90360104790f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFieldObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellFieldObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellFieldObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/sc_ScCellFieldsObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/sc_ScCellFieldsObj.xba
deleted file mode 100644
index eeaecf843968..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/sc_ScCellFieldsObj.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellFieldsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance as Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellFieldsObj
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oSheet, oCell As Object
-	Dim oTextField, oTextField1 As Object
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oTextField = oDoc.createInstance("com.sun.star.text.TextField.URL")
-
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(5, 5)
-    oCell.insertTextContent(oCell.createTextCursor, oTextField, true)
-
-    oObj = oCell.getTextFields()
-
-	'again for XComponent
-    oTextField1 = oDoc.createInstance("com.sun.star.text.TextField.URL")
-
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(4, 5)
-    oCell.insertTextContent(oCell.createTextCursor, oTextField1, true)
-
-    oComponentInstance = oTextField1
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextField.URL")
-	oXTextContentRange = oCell.createTextCursor()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/script.xlb
deleted file mode 100644
index 8c436760aaed..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFieldsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellFieldsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellFieldsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/sc_ScCellFormatsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/sc_ScCellFormatsEnumeration.xba
deleted file mode 100644
index 21f3e9389dd6..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/sc_ScCellFormatsEnumeration.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellFormatsEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellFormatsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet As Object
-    Dim oFormats As Variant
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oFormats = oSheet.getCellFormatRanges()
-    oObj = oFormats.createEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/script.xlb
deleted file mode 100644
index 2db2e0039363..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFormatsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellFormatsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellFormatsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/sc_ScCellFormatsObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/sc_ScCellFormatsObj.xba
deleted file mode 100644
index 35847703fcd7..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/sc_ScCellFormatsObj.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellFormatsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellFormatsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet As Object
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-   	oSheet = oDoc.Sheets(0)
-   	oObj = oSheet.CellFormatRanges
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/script.xlb
deleted file mode 100644
index 41ea5b01e9fe..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellFormatsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellFormatsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellFormatsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellObj/sc_ScCellObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellObj/sc_ScCellObj.xba
deleted file mode 100644
index 157132bb0446..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellObj/sc_ScCellObj.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XText
- Global oCollection As Object
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet, oCell As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(0, 0)
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.URL")
-    oCollection = oCell.TextFields
-
-    oObj = oCell
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellObj/script.xlb
deleted file mode 100644
index e56fdf283756..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/sc_ScCellRangeObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/sc_ScCellRangeObj.xba
deleted file mode 100644
index 8fc714766202..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/sc_ScCellRangeObj.xba
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellRangeObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'com.sun.star.sheet.XCellSeries
-Global aCellSeries(2) as Integer
-
-
-'Required for com.sun.star.chart.XChartData
-Global oCellToChange As Object
-
-' com.sun.star.sheet.XCellRangeData
-Global newData As Variant
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellRangeObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet, oRange As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oCellToChange = oSheet.getCellByPosition(0, 0)
-    oRange = oSheet.getCellRangeByPosition(0, 0, 10, 10)
-    oObj = oRange
-    
-    aCellSeries(0) = 10
-    aCellSeries(1) = 10
-
-    'Required for XCellRangeData
-    newData = Array(_
-                Array(2.5, 5.0, 2.5, 5.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0),_
-                Array(4.0, 9.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 2.5, 5.0),_
-                Array(2.5, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 5.0),_
-                Array(2.5, 5.0, 2.5, 5.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0),_
-                Array(4.0, 9.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 2.5, 5.0),_
-                Array(2.5, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 5.0),_
-                Array(2.5, 5.0, 2.5, 5.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0),_
-                Array(4.0, 9.0, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 2.5, 5.0),_
-                Array(2.5, 3.5, 8.7, 9.9, 0.3, 1.2, 3, 0, 5.0, 2.5, 5.0))
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function modifyDescriptor(descr As Variant) As Variant
-On Error Goto ErrHndl
-    Dim i As Integer, n as Integer
-    Dim oCell As Object
-    Dim vFields(0) as new com.sun.star.table.TableSortField
-    
-    for i = 0 to aCellSeries(0) - 1
-        oCell = oObj.getCellByPosition(0, i)
-        oCell.String = "" + (aCellSeries(0) - i)
-        oCell.setFormula(aCellSeries(0) - i)
-    next i
-    'ShowNameValuePair(descr)
-    vFields(0).IsCaseSensitive = false
-    vFields(0).IsAscending = true
-    vFields(0).FieldType = com.sun.star.table.TableSortFieldType.ALPHANUMERIC    
-    for i = 0 to ubound(descr)
-        if descr(i).Name = "IsSortColumns" then descr(i).Value = false
-        if descr(i).Name = "SortFields" then descr(i).Value = vFields()
-    next i
-
-    modifyDescriptor() = descr
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScCellRangeObj.modifyDescriptor() :")
-    Test.Exception()
-end Function
-
-Function checkSort() As Boolean
-On Error Goto ErrHndl
-    Dim i As Integer, oCell As Object
-    Dim bOK As Boolean
-
-    bOK = true
-    for i = 0 to aCellSeries(0) - 1
-        oCell = oObj.getCellByPosition(0,i)
-        bOK = bOK AND oCell.String = "" + (i + 1)
-        out.dbg(oCell.String + ":" + (i+1))
-    next i
-
-    checkSort() = bOK
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScCellRangeObj.checkSort() :")
-    Test.Exception()
-end Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/script.xlb
deleted file mode 100644
index 0a2322e4654a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellRangeObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellRangeObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellRangeObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/sc_ScCellRangesObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/sc_ScCellRangesObj.xba
deleted file mode 100644
index e86c2249b894..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/sc_ScCellRangesObj.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellRangesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oInstance As Object
-
-' Requiered for  com.sun.star.container.XNameReplace
-Global cNameToReplace As String 'name of instance to be replased
-Global oReplaceInstance As Object 'instance, that will be inserted
-                                   'instead old one
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellRangesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.createInstance("com.sun.star.sheet.SheetCellRanges")
-    oSheet = oDoc.Sheets(1)
-
-    oInstance=oSheet.getCellRangeByName("A1:C5")
-    oObj.insertByName("CellRange1", oInstance)
-    oInstance=oSheet.getCellRangeByName("A7:D9")
-    oObj.insertByName("CellRange2", oInstance)
-    oInstance=oSheet.getCellRangeByName("E1:E42")
-    oObj.insertByName("CellRange3", oInstance)
-    oInstance=oSheet.getCellRangeByName("A10:B10")
-    oObj.insertByName("CellRange4", oInstance)
-
-    oReplaceInstance = oSheet.getCellRangeByName("A6:H16")
-    cNameToReplace = "CellRange4"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/script.xlb
deleted file mode 100644
index 5b6e3544a0fe..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellRangesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellRangesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellRangesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/sc_ScCellSearchObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/sc_ScCellSearchObj.xba
deleted file mode 100644
index b15b06885abe..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/sc_ScCellSearchObj.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellSearchObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellSearchObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oObj = oSheet.createSearchDescriptor()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/script.xlb
deleted file mode 100644
index 2fd3cefc1727..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellSearchObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellSearchObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellSearchObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/sc_ScCellTextCursor.xba b/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/sc_ScCellTextCursor.xba
deleted file mode 100644
index 03033ab1f90e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/sc_ScCellTextCursor.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellTextCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XParagraphCursor
- Global oText As Object
-' Requiered for  com.sun.star.text.XTextCursor
- Global oCursor As Object 'One more cursor
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellTextCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-    Dim oCell As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(1, 3)
-
-    oCell.setString(cObjectName)
-
-    oText = oCell
-    oObj = oCell.createTextCursor()
-    oCursor = oCell.createTextCursor()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/script.xlb
deleted file mode 100644
index e73ec8bfc586..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellTextCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellTextCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellTextCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/sc_ScCellsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/sc_ScCellsEnumeration.xba
deleted file mode 100644
index 77e59c564ec7..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/sc_ScCellsEnumeration.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellsEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet, oCell1, oCell2, oCell3, oEnum, oVS As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    oCell1 = oSheet.getCellByPosition(1, 1)
-    oCell1.Text.setString(cObjectName + "1")
-    oCell2 = oSheet.getCellByPosition(4, 2)
-    oCell2.Text.setString(cObjectName + "2")
-    oCell3 = oSheet.getCellByPosition(3, 6)
-    oCell3.setFormula("= 15 + 3 * 4")
-
-    oVS = oSheet.queryVisibleCells
-    oEnum = oVS.Cells.createEnumeration
-
-    oObj = oEnum
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/script.xlb
deleted file mode 100644
index 377e64d5db85..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellsObj/sc_ScCellsObj.xba b/qadevOOo/tests/basic/mod/sc/ScCellsObj/sc_ScCellsObj.xba
deleted file mode 100644
index b7a596a13688..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellsObj/sc_ScCellsObj.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScCellsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScCellsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCell1, oCell2, oCell3, oSheet As Object
-    Dim oCellsRange, oCells As Variant
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    ' Filling some cells with the text
-    oCell1 = oSheet.getCellByPosition(0, 0)
-    oCell1.setString("ScCellsObj, Cell 1")
-    oCell2 = oSheet.getCellByPosition(4, 2)
-    oCell2.setString("ScCellsObj, Cell 2")
-    oCell3 = oSheet.getCellByPosition(3, 3)
-    oCell3.setValue(-10)
-
-    oCellsRange = oSheet.queryVisibleCells
-    oCells = oCellsRange.getCells
-
-    oObj = oCells
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScCellsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScCellsObj/script.xlb
deleted file mode 100644
index 6a67f5248999..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScCellsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScCellsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScCellsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScChartObj/sc_ScChartObj.xba b/qadevOOo/tests/basic/mod/sc/ScChartObj/sc_ScChartObj.xba
deleted file mode 100644
index ee68c904dd10..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScChartObj/sc_ScChartObj.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScChartObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.container.XNamed
-Global cNameToSet As String ' "fixed" if name is fixed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScChartObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCharts As Variant
-    Dim oSheet As Object
-    Dim i,j As Integer
-    Dim tRect As New com.sun.star.awt.Rectangle
-    Dim tAddr As New com.sun.star.table.CellRangeAddress
-    Dim oRanges(0) As New com.sun.star.table.CellRangeAddress
-
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    ' Filling some cells with the text
-    for i = 1 to 6
-        oSheet.getCellByPosition(0, i).setString("Row" &amp; i)
-        oSheet.getCellByPosition(i, 0).setString("Col" &amp; i)
-    next i
-
-    for i = 1 to 6
-        for j = 1 to 6
-            oSheet.getCellByPosition(i, j).Value = (i + 1) * j
-        next j
-    next i
-
-    tRect.X = 500
-    tRect.Y = 500
-    tRect.Width = 25000
-    tRect.Height = 15000
-
-    tAddr.Sheet = 0
-    tAddr.StartRow = 0
-    tAddr.StartColumn = 0
-    tAddr.EndRow = 6
-    tAddr.EndColumn = 6
-
-    oCharts = oSheet.getCharts()
-    oRanges(0) = tAddr
-    oCharts.addNewByName("ScChartObj", tRect, oRanges(), true, true)
-
-    oObj = oCharts.getByName("ScChartObj")
-
-    cNameToSet = "fixed"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScChartObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScChartObj/script.xlb
deleted file mode 100644
index 7662522d724b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScChartObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScChartObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScChartObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScChartsObj/sc_ScChartsObj.xba b/qadevOOo/tests/basic/mod/sc/ScChartsObj/sc_ScChartsObj.xba
deleted file mode 100644
index e942335c7744..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScChartsObj/sc_ScChartsObj.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScChartsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cChartDataAddress As New com.sun.star.table.CellRangeAddress
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScChartsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet As Object
-    Dim i,j As Integer
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    ' Filling some cells with the text
-    for i = 1 to 6
-      oSheet.getCellByPosition(0, i).setString("Row" &amp; i)
-      oSheet.getCellByPosition(i, 0).setString("Col" &amp; i)
-    next i
-
-    for i = 1 to 6
-        for j = 1 to 6
-            oSheet.getCellByPosition(i, j).Value = (i + 1) * j
-        next j
-    next i
-
-    Dim tAddr As New com.sun.star.table.CellRangeAddress
-    tAddr.Sheet = 0
-    tAddr.StartRow = 0
-    tAddr.StartColumn = 0
-    tAddr.EndRow = 6
-    tAddr.EndColumn = 6
-
-    Dim tRect As New com.sun.star.awt.Rectangle
-    tRect.X = 200
-    tRect.Y = 200
-    tRect.Width = 10000
-    tRect.Height = 5000
-
-    cChartDataAddress = tAddr
-    oObj = oSheet.getCharts()
-
-    Dim oRanges(0) As New com.sun.star.table.CellRangeAddress
-    oRanges(0) = tAddr
-    oObj.addNewByName(cObjectName, tRect, oRanges(), true, true)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScChartsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScChartsObj/script.xlb
deleted file mode 100644
index 8294000d7652..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScChartsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScChartsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScChartsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/sc_ScConsolidationDescriptor.xba b/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/sc_ScConsolidationDescriptor.xba
deleted file mode 100644
index 1c32c98b3366..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/sc_ScConsolidationDescriptor.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScConsolidationDescriptor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScConsolidationDescriptor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDsc As Object
-    Dim bCreateDefaultDsc As Boolean
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    bCreateDefaultDsc = true
-    oDsc = oDoc.createConsolidationDescriptor(bCreateDefaultDsc)
-    oObj = oDsc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/script.xlb b/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/script.xlb
deleted file mode 100644
index d2140cde3661..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScConsolidationDescriptor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScConsolidationDescriptor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScConsolidationDescriptor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/sc_ScDDELinkObj.xba b/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/sc_ScDDELinkObj.xba
deleted file mode 100644
index b1f6a5752ef0..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/sc_ScDDELinkObj.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDDELinkObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
-Global cNameToSet As String ' "fixed" if name is fixed
-Global DDEItem As String
-Global DDETopic As String
-Global DDEApplication As String
-
-Global oTestDoc As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDDELinkObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-    Dim oF As String
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    oTestDoc = utils.loadTestDocument("ScDDELinksObj.sdc")
-
-    DDEItem = "Sheet1.A1"
-
-    ' This construction of 2-way convertion of testdocs location 
-    ' should take place here, because there is unnecessary slash at the end of 
-    ' cTestDocsDir.
-    DDETopic = utils.URL2Path(utils.Path2URL(cTestDocsDir &amp; "ScDDELinksObj.sdc"))
-
-    DDEApplication = "soffice"
-
-    oF = "=DDE(""" + DDEApplication + """;""" + DDETopic + """;""" + DDEItem + """)"
-    
-    oSheet.getCellByPosition(1, 2).Formula = oF
-    oSheet.getCellByPosition(3, 4).Formula = oF
-    oSheet.getCellByPosition(5, 6).Formula = oF
-
-    oObj = oDoc.getPropertyValue("DDELinks").getByIndex(0)
-    cNameToSet = "fixed"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oTestDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/script.xlb
deleted file mode 100644
index 356f4be1ef64..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDDELinkObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDDELinkObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDDELinkObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/sc_ScDDELinksObj.xba b/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/sc_ScDDELinksObj.xba
deleted file mode 100644
index aaab46523587..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/sc_ScDDELinksObj.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDDELinksObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oTestDoc As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDDELinksObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim testDoc, oF As String
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    oTestDoc = utils.loadTestDocument("ScDDELinksObj.sdc")
-    
-    ' This construction of 2-way convertion of testdocs location 
-    ' should take place here, because there is unnecessary slash at the end of 
-    ' cTestDocsDir.
-    testDoc = utils.URL2Path(utils.Path2URL(cTestDocsDir &amp; "ScDDELinksObj.sdc"))
-
-    oF = "=DDE(""soffice"";""" &amp; testDoc &amp; """;""Sheet1.A1"")"
-
-    oSheet.getCellByPosition(1, 2).Formula = oF
-    oSheet.getCellByPosition(3, 4).Formula = oF
-    oSheet.getCellByPosition(5, 6).Formula = oF
-
-    oObj = oDoc.getPropertyValue("DDELinks")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oTestDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/script.xlb
deleted file mode 100644
index 84df6ef711d2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDDELinksObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDDELinksObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDDELinksObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/sc_ScDataPilotFieldObj.xba b/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/sc_ScDataPilotFieldObj.xba
deleted file mode 100644
index efe3c591b144..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/sc_ScDataPilotFieldObj.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDataPilotFieldObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDataPilotFieldObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oFields As Variant
-    Dim oSheet As Object
-    Dim i,j As Integer
-    Dim oDataPilotTable, oDataPilotDescriptor As Object
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-    Out.Log("Filling a table...")
-
-    for i = 1 to 5
-        oSheet.getCellByPosition(0, i).String = "Row" &amp; i
-        oSheet.getCellByPosition(i, 0).String = "Col" &amp; i
-    next i
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 0
-    sCellRangeAddress.StartRow = 0
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    oDataPilotTable = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTable.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-    oDataPilotTable.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oFields = oDataPilotDescriptor.getDataPilotFields()
-    oObj = oFields.getByIndex(0)
-
-    cNameToSet = cObjectName
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/script.xlb
deleted file mode 100644
index 81603a818fd6..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDataPilotFieldObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDataPilotFieldObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/sc_ScDataPilotFieldsObj.xba b/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/sc_ScDataPilotFieldsObj.xba
deleted file mode 100644
index dff17eb90697..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/sc_ScDataPilotFieldsObj.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDataPilotFieldsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDataPilotFieldsObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i as Integer,j As Integer
-    Dim oSheet as Object, oDataPilotDescriptor  As Object
-    Dim oFields as Variant , oDataPilotTable As Variant
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    oDataPilotTable = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTable.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-
-    oDataPilotTable.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oFields = oDataPilotDescriptor.getDataPilotFields
-    oObj = oFields
-    nGlobalLong = oObj.Count
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/script.xlb
deleted file mode 100644
index 18831eae158a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotFieldsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDataPilotFieldsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDataPilotFieldsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/sc_ScDataPilotTableObj.xba b/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/sc_ScDataPilotTableObj.xba
deleted file mode 100644
index 36e976850469..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/sc_ScDataPilotTableObj.xba
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDataPilotTableObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for com.sun.star.container.XNamed
-Global cNameToSet As String ' "fixed" if name is fixed
-
-' Required for com.sun.star.sheet.XDataPilotTable
-Global oOutputRange As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDataPilotTableObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-    Dim i, j As Integer
-    Dim oDataPilotTables As Object
-    Dim oDataPilotDescriptor As Object
-    Dim oFilterDescriptor As Object
-    Dim oDataPilotField As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    for i = 1 to 5
-    	oSheet.getCellByPosition(0, i).String = "Row" &amp; i
-    	oSheet.getCellByPosition(i, 0).String = "Col" &amp; i
-    next i
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 0
-    sCellRangeAddress.EndColumn = 1
-    sCellRangeAddress.EndRow = 5
-
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    Dim FilterFields(1) As New com.sun.star.sheet.TableFilterField
-    FilterFields(0).Connection = com.sun.star.sheet.FilterConnection.AND
-    FilterFields(0).Field = 1
-    FilterFields(0).isNumeric = true
-    FilterFields(0).StringValue = "4"
-    FilterFields(0).Operator = com.sun.star.sheet.FilterOperator.GREATER
-
-    FilterFields(1).Connection = com.sun.star.sheet.FilterConnection.AND
-    FilterFields(1).Field = 1
-    FilterFields(1).isNumeric = true
-    FilterFields(1).StringValue = "12"
-    FilterFields(1).Operator = com.sun.star.sheet.FilterOperator.LESS_EQUAL
-
-    oDataPilotTables = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTables.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-    oFilterDescriptor = oDataPilotDescriptor.getFilterDescriptor()
-    oFilterDescriptor.setFilterFields(FilterFields())
-
-    oDataPilotField = oDataPilotDescriptor.getDataPilotFields().getByIndex(0)
-    oDataPilotField.Function = com.sun.star.sheet.GeneralFunction.SUM
-    oDataPilotField.Orientation = com.sun.star.sheet.DataPilotFieldOrientation.DATA    
-
-    oDataPilotTables.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oObj = oDataPilotTables(0)
-    oOutputRange = sCellAddress
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/script.xlb
deleted file mode 100644
index 570b186ccb2e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotTableObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDataPilotTableObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDataPilotTableObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/sc_ScDataPilotTablesObj.xba b/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/sc_ScDataPilotTablesObj.xba
deleted file mode 100644
index 90e09058c76e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/sc_ScDataPilotTablesObj.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDataPilotTablesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDataPilotTablesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim i as Integer,j As Integer
-    Dim oSheet as Object, oDataPilotDescriptor As Object
-    Dim oDataPilotTables As Variant
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    oDataPilotTables = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTables.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-
-    oDataPilotTables.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oObj = oDataPilotTables
-    nGlobalLong = oObj.Count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/script.xlb
deleted file mode 100644
index ebdc208f0e93..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDataPilotTablesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDataPilotTablesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDataPilotTablesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/sc_ScDatabaseRangeObj.xba b/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/sc_ScDatabaseRangeObj.xba
deleted file mode 100644
index 15fc4fcb3199..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/sc_ScDatabaseRangeObj.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDatabaseRangeObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.sheet.XCellRangeReferrer
- Global oReferredCells As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDatabaseRangeObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oRanges As Variant
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    oRanges = oDoc.getPropertyValue("DatabaseRanges")
-    oRanges.addNewByName(cObjectName, sCellRangeAddress)
-    oReferredCells = sCellRangeAddress
-
-    oObj = oRanges.getByIndex(0)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/script.xlb
deleted file mode 100644
index 30fa99cc37ce..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangeObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDatabaseRangeObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDatabaseRangeObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/sc_ScDatabaseRangesObj.xba b/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/sc_ScDatabaseRangesObj.xba
deleted file mode 100644
index 2efa2d7ce4cd..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/sc_ScDatabaseRangesObj.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDatabaseRangesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDatabaseRangesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oRanges As Variant
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    oRanges = oDoc.getPropertyValue("DatabaseRanges")
-    oRanges.addNewByName(cObjectName, sCellRangeAddress)
-
-    oObj = oRanges
-    nGlobalLong = oObj.Count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/script.xlb
deleted file mode 100644
index 1b52e885e3a3..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDatabaseRangesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDatabaseRangesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDatabaseRangesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/sc_ScDrawPageObj.xba b/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/sc_ScDrawPageObj.xba
deleted file mode 100644
index 68f6506a77a0..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/sc_ScDrawPageObj.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDrawPageObj" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oXShapeInstance As Object
-
-Global oGrouperCollection As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDrawPageObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-	Dim oDP as Object
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    oDP = oDoc.getDrawPages()
-	
-	oDP.insertNewByIndex(0)
-	oDP.insertNewByIndex(1)
-	
-	oObj = oDP.getByIndex(0)
-	addShape(oObj,1)
-	addShape(oObj,2)
-	addShape(oObj,3)
-	addShape(oObj,4)
-	
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oGrouperCollection.Add(oObj.getByIndex(2))
-    oGrouperCollection.Add(oObj.getByIndex(3))
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function addShape(oPage as Object, no as Integer) As Object
-On Error Goto ErrHndl
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oShape As Object
-    Dim servNames As Variant
-
-    aPoint.x = 1000 * no
-    aPoint.y = 1000 * no
-    aSize.Width = 2000
-    aSize.Height = 1000
-    oShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oShape.Size = aSize
-    oShape.Position = aPoint
-    
-    oPage.add(oShape)
-
-    addShapeToDrawDoc() = oShape
-Exit Function
-ErrHndl:
-	Test.Exception()
-End Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/script.xlb
deleted file mode 100644
index 7966e9d2e0a8..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDrawPageObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDrawPageObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDrawPageObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/sc_ScDrawPagesObj.xba b/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/sc_ScDrawPagesObj.xba
deleted file mode 100644
index ce3376145dbf..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/sc_ScDrawPagesObj.xba
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScDrawPagesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScDrawPagesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.DrawPages
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/script.xlb
deleted file mode 100644
index e77bd26fa1fa..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScDrawPagesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScDrawPagesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScDrawPagesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/sc_ScFilterDescriptorBase.xba b/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/sc_ScFilterDescriptorBase.xba
deleted file mode 100644
index fbe7d5a8ed68..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/sc_ScFilterDescriptorBase.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScFilterDescriptorBase" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScFilterDescriptorBase
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    ' Filling some cells with the text
-    oSheet.getCellByPosition(0, 0).Value = 10
-    oSheet.getCellByPosition(4, 2).Value = 10.10
-    oSheet.getCellByPosition(6, 5).Value = -10
-
-    oObj = oSheet.createFilterDescriptor(true)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/script.xlb b/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/script.xlb
deleted file mode 100644
index c733e1c0c8f3..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScFilterDescriptorBase/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScFilterDescriptorBase" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScFilterDescriptorBase"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/sc_ScFunctionListObj.xba b/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/sc_ScFunctionListObj.xba
deleted file mode 100644
index e6b3e5935888..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/sc_ScFunctionListObj.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScFunctionListObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScFunctionListObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sheet.FunctionDescriptions")
-    nGlobalLong = oObj.Count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/script.xlb
deleted file mode 100644
index 0d49fb420ceb..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScFunctionListObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScFunctionListObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScFunctionListObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/sc_ScHeaderFieldObj.xba b/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/sc_ScHeaderFieldObj.xba
deleted file mode 100644
index ba5526524f46..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/sc_ScHeaderFieldObj.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScHeaderFieldObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScHeaderFieldObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim StyleFamilies as Object, PageStyles as Object, DefaultStyle As Object
-    Dim RPHC as Object, tLeft as Object, TimeField as Object, oCur As Object
-	
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    StyleFamilies = oDoc.getStyleFamilies
-    PageStyles = StyleFamilies.getByName("PageStyles")
-    DefaultStyle = PageStyles.getByName("Default")
-
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    tLeft = RPHC.getLeftText
-    TimeField = oDoc.createInstance("com.sun.star.text.TextField.Time")
-	oComponentInstance = oDoc.createInstance("com.sun.star.text.TextField.Time")
-    oCur = tLeft.createTextCursor()
-    tLeft.insertTextContent(oCur, TimeField, false)
-    tLeft.insertTextContent(oCur, oComponentInstance, false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextField.Time")
-	oXTextContentRange = tLeft.createTextCursor()
-	
-    oObj = TimeField
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.dispose()
-    if NOT isNULL(oComponentInstance) then oComponentInstance.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/script.xlb
deleted file mode 100644
index c8b68e52b61e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScHeaderFieldObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScHeaderFieldObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/sc_ScHeaderFieldsObj.xba b/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/sc_ScHeaderFieldsObj.xba
deleted file mode 100644
index 9456e02e97de..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/sc_ScHeaderFieldsObj.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScHeaderFieldsObj" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScHeaderFieldsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-	Dim StyleFamilies as Object, PageStyles as Object, DefaultStyle As Object
-	Dim RPHC as Object, tLeft as Object, TimeField as Object, oCur As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    
-    StyleFamilies = oDoc.getStyleFamilies()
-    PageStyles = StyleFamilies.getByName("PageStyles")
-    DefaultStyle = PageStyles.getByName("Default")
-
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    tLeft = RPHC.getLeftText
-    TimeField = oDoc.createInstance("com.sun.star.text.TextField.Time")
-    oCur = tLeft.createTextCursor()
-    tLeft.insertTextContent(oCur, TimeField, false)
-
-    oObj=tLeft.getTextFields()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/script.xlb
deleted file mode 100644
index ecddc21b631e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFieldsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScHeaderFieldsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScHeaderFieldsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/sc_ScHeaderFooterContentObj.xba b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/sc_ScHeaderFooterContentObj.xba
deleted file mode 100644
index fc5aad8f1869..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/sc_ScHeaderFooterContentObj.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScHeaderFooterContentObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.sheet.XHeaderFooterContent
- Global cLeftText As String
- Global cCenterText As String
- Global cRightText As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScHeaderFooterContentObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim PageStyles As Variant
-    Dim DefaultStyle, RPHC As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    PageStyles = oDoc.getStyleFamilies.getByName("PageStyles")
-    DefaultStyle = PageStyles.getByName("Default")
-
-    cLeftText = "Left"
-    cCenterText = "Center"
-    cRightText = "Right"
-
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    RPHC.getLeftText.String = cLeftText
-    RPHC.getCenterText.String = cCenterText
-    RPHC.getRightText.String = cRightText
-
-    DefaultStyle.setPropertyValue("RightPageHeaderContent", RPHC)
-
-    oObj = RPHC
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/script.xlb
deleted file mode 100644
index ddbc0e056fbf..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterContentObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScHeaderFooterContentObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScHeaderFooterContentObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/sc_ScHeaderFooterTextCursor.xba b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/sc_ScHeaderFooterTextCursor.xba
deleted file mode 100644
index 6ba9ecda2e87..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/sc_ScHeaderFooterTextCursor.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScHeaderFooterTextCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XParagraphCursor
- Global oText As Object
-' Requiered for  com.sun.star.text.XTextCursor
- Global oCursor As Object 'One more cursor
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScHeaderFooterTextCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim PageStyles, DefaultStyle, RPHC As Object
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    PageStyles = oDoc.getStyleFamilies.getByName("PageStyles")
-    DefaultStyle = PageStyles.getByName("Default")
-
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    RPHC.getCenterText.String = "Center"
-    DefaultStyle.setPropertyValue("RightPageHeaderContent", RPHC)
-
-    oText = RPHC.getCenterText
-
-    oObj = oText.createTextCursor()
-    oCursor = oText.createTextCursor()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/script.xlb b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/script.xlb
deleted file mode 100644
index ab7f002c6b5c..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScHeaderFooterTextCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScHeaderFooterTextCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/sc_ScHeaderFooterTextObj.xba b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/sc_ScHeaderFooterTextObj.xba
deleted file mode 100644
index fe0ec2fef131..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/sc_ScHeaderFooterTextObj.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScHeaderFooterTextObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-GLOBAL oInstance as Object
-GLOBAL oCollection as Object
-
-'Required for com.sun.star.text.XTextRangeMover
-Global oTextRangeToMove As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScHeaderFooterTextObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim StyleFamilies As Variant
-    Dim PageStyles As Object
-    Dim DefaultStyle As Object
-    Dim RPHC As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    StyleFamilies = oDoc.getStyleFamilies
-    PageStyles = StyleFamilies.getByName("PageStyles")
-    DefaultStyle = PageStyles.getByName("Default")
-
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    RPHC.getCenterText.String = "Center"
-    DefaultStyle.setPropertyValue("RightPageHeaderContent", RPHC)
-
-    oObj = RPHC.getCenterText
-    oTextRangeToMove = oObj
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.Time")
-    oCollection = oObj.getTextFields()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/script.xlb
deleted file mode 100644
index 969ecbe11891..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScHeaderFooterTextObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScHeaderFooterTextObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScHeaderFooterTextObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/sc_ScIndexEnumeration_CellAnnotationsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/sc_ScIndexEnumeration_CellAnnotationsEnumeration.xba
deleted file mode 100644
index 3a40ff4d8755..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/sc_ScIndexEnumeration_CellAnnotationsEnumeration.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_CellAnnotationsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_CellAnnotationsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-	Dim oSheets as Object, oSheet as Object
-	Dim oAnnotations as Object
-    Dim oCell1 as Object, oCell2 as Object
-	Dim oAnno1 as Object, oAnno2 As Object
-	
-    oDoc = utils.createDocument("scalc", cObjectName)
-    
-    ' get a sheet
-	oSheets = oDoc.getSheets()
-	oSheet = oSheets.getByIndex(0)
-	
-	' filling cells with values...
-    oSheet.getCellByPosition(5, 5).setValue(15)
-    oSheet.getCellByPosition(1, 4).setValue(10)
-    oSheet.getCellByPosition(2, 0).setValue(-5.15)
-
-    Out.Log("Creating two annotations...")
-    
-    oCell1 = oSheet.getCellByPosition(3, 5)
-    oAnno1 = oCell1.Annotation
-    oAnno1.setString("ScAnnotationsObj Anno 1")
-
-    oCell2 = oSheet.getCellByPosition(3, 6)
-    oAnno2 = oCell2.Annotation
-    oAnno2.setString("ScAnnotationsObj Anno 2")
-	
-	' get annotations
-	oAnnotations = oSheet.getAnnotations()
-	
-	oObj = oAnnotations.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/script.xlb
deleted file mode 100644
index 88e9f70551e4..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAnnotationsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_CellAnnotationsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_CellAnnotationsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/sc_ScIndexEnumeration_CellAreaLinksEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/sc_ScIndexEnumeration_CellAreaLinksEnumeration.xba
deleted file mode 100644
index f16c3fd24433..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/sc_ScIndexEnumeration_CellAreaLinksEnumeration.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_CellAreaLinksEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_CellAreaLinksEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oLinks As Variant
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    
-    oLinks = oDoc.AreaLinks
-    oLinks.InsertAtPosition(com.sun.star.table.CellAddress(1, 2, 3), "dummy_fname", "a1:b2", "", "")
-
-    oObj = oLinks.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/script.xlb
deleted file mode 100644
index 44b41c57f253..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_CellAreaLinksEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_CellAreaLinksEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_CellAreaLinksEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/sc_ScIndexEnumeration_DDELinksEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/sc_ScIndexEnumeration_DDELinksEnumeration.xba
deleted file mode 100644
index 814dba0cebed..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/sc_ScIndexEnumeration_DDELinksEnumeration.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_DDELinksEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oTestDoc As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_DDELinksEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim testDoc, oF As String
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    oTestDoc = utils.loadTestDocument("ScDDELinksObj.sdc")
-    
-    ' This construction of 2-way convertion of testdocs location 
-    ' should take place here, because there is unnecessary slash at the end of 
-    ' cTestDocsDir.
-    testDoc = utils.URL2Path(utils.Path2URL(cTestDocsDir &amp; "ScDDELinksObj.sdc"))
-
-    oF = "=DDE(""soffice"";""" &amp; testDoc &amp; """;""Sheet1.A1"")"
-
-    oSheet.getCellByPosition(1, 2).Formula = oF
-    oSheet.getCellByPosition(3, 4).Formula = oF
-    oSheet.getCellByPosition(5, 6).Formula = oF
-
-    oObj = oDoc.getPropertyValue("DDELinks").createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' close ScDDELinksObj.sdc
-Sub DisposeObj()
-	oTestDoc.dispose()
-end sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/script.xlb
deleted file mode 100644
index 88efe2065201..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DDELinksEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_DDELinksEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_DDELinksEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/sc_ScIndexEnumeration_DataPilotFieldsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/sc_ScIndexEnumeration_DataPilotFieldsEnumeration.xba
deleted file mode 100644
index 27271eefc8bc..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/sc_ScIndexEnumeration_DataPilotFieldsEnumeration.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_DataPilotFieldsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_DataPilotFieldsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim i as Integer,j As Integer
-    Dim oSheet as Object, oDataPilotDescriptor  As Object
-    Dim oFields as Variant, oDataPilotTable As Variant
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    oDataPilotTable = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTable.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-
-    oDataPilotTable.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oFields = oDataPilotDescriptor.getDataPilotFields
-    oObj = oFields.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/script.xlb
deleted file mode 100644
index e8d82d06db78..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotFieldsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_DataPilotFieldsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_DataPilotFieldsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/sc_ScIndexEnumeration_DataPilotTablesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/sc_ScIndexEnumeration_DataPilotTablesEnumeration.xba
deleted file mode 100644
index 74078410d2b1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/sc_ScIndexEnumeration_DataPilotTablesEnumeration.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_DataPilotTablesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_DataPilotTablesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim i as Integer,j As Integer
-    Dim oSheet as Object, oDataPilotDescriptor As Object
-    Dim oDataPilotTables As Variant
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets.getByIndex(0)
-
-    for i = 1 to 5
-        for j = 1 to 5
-            oSheet.getCellByPosition(i, j).Value = 2.5 * j + i
-        next j
-    next i
-
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    Dim sCellAddress As New com.sun.star.table.CellAddress
-    sCellAddress.Sheet = 0
-    sCellAddress.Column = 7
-    sCellAddress.Row = 8
-
-    oDataPilotTables = oSheet.getDataPilotTables
-    oDataPilotDescriptor = oDataPilotTables.createDataPilotDescriptor()
-    oDataPilotDescriptor.setSourceRange(sCellRangeAddress)
-
-    oDataPilotTables.insertNewByName(cObjectName, sCellAddress, oDataPilotDescriptor)
-
-    oObj = oDataPilotTables.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/script.xlb
deleted file mode 100644
index 39577313ecb2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DataPilotTablesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_DataPilotTablesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_DataPilotTablesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/sc_ScIndexEnumeration_DatabaseRangesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/sc_ScIndexEnumeration_DatabaseRangesEnumeration.xba
deleted file mode 100644
index 6e78dc566ce4..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/sc_ScIndexEnumeration_DatabaseRangesEnumeration.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_DatabaseRangesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_DatabaseRangesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oRanges As Variant
-    Dim sCellRangeAddress As New com.sun.star.table.CellRangeAddress
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    sCellRangeAddress.Sheet = 0
-    sCellRangeAddress.StartColumn = 1
-    sCellRangeAddress.StartRow = 1
-    sCellRangeAddress.EndColumn = 5
-    sCellRangeAddress.EndRow = 5
-
-    oRanges = oDoc.getPropertyValue("DatabaseRanges")
-    oRanges.addNewByName(cObjectName, sCellRangeAddress)
-
-    oObj = oRanges.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/script.xlb
deleted file mode 100644
index 4fe8484dd7ff..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_DatabaseRangesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_DatabaseRangesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_DatabaseRangesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/sc_ScIndexEnumeration_FunctionDescriptionEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/sc_ScIndexEnumeration_FunctionDescriptionEnumeration.xba
deleted file mode 100644
index e4db70d1e080..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/sc_ScIndexEnumeration_FunctionDescriptionEnumeration.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_FunctionDescriptionEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-	Dim oFD as Object
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oFD = createUnoService("com.sun.star.sheet.FunctionDescriptions")
-
-    oObj = oFD.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/script.xlb
deleted file mode 100644
index a1ed8d05a5e1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_FunctionDescriptionEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_FunctionDescriptionEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_FunctionDescriptionEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/sc_ScIndexEnumeration_LabelRangesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/sc_ScIndexEnumeration_LabelRangesEnumeration.xba
deleted file mode 100644
index fb7e96bb4819..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/sc_ScIndexEnumeration_LabelRangesEnumeration.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_LabelRangesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_LabelRangesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim RangeAddress1 As New com.sun.star.table.CellRangeAddress
-    Dim RangeAddress2 As New com.sun.star.table.CellRangeAddress
-    Dim oRanges As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oRanges = oDoc.getPropertyValue("ColumnLabelRanges")
-    RangeAddress1.Sheet = 0
-    RangeAddress1.StartColumn = 1
-    RangeAddress1.StartRow = 1
-    RangeAddress1.EndColumn = 2
-    RangeAddress1.EndRow = 2
-
-    RangeAddress2.Sheet = 0
-    RangeAddress2.StartColumn = 5
-    RangeAddress2.StartRow = 5
-    RangeAddress2.EndColumn = 6
-    RangeAddress2.EndRow = 7
-
-    oRanges.addNew(RangeAddress1, RangeAddress2)
-
-    oObj = oRanges.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/script.xlb
deleted file mode 100644
index 2606b80616ed..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_LabelRangesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_LabelRangesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_LabelRangesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/sc_ScIndexEnumeration_NamedRangesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/sc_ScIndexEnumeration_NamedRangesEnumeration.xba
deleted file mode 100644
index 73ae78100bbd..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/sc_ScIndexEnumeration_NamedRangesEnumeration.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_NamedRangesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_NamedRangesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oNamedRanges As Object
-    Dim sBase As New com.sun.star.table.CellAddress
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oNamedRanges = oDoc.getPropertyValue("NamedRanges")
-
-    sBase.sheet = 0
-    sBase.Column = 0
-    sBase.Row = 0
-
-    oNamedRanges.addNewByNAme(cObjectName, "A1:B3", sBase, 0)
-
-    oObj = oNamedRanges.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/script.xlb
deleted file mode 100644
index ebbf4ec59a79..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_NamedRangesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_NamedRangesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_NamedRangesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/sc_ScIndexEnumeration_ScenariosEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/sc_ScIndexEnumeration_ScenariosEnumeration.xba
deleted file mode 100644
index 940d487f3f15..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/sc_ScIndexEnumeration_ScenariosEnumeration.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_ScenariosEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_ScenariosEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim aCRA(0) As New com.sun.star.table.CellRangeAddress
-    Dim oSheet As Object
-	Dim oScenarios as Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oSheet.getCellByPosition(0, 1).Value = 1
-    oSheet.getCellByPosition(3, 2).Value = 0
-    oSheet.getCellByPosition(4, 5).Value = -1
-
-    oScenarios = oSheet.getScenarios()
-
-    aCRA(0).Sheet = 0
-    aCRA(0).StartColumn = 0
-    aCRA(0).StartRow = 0
-    aCRA(0).EndColumn = 5
-    aCRA(0).EndRow = 5
-
-    oScenarios.addNewByName("Scenario1", aCRA(), "Comment1")
-    oScenarios.addNewByName("Scenario2", aCRA(), "Comment2")
-	
-	oObj = oScenarios.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/script.xlb
deleted file mode 100644
index 365a98ba583d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_ScenariosEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_ScenariosEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_ScenariosEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/sc_ScIndexEnumeration_SheetCellRangesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/sc_ScIndexEnumeration_SheetCellRangesEnumeration.xba
deleted file mode 100644
index 16947440d0d1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/sc_ScIndexEnumeration_SheetCellRangesEnumeration.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_SheetCellRangesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_SheetCellRangesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-	Dim oRanges as Object
-	Dim oInstance as Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oRanges = oDoc.createInstance("com.sun.star.sheet.SheetCellRanges")
-    oSheet = oDoc.Sheets(1)
-
-    oInstance=oSheet.getCellRangeByName("A1:C5")
-    oRanges.insertByName("CellRange1", oInstance)
-    oInstance=oSheet.getCellRangeByName("A7:D9")
-    oRanges.insertByName("CellRange2", oInstance)
-    oInstance=oSheet.getCellRangeByName("E1:E42")
-    oRanges.insertByName("CellRange3", oInstance)
-    oInstance=oSheet.getCellRangeByName("A10:B10")
-    oRanges.insertByName("CellRange4", oInstance)
-
-	oObj = oRanges.createEnumeration()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/script.xlb
deleted file mode 100644
index 450441480b9b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetCellRangesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_SheetCellRangesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_SheetCellRangesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/sc_ScIndexEnumeration_SheetLinksEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/sc_ScIndexEnumeration_SheetLinksEnumeration.xba
deleted file mode 100644
index d20d11a36920..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/sc_ScIndexEnumeration_SheetLinksEnumeration.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_SheetLinksEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_SheetLinksEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oSheet As Object
-    Dim sURL As String
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    sURL = cTestDocsDir &amp; "ScDDELinksObj.sdc"
-    oSheet.link(sURL, "Sheet1", "", "", com.sun.star.sheet.SheetLinkMode.VALUE)
-
-    oObj = oDoc.getPropertyValue("SheetLinks").createEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/script.xlb
deleted file mode 100644
index 6e60465caf1e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SheetLinksEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_SheetLinksEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_SheetLinksEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xba
deleted file mode 100644
index b0d989c08efa..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oController As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oController = oDoc.getCurrentController()
-    oObj = oController.createEnumeration()
-    wait(1000)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if not isNULL(oDoc) then oDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/script.xlb
deleted file mode 100644
index 23170d0672c2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_SpreadsheetViewPanesEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/sc_ScIndexEnumeration_SpreadsheetsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/sc_ScIndexEnumeration_SpreadsheetsEnumeration.xba
deleted file mode 100644
index 952020d42e35..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/sc_ScIndexEnumeration_SpreadsheetsEnumeration.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_SpreadsheetsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_SpreadsheetsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oSheets as Object
-	
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheets = oDoc.getSheets()
-	oObj = oSheets.createEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/script.xlb
deleted file mode 100644
index bb473296b67a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SpreadsheetsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_SpreadsheetsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_SpreadsheetsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/sc_ScIndexEnumeration_SubTotalFieldsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/sc_ScIndexEnumeration_SubTotalFieldsEnumeration.xba
deleted file mode 100644
index da63ca49dd89..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/sc_ScIndexEnumeration_SubTotalFieldsEnumeration.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_SubTotalFieldsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_SubTotalFieldsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim SubTotalDsc As Object
-    Dim SubTotalCol(0) As New com.sun.star.sheet.SubTotalColumn
-	Dim oSTF as Object
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    SubTotalDsc = oDoc.Sheets(0).createSubTotalDescriptor(true)
-    SubTotalCol(0).Column = 5
-    SubTotalCol(0).Function = com.sun.star.sheet.GeneralFunction.SUM
-
-    SubTotalDsc.addNew(SubTotalCol(), 1)
-    oSTF = SubTotalDsc.getByIndex(0)
-	oObj = SubTotalDsc.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/script.xlb
deleted file mode 100644
index b88d56a9577d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_SubTotalFieldsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_SubTotalFieldsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_SubTotalFieldsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/sc_ScIndexEnumeration_TableAutoFormatEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/sc_ScIndexEnumeration_TableAutoFormatEnumeration.xba
deleted file mode 100644
index 801e50642176..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/sc_ScIndexEnumeration_TableAutoFormatEnumeration.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TableAutoFormatEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TableAutoFormatEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oTAF as Object
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oTAF = createUNOService("com.sun.star.sheet.TableAutoFormats")
-	oObj = oTAF.createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/script.xlb
deleted file mode 100644
index 1cf0d165928d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableAutoFormatEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TableAutoFormatEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TableAutoFormatEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/sc_ScIndexEnumeration_TableChartsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/sc_ScIndexEnumeration_TableChartsEnumeration.xba
deleted file mode 100644
index f6f8e38ed8c9..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/sc_ScIndexEnumeration_TableChartsEnumeration.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TableChartsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TableChartsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet As Object
-    Dim i as Integer,j As Integer
-	Dim oCharts as Object
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-
-    ' Filling some cells with the text
-    for i = 1 to 6
-      oSheet.getCellByPosition(0, i).setString("Row" &amp; i)
-      oSheet.getCellByPosition(i, 0).setString("Col" &amp; i)
-    next i
-
-    for i = 1 to 6
-        for j = 1 to 6
-            oSheet.getCellByPosition(i, j).Value = (i + 1) * j
-        next j
-    next i
-
-    Dim tAddr As New com.sun.star.table.CellRangeAddress
-    tAddr.Sheet = 0
-    tAddr.StartRow = 0
-    tAddr.StartColumn = 0
-    tAddr.EndRow = 6
-    tAddr.EndColumn = 6
-
-    Dim tRect As New com.sun.star.awt.Rectangle
-    tRect.X = 200
-    tRect.Y = 200
-    tRect.Width = 10000
-    tRect.Height = 5000
-
-    oCharts = oSheet.getCharts()
-
-    Dim oRanges(0) As New com.sun.star.table.CellRangeAddress
-    oRanges(0) = tAddr
-    oCharts.addNewByName(cObjectName, tRect, oRanges(), true, true)
-	
-	oObj = oCharts.createEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/script.xlb
deleted file mode 100644
index 735ea1c6f418..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableChartsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TableChartsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TableChartsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/sc_ScIndexEnumeration_TableColumnsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/sc_ScIndexEnumeration_TableColumnsEnumeration.xba
deleted file mode 100644
index 600102ff93f8..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/sc_ScIndexEnumeration_TableColumnsEnumeration.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TableColumnsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TableColumnsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oTable as Object
-	
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oTable = oDoc.Sheets(0)
-    oObj = oTable.getColumns().createEnumeration()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/script.xlb
deleted file mode 100644
index e41f00088804..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableColumnsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TableColumnsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TableColumnsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/sc_ScIndexEnumeration_TableConditionalEntryEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/sc_ScIndexEnumeration_TableConditionalEntryEnumeration.xba
deleted file mode 100644
index 43385cbc3c6a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/sc_ScIndexEnumeration_TableConditionalEntryEnumeration.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TableConditionalEntryEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TableConditionalEntryEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oSheet, oConditionalFormat As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oSheet.getCellByPosition(5, 5).Value = 15
-    oSheet.getCellByPosition(1, 4).Value = 10
-    oSheet.getCellByPosition(2, 0).Value = -5.15
-
-    oConditionalFormat = oSheet.getPropertyValue("ConditionalFormat")
-
-    Dim oCellAddress As New com.sun.star.table.CellAddress
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-    
-    Dim oProps(4) As New com.sun.star.beans.PropertyValue
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$5"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oConditionalFormat.AddNew(oProps())
-
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$3"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oConditionalFormat.AddNew(oProps())
-
-    oObj = oConditionalFormat.createEnumeration()
-
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/script.xlb
deleted file mode 100644
index ec398ca4e48e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableConditionalEntryEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TableConditionalEntryEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TableConditionalEntryEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/sc_ScIndexEnumeration_TableRowsEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/sc_ScIndexEnumeration_TableRowsEnumeration.xba
deleted file mode 100644
index f9d17fc3d403..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/sc_ScIndexEnumeration_TableRowsEnumeration.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TableRowsEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TableRowsEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oTable as Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oTable = oDoc.Sheets(0)
-    oObj = oTable.getRows().createEnumeration()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/script.xlb
deleted file mode 100644
index 7e5d3684dc1a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TableRowsEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TableRowsEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TableRowsEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/sc_ScIndexEnumeration_TextFieldEnumeration.xba b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/sc_ScIndexEnumeration_TextFieldEnumeration.xba
deleted file mode 100644
index 400f93009962..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/sc_ScIndexEnumeration_TextFieldEnumeration.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScIndexEnumeration_TextFieldEnumeration" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScIndexEnumeration_TextFieldEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-	Dim oSheet as Object, oCell As Object
-	Dim oTextField as Object, oTextField1 As Object
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oTextField = oDoc.createInstance("com.sun.star.text.TextField.URL")
-
-    oSheet = oDoc.Sheets(0)
-    oCell = oSheet.getCellByPosition(5, 5)
-    oCell.insertTextContent(oCell.createTextCursor, oTextField, true)
-
-    oObj = oCell.getTextFields().createEnumeration()
-
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/script.xlb
deleted file mode 100644
index 45af83a841cb..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScIndexEnumeration_TextFieldEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScIndexEnumeration_TextFieldEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScIndexEnumeration_TextFieldEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/sc_ScLabelRangeObj.xba b/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/sc_ScLabelRangeObj.xba
deleted file mode 100644
index 935bb0b40f99..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/sc_ScLabelRangeObj.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScLabelRangeObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScLabelRangeObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim RangeAddress1 As New com.sun.star.table.CellRangeAddress
-    Dim RangeAddress2 As New com.sun.star.table.CellRangeAddress
-    Dim oRanges As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oRanges = oDoc.getPropertyValue("ColumnLabelRanges")
-    RangeAddress1.Sheet = 0
-    RangeAddress1.StartColumn = 1
-    RangeAddress1.StartRow = 1
-    RangeAddress1.EndColumn = 2
-    RangeAddress1.EndRow = 2
-
-    RangeAddress2.Sheet = 0
-    RangeAddress2.StartColumn = 5
-    RangeAddress2.StartRow = 5
-    RangeAddress2.EndColumn = 6
-    RangeAddress2.EndRow = 7
-
-    oRanges.addNew(RangeAddress1, RangeAddress2)
-    
-    oObj = oRanges(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/script.xlb
deleted file mode 100644
index e7a39e61cfab..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScLabelRangeObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScLabelRangeObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScLabelRangeObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/sc_ScLabelRangesObj.xba b/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/sc_ScLabelRangesObj.xba
deleted file mode 100644
index 482c89c426ca..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/sc_ScLabelRangesObj.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScLabelRangesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScLabelRangesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim RangeAddress1 As New com.sun.star.table.CellRangeAddress
-    Dim RangeAddress2 As New com.sun.star.table.CellRangeAddress
-    Dim oRanges As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oRanges = oDoc.getPropertyValue("ColumnLabelRanges")
-    RangeAddress1.Sheet = 0
-    RangeAddress1.StartColumn = 1
-    RangeAddress1.StartRow = 1
-    RangeAddress1.EndColumn = 2
-    RangeAddress1.EndRow = 2
-
-    RangeAddress2.Sheet = 0
-    RangeAddress2.StartColumn = 5
-    RangeAddress2.StartRow = 5
-    RangeAddress2.EndColumn = 6
-    RangeAddress2.EndRow = 7
-
-    oRanges.addNew(RangeAddress1, RangeAddress2)
-
-    oObj = oRanges
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/script.xlb
deleted file mode 100644
index db8dd5aed90f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScLabelRangesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScLabelRangesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScLabelRangesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScModelObj/sc_ScModelObj.xba b/qadevOOo/tests/basic/mod/sc/ScModelObj/sc_ScModelObj.xba
deleted file mode 100644
index fdc39142d5dc..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScModelObj/sc_ScModelObj.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScModelObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oXModelController as Object
-Global oXModelSel as Object
-Global oXModelToSel as Object
-Global oComponentInstance As Object
-Global oControllerDoc As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScModelObj
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oComponentInstance = utils.createDocument("scalc", cObjectName &amp; "1")
-    oControllerDoc = utils.createDocument("scalc", cObjectName &amp; "2")
-
-    oObj = oDoc
-
-    oXModelToSel = oDoc.Sheets(0).getCellByPosition(2,3)
-    oXModelController = oControllerDoc.getCurrentController()
-    oXModelSel = oDoc.getCurrentController()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentInstance) then oComponentInstance.dispose()
-    if NOT isNULL(oControllerDoc) then oControllerDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScModelObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScModelObj/script.xlb
deleted file mode 100644
index 05c588dacb23..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScModelObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScModelObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScModelObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/sc_ScNamedRangeObj.xba b/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/sc_ScNamedRangeObj.xba
deleted file mode 100644
index 020ef20081e3..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/sc_ScNamedRangeObj.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScNamedRangeObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oReferredCells As Variant
-
-' Required by com.sun.star.container.XNamed
-Global cNameToSet As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScNamedRangeObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oNamedRanges As Variant
-    Dim sBase As New com.sun.star.table.CellAddress
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oNamedRanges = oDoc.getPropertyValue("NamedRanges")
-
-    sBase.sheet = 0
-    sBase.Column = 0
-    sBase.Row = 0
-
-    oNamedRanges.addNewByName(cObjectName, "A1:B3", sBase, 0)
-
-    Dim ReferredCells As New com.sun.star.table.CellRangeAddress
-    ReferredCells.Sheet = 0
-    ReferredCells.StartRow = 0
-    ReferredCells.StartColumn = 0
-    ReferredCells.EndRow = 2
-    ReferredCells.EndColumn = 1
-
-    oReferredCells = ReferredCells
-
-    oObj = oNamedRanges.getByName(cObjectName)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/script.xlb
deleted file mode 100644
index 70955626df3a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScNamedRangeObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScNamedRangeObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScNamedRangeObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/sc_ScNamedRangesObj.xba b/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/sc_ScNamedRangesObj.xba
deleted file mode 100644
index d9bf1c13229e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/sc_ScNamedRangesObj.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScNamedRangesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScNamedRangesObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oNamedRanges As Object
-    Dim sBase As New com.sun.star.table.CellAddress
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oNamedRanges = oDoc.getPropertyValue("NamedRanges")
-
-    sBase.sheet = 0
-    sBase.Column = 0
-    sBase.Row = 0
-
-    oNamedRanges.addNewByNAme(cObjectName, "A1:B3", sBase, 0)
-
-    oObj = oNamedRanges
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/script.xlb
deleted file mode 100644
index 7eaf3657e2be..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScNamedRangesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScNamedRangesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScNamedRangesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScPageObj/sc_ScPageObj.xba b/qadevOOo/tests/basic/mod/sc/ScPageObj/sc_ScPageObj.xba
deleted file mode 100644
index b2863fe1d39f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScPageObj/sc_ScPageObj.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScPageObj" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::drawing::XShapes" needs the following Global variables:
-Global oXShapeInstance As Object
-
-' "com::sun::star::drawing::XShapeGrouper" needs the following Global variables:
-Global oGrouperCollection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScPageObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-	Dim oDP as Object
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    oDP = oDoc.getDrawPages()
-	
-	oDP.insertNewByIndex(0)
-	oDP.insertNewByIndex(1)
-	
-	oObj = oDP.getByIndex(0)
-	addShape(oObj,1)
-	addShape(oObj,2)
-	addShape(oObj,3)
-	addShape(oObj,4)
-	
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oGrouperCollection.Add(oObj.getByIndex(2))
-    oGrouperCollection.Add(oObj.getByIndex(3))
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function addShape(oPage as Object, no as Integer) As Object
-On Error Goto ErrHndl
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oShape As Object
-    Dim servNames As Variant
-
-    aPoint.x = 1000 * no
-    aPoint.y = 1000 * no
-    aSize.Width = 2000
-    aSize.Height = 1000
-    oShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oShape.Size = aSize
-    oShape.Position = aPoint
-    
-    oPage.add(oShape)
-
-    addShapeToDrawDoc() = oShape
-Exit Function
-ErrHndl:
-	Test.Exception()
-End Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScPageObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScPageObj/script.xlb
deleted file mode 100644
index 9a4815c1a3d9..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScPageObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScPageObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScPageObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/sc_ScRecentFunctionsObj.xba b/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/sc_ScRecentFunctionsObj.xba
deleted file mode 100644
index 632997d122e7..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/sc_ScRecentFunctionsObj.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScRecentFunctionsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.sheet.XRecentFunctions
-Global AllFunctions As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScRecentFunctionsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.sheet.RecentFunctions")
-    AllFunctions = createUnoService("com.sun.star.sheet.FunctionDescriptions")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/script.xlb
deleted file mode 100644
index 0c346580562d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScRecentFunctionsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScRecentFunctionsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScRecentFunctionsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScScenariosObj/sc_ScScenariosObj.xba b/qadevOOo/tests/basic/mod/sc/ScScenariosObj/sc_ScScenariosObj.xba
deleted file mode 100644
index 1397f01ce0e1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScScenariosObj/sc_ScScenariosObj.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScScenariosObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScScenariosObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim aCRA(0) As New com.sun.star.table.CellRangeAddress
-    Dim oSheet As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oSheet.getCellByPosition(0, 1).Value = 1
-    oSheet.getCellByPosition(3, 2).Value = 0
-    oSheet.getCellByPosition(4, 5).Value = -1
-
-    oObj = oSheet.getScenarios()
-
-    aCRA(0).Sheet = 0
-    aCRA(0).StartColumn = 0
-    aCRA(0).StartRow = 0
-    aCRA(0).EndColumn = 5
-    aCRA(0).EndRow = 5
-
-    oObj.addNewByName("Scenario1", aCRA(), "Comment1")
-    oObj.addNewByName("Scenario2", aCRA(), "Comment2")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScScenariosObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScScenariosObj/script.xlb
deleted file mode 100644
index 3bd24d608918..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScScenariosObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScScenariosObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScScenariosObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/sc_ScSheetLinkObj.xba b/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/sc_ScSheetLinkObj.xba
deleted file mode 100644
index 7a7160f07d1f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/sc_ScSheetLinkObj.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSheetLinkObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required by com.sun.star.container.XNamed
-Global cNameToSet As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSheetLinkObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet, oLinks As Object
-    Dim sURL As String
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    sURL = cTestDocsDir &amp; "ScSheetLinksObj.sdc"
-    oSheet.link(sURL, "Sheet1", "", "", com.sun.star.sheet.SheetLinkMode.VALUE)
-    oLinks = oDoc.getPropertyValue("SheetLinks")
-
-    oObj = oLinks.getByIndex(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/script.xlb
deleted file mode 100644
index 07b533e4b1b0..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSheetLinkObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSheetLinkObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSheetLinkObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/sc_ScSheetLinksObj.xba b/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/sc_ScSheetLinksObj.xba
deleted file mode 100644
index 0a2cd6bf5ae1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/sc_ScSheetLinksObj.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSheetLinksObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSheetLinksObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-    Dim sURL As String
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    sURL = cTestDocsDir &amp; "ScDDELinksObj.sdc"
-    oSheet.link(sURL, "Sheet1", "", "", com.sun.star.sheet.SheetLinkMode.VALUE)
-
-    oObj = oDoc.getPropertyValue("SheetLinks")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/script.xlb
deleted file mode 100644
index 62787f29736b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSheetLinksObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSheetLinksObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSheetLinksObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/sc_ScSpreadsheetSettings.xba b/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/sc_ScSpreadsheetSettings.xba
deleted file mode 100644
index d55538b44064..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/sc_ScSpreadsheetSettings.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSpreadsheetSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSpreadsheetSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet, oSettings As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oSettings = createUnoService("com.sun.star.sheet.GlobalSheetSettings")
-
-    oObj = oSettings
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/script.xlb
deleted file mode 100644
index a1ffc4f1a456..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSpreadsheetSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSpreadsheetSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/sc_ScSpreadsheetSettingsObj.xba b/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/sc_ScSpreadsheetSettingsObj.xba
deleted file mode 100644
index db445896a86e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/sc_ScSpreadsheetSettingsObj.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSpreadsheetSettingsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSpreadsheetSettingsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/script.xlb
deleted file mode 100644
index 303297ae4c64..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSpreadsheetSettingsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSpreadsheetSettingsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSpreadsheetSettingsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/sc_ScStyleFamiliesObj.xba b/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/sc_ScStyleFamiliesObj.xba
deleted file mode 100644
index 030c130e13a4..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/sc_ScStyleFamiliesObj.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScStyleFamiliesObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScStyleFamiliesObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.StyleFamilies
-
-    ' nGlobalLong is 2 "CellStyles" and "PageStyles"
-    nGlobalLong = 2
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/script.xlb
deleted file mode 100644
index 5e7e3bee29ba..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleFamiliesObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScStyleFamiliesObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScStyleFamiliesObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/sc_ScStyleFamilyObj.xba b/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/sc_ScStyleFamilyObj.xba
deleted file mode 100644
index cfef8896328e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/sc_ScStyleFamilyObj.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScStyleFamilyObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oInstance As Object
-Global cNameToReplace As String
-Global oReplaceInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScStyleFamilyObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.StyleFamilies.getByName("PageStyles")
-
-    ' creating differen formats
-    oInstance = oDoc.createInstance("com.sun.star.style.PageStyle")
-    oInstance.BackgroundColor = 65280
-    oObj.insertByName(cObjectName &amp; "_Green", oInstance)
-
-    oInstance = oDoc.createInstance("com.sun.star.style.PageStyle")
-    oInstance.HeaderOn = false
-    oInstance.FooterOn = true
-    oObj.insertByName(cObjectName &amp; "_FooterOn", oInstance)
-
-    oReplaceInstance = oDoc.createInstance("com.sun.star.style.PageStyle")
-    oReplaceInstance.IsLandscape = true
-    cNameToReplace = cObjectName &amp; "_FooterOn"
-
-    oInstance = oDoc.createInstance("com.sun.star.style.PageStyle")
-    oInstance.HeaderOn = true
-    oInstance.FooterOn = false
-
-    nGlobalLong = oObj.Count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/script.xlb
deleted file mode 100644
index 72004d2ef4e1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleFamilyObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScStyleFamilyObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScStyleFamilyObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleObj/sc_ScStyleObj.xba b/qadevOOo/tests/basic/mod/sc/ScStyleObj/sc_ScStyleObj.xba
deleted file mode 100644
index 383f68fadd08..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleObj/sc_ScStyleObj.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScStyleObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.style.XStyle
- Global oStandartStyle As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScStyleObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oStyleFamilies, aElementNames As Variant
-    Dim oCell, oStyleFamily, oNew As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oCell = oDoc.Sheets(0).getCellByPosition(0, 0)
-    oStyleFamilies = oDoc.StyleFamilies
-    aElementNames = oStyleFamilies.Elementnames
-    oNew = oDoc.createInstance("com.sun.star.style.CellStyle")
-    oStyleFamily = oStyleFamilies.getByIndex(0)'
-    oStyleFamily.insertByName("Dummy", oNew)
-    oObj = oStyleFamily.getByName("Dummy")
-
-	oCell.setPropertyValue("CellStyle", "Dummy")
-
-    cNameToSet = aElementNames(0)
-    oStandartStyle = oStyleFamily.getByIndex(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScStyleObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScStyleObj/script.xlb
deleted file mode 100644
index 50fa02f3da2c..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScStyleObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScStyleObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScStyleObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/sc_ScSubTotalDescriptorBase.xba b/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/sc_ScSubTotalDescriptorBase.xba
deleted file mode 100644
index 7c90e914f6f3..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/sc_ScSubTotalDescriptorBase.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSubTotalDescriptorBase" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSubTotalDescriptorBase
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim SubTotalDsc As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    SubTotalDsc = oDoc.Sheets(0).createSubTotalDescriptor(true)
-    oObj = SubTotalDsc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/script.xlb
deleted file mode 100644
index c3a54021d887..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSubTotalDescriptorBase/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSubTotalDescriptorBase" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSubTotalDescriptorBase"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/sc_ScSubTotalFieldObj.xba b/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/sc_ScSubTotalFieldObj.xba
deleted file mode 100644
index ed5d6056e17d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/sc_ScSubTotalFieldObj.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScSubTotalFieldObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScSubTotalFieldObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim SubTotalDsc As Object
-    Dim SubTotalCol(0) As New com.sun.star.sheet.SubTotalColumn
-    
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    SubTotalDsc = oDoc.Sheets(0).createSubTotalDescriptor(true)
-    SubTotalCol(0).Column = 5
-    SubTotalCol(0).Function = com.sun.star.sheet.GeneralFunction.SUM
-
-    SubTotalDsc.addNew(SubTotalCol(), 1)
-    oObj = SubTotalDsc.getByIndex(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/script.xlb
deleted file mode 100644
index 82bd8e5d8093..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScSubTotalFieldObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScSubTotalFieldObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScSubTotalFieldObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTabViewObj/sc_ScTabViewObj.xba b/qadevOOo/tests/basic/mod/sc/ScTabViewObj/sc_ScTabViewObj.xba
deleted file mode 100644
index b0922cc39321..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTabViewObj/sc_ScTabViewObj.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTabViewObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.view.XSelectionSupplier
- Global SelectableObj1 As Object
- Global SelectableObj2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTabViewObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.currentController
-    SelectableObj1 = oDoc.Sheets(0).getCellRangeByPosition(1, 1, 4, 5)
-    SelectableObj2 = oDoc.Sheets(0).getCellRangeByPosition(2, 4, 6, 7)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTabViewObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTabViewObj/script.xlb
deleted file mode 100644
index c5c89921ff64..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTabViewObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTabViewObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTabViewObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/sc_ScTableColumnObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/sc_ScTableColumnObj.xba
deleted file mode 100644
index c416d50df2d8..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/sc_ScTableColumnObj.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableColumnObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableColumnObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet, oColumn, oCellRange As Object
-    Dim oColumns As Variant
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oSheet = oDoc.Sheets(0)
-    oCellRange = oSheet.getCellRangeByPosition(0,0,10,10)
-    oColumns = oCellRange.getColumns
-    oColumn = oColumns.getByIndex(5)
-
-    oObj = oColumn
-    cNameToSet = "fixed"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/script.xlb
deleted file mode 100644
index eb8c487202f9..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableColumnObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableColumnObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableColumnObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/sc_ScTableColumnsObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/sc_ScTableColumnsObj.xba
deleted file mode 100644
index fbf62a1c43bb..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/sc_ScTableColumnsObj.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableColumnsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for XTableColumns
- Global oTable As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableColumnsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oTable = oDoc.Sheets(0)
-    oObj = oTable.getColumns()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/script.xlb
deleted file mode 100644
index 9e80c2978193..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableColumnsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableColumnsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableColumnsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/sc_ScTableConditionalEntry.xba b/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/sc_ScTableConditionalEntry.xba
deleted file mode 100644
index e6956b4cb952..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/sc_ScTableConditionalEntry.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableConditionalEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableConditionalEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oSheet, oConditionalFormat As Object
-
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oSheet.getCellByPosition(5, 5).Value = 15
-    oSheet.getCellByPosition(1, 4).Value = 10
-    oSheet.getCellByPosition(2, 0).Value = -5.15
-
-    oConditionalFormat = oSheet.getPropertyValue("ConditionalFormat")
-
-    Dim oCellAddress As New com.sun.star.table.CellAddress
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-    
-    Dim oProps(4) As New com.sun.star.beans.PropertyValue
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$5"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oConditionalFormat.AddNew(oProps())
-
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$3"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oConditionalFormat.AddNew(oProps())
-
-    oObj = oConditionalFormat.getByIndex(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/script.xlb
deleted file mode 100644
index 4dcc8f67ca63..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableConditionalEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableConditionalEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableConditionalEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/sc_ScTableConditionalFormat.xba b/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/sc_ScTableConditionalFormat.xba
deleted file mode 100644
index cd19406e9f35..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/sc_ScTableConditionalFormat.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableConditionalFormat" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableConditionalFormat
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oSheet.getCellByPosition(5, 5).Value = 15
-    oSheet.getCellByPosition(1, 4).Value = 10
-    oSheet.getCellByPosition(2, 0).Value = -5.15
-
-    oObj = oSheet.getPropertyValue("ConditionalFormat")
-
-    Dim oCellAddress As New com.sun.star.table.CellAddress
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-
-    Dim oProps(4) As New com.sun.star.beans.PropertyValue
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$5"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oObj.AddNew(oProps())
-
-    oCellAddress.Sheet = 0
-    oCellAddress.Row = 1
-    oCellAddress.Column = 5
-
-    oProps(0).Name = "StyleName"
-    oProps(0).Value = "Result2"
-    oProps(1).Name = "Formula1"
-    oProps(1).Value = "$Sheet1.$B$3"
-    oProps(2).Name = "Formula2"
-    oProps(2).Value = ""
-    oProps(3).Name = "Operator"
-    oProps(3).Value = com.sun.star.sheet.ConditionOperator.EQUAL
-    oProps(4).Name = "SourcePosition"
-    oProps(4).Value = oCellAddress
-
-    oObj.AddNew(oProps())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub ReCreateObj()
-    if not isNULL(oDoc) then oDoc.dispose()
-    CreateObj()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/script.xlb
deleted file mode 100644
index 0b636a6bb49a..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableConditionalFormat/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableConditionalFormat" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableConditionalFormat"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableRowObj/sc_ScTableRowObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableRowObj/sc_ScTableRowObj.xba
deleted file mode 100644
index 7ceabf00d669..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableRowObj/sc_ScTableRowObj.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableRowObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableRowObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-    Dim oRows As Variant
-    Dim oRow As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets(0)
-    oRows = oSheet.getRows
-    oRow = oRows.getByIndex(5)
-
-    oObj = oRow
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableRowObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableRowObj/script.xlb
deleted file mode 100644
index 0aa03bfc0922..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableRowObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableRowObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableRowObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/sc_ScTableRowsObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/sc_ScTableRowsObj.xba
deleted file mode 100644
index f794bd93db06..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/sc_ScTableRowsObj.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableRowsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XTableRows
- Global oTable As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableRowsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oTable = oDoc.Sheets(0)
-    oObj = oTable.getRows()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/script.xlb
deleted file mode 100644
index 0c0d33a2d264..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableRowsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableRowsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableRowsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/sc_ScTableSheetObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/sc_ScTableSheetObj.xba
deleted file mode 100644
index 86439b375d75..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/sc_ScTableSheetObj.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableSheetObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.sheet.Spreadsheet
-Global sStyleName As String
-
-' Required for com.sun.star.chart.XChartData
-Global oCellToChange As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableSheetObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oStyleFamilies As Variant
-    Dim oNewPageStyle As Object
-    Dim oStyleFamily As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.sheets(0)
-
-    sStyleName = "MyStyle"
-    ' Adding new page style for Spreadsheet service testing
-    oStyleFamilies = oDoc.StyleFamilies
-    oStyleFamily = oStyleFamilies.getByName("PageStyles")
-    oNewPageStyle = oDoc.createInstance("com.sun.star.style.PageStyle")
-    oStyleFamily.insertByName(sStyleName, oNewPageStyle)
-
-    oCellToChange = oObj.getCellByPosition(2, 2)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-Function modifyDescriptor(descr As Variant) As Variant
-On Error Goto ErrHndl
-    Dim i As Integer, n as Integer
-    Dim oCell As Object
-    Dim vFields(0) as new com.sun.star.table.TableSortField
-    
-    for i = 0 to 10 - 1
-        oCell = oObj.getCellByPosition(0, i)
-        oCell.String = "" + (10 - i)
-        oCell.setFormula(10 - i)
-    next i
-    'ShowNameValuePair(descr)
-    vFields(0).IsCaseSensitive = false
-    vFields(0).IsAscending = true
-    vFields(0).FieldType = com.sun.star.table.TableSortFieldType.ALPHANUMERIC    
-    for i = 0 to ubound(descr)
-        if descr(i).Name = "IsSortColumns" then descr(i).Value = false
-        if descr(i).Name = "SortFields" then descr(i).Value = vFields()
-    next i
-
-    modifyDescriptor() = descr
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScTableSheetObj.modifyDescriptor() :")
-    Test.Exception()
-end Function
-
-Function checkSort() As Boolean
-On Error Goto ErrHndl
-    Dim i As Integer, oCell As Object
-    Dim bOK As Boolean
-
-    bOK = true
-    for i = 0 to 10 - 1
-        oCell = oObj.getCellByPosition(0,i)
-        bOK = bOK AND oCell.String = "" + (i + 1)
-        out.dbg(oCell.String + ":" + (i+1))
-    next i
-
-    checkSort() = bOK
-Exit Function
-ErrHndl:
-    Out.Log("Exception in ScTableSheetObj.checkSort() :")
-    Test.Exception()
-end Function
-
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/script.xlb
deleted file mode 100644
index 5779c6344207..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableSheetObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableSheetObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableSheetObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/sc_ScTableSheetsObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/sc_ScTableSheetsObj.xba
deleted file mode 100644
index d8d7db30c672..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/sc_ScTableSheetsObj.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableSheetsObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XSpreadsheets
- Global nGlobalLong As Long 'the number of sheets
-
-' Requiered for XNameReplace
- Global cNameToReplace As String 'name of instance to be replased
- Global oReplaceInstance As Object 'instance, that will be inserted
-                                   'instead old one
-
-' Requiered for XNameContainer
- Global oInstance As Object 'instance to insert
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableSheetsObj
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = oDoc.sheets
-
-    nGlobalLong = oObj.count()
-    cNameToReplace = "Sheet1"
-    oReplaceInstance = oDoc.createInstance("com.sun.star.sheet.Spreadsheet")
-    oReplaceInstance.Name = "ReplaceInstance"
-
-    oInstance = oDoc.createInstance("com.sun.star.sheet.Spreadsheet")
-    oInstance.Name = "InsertInstance"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/script.xlb
deleted file mode 100644
index 769981f22ad2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableSheetsObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableSheetsObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableSheetsObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/sc_ScTableValidationObj.xba b/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/sc_ScTableValidationObj.xba
deleted file mode 100644
index 3d021a91eb3e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/sc_ScTableValidationObj.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScTableValidationObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScTableValidationObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oSheet As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oSheet = oDoc.Sheets.getByIndex(0)
-    oObj = oSheet.getPropertyValue("Validation")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/script.xlb
deleted file mode 100644
index 475644b9a162..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScTableValidationObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScTableValidationObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScTableValidationObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/sc_ScViewPaneObj.xba b/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/sc_ScViewPaneObj.xba
deleted file mode 100644
index 303a1593d86f..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/sc_ScViewPaneObj.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_ScViewPaneObj" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.sheet.XCellRangeReferrer
-Global oReferredCells As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.ScViewPaneObj
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oController As Object
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oController = oDoc.getCurrentController()
-    oObj = oController.getByIndex(0)
-    wait(1000)
-
-    oReferredCells = oObj.getVisibleRange()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if not isNULL(oDoc) then oDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/script.xlb b/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/script.xlb
deleted file mode 100644
index c4b6ca9fb33b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/ScViewPaneObj/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_ScViewPaneObj" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_ScViewPaneObj"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLContentExporter/sc_XMLContentExporter.xba b/qadevOOo/tests/basic/mod/sc/XMLContentExporter/sc_XMLContentExporter.xba
deleted file mode 100644
index 61a2c69b6478..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLContentExporter/sc_XMLContentExporter.xba
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLContentExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLContentExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5, Tag6, Tag7, Tag8 As Variant
-    Dim expString As String
-    Dim oSheets, oSheet, oCell As Object
-    
-    printXML = true
-    expString = "XMLContentExporter"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-content")
-    Tag2 = Array("office:body")
-    Tag3 = Array("office:script")
-    Tag4 = Array("table:table")
-    Tag5 = Array("table:table-column")
-    Tag6 = Array("table:table-row")
-    Tag7 = Array("table:table-cell")
-    Tag8 = Array("text:p")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag1), _
-                Array("TagEnclosed", Tag4, Tag2), _
-                Array("TagEnclosed", Tag5, Tag4), _
-                Array("TagEnclosed", Tag6, Tag4), _
-                Array("TagEnclosed", Tag7, Tag6), _
-                Array("TagEnclosed", Tag8, Tag7), _
-                Array("CharsEnclosed", Tag8, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Calc.XMLContentExporter", initArgs())
-
-    oSheets = oDoc.getSheets()
-    oSheet = oSheets.getByIndex(0)
-    oCell = oSheet.getCellByPosition(0, 0)
-    oCell.setFormula(expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "scalc: StarOffice XML (spreadsheet)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLContentExporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLContentExporter/script.xlb
deleted file mode 100644
index 64f440f3d14e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLContentExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLContentExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLContentExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLContentImporter/sc_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/sc/XMLContentImporter/sc_XMLContentImporter.xba
deleted file mode 100644
index 34b76255a9d1..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLContentImporter/sc_XMLContentImporter.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLContentImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sValue As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLContentImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Calc.XMLContentImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sValue = "XMLContentImporter_test"
-    vXMLData = Array( _
-            Array("start", "office:document-content", _
-                        "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                        "xmlns:text", "CDATA", "http://openoffice.org/2000/text", _
-                        "xmlns:table", "CDATA", "http://openoffice.org/2000/table", _
-                        "office:class", "CDATA", "spreadsheet"), _
-            Array("start", "office:body"), _
-            Array("start", "table:table", _
-                "table:name", "CDATA", sValue), _
-            Array("end", "table:table"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document-content"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim sheets As Object
-    out.log("checking of import...")
-    sheets = oDoc.getSheets()
-    res = sheets.hasByName(sValue)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLContentImporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLContentImporter/script.xlb
deleted file mode 100644
index a4af6299ac20..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLContentImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLContentImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLContentImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLExporter/sc_XMLExporter.xba b/qadevOOo/tests/basic/mod/sc/XMLExporter/sc_XMLExporter.xba
deleted file mode 100644
index bd087a3b2b9e..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLExporter/sc_XMLExporter.xba
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5, Tag6, Tag7, Tag8 As Variant
-    Dim expString As String
-    Dim oSheets As Object
-    Dim oSheet As Object
-    
-    printXML = true
-    expString = "NewNameOfSheet"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("office:settings")
-    Tag4 = Array("office:script")
-    Tag5 = Array("office:styles")
-    Tag6 = Array("office:body")
-    Tag7 = Array("table:table")
-    Tag8 = Array("table:table", "table:name", expString)
-    filter = Array( _
-                Array("TagExists", Tag1, Tag8), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag1), _
-                Array("TagEnclosed", Tag4, Tag1), _
-                Array("TagEnclosed", Tag5, Tag1), _
-                Array("TagEnclosed", Tag6, Tag1), _
-                Array("TagEnclosed", Tag7, Tag6) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Calc.XMLExporter", initArgs())
-
-    oSheets = oDoc.getSheets()
-    oSheet = oSheets.getByIndex(0)
-    oSheet.setName(expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "scalc: StarOffice XML (spreadsheet)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLExporter/script.xlb
deleted file mode 100644
index bbad099091c6..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLImporter/sc_XMLImporter.xba b/qadevOOo/tests/basic/mod/sc/XMLImporter/sc_XMLImporter.xba
deleted file mode 100644
index 3e2afecef2e2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLImporter/sc_XMLImporter.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sValue As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Calc.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sValue = "XMLContentImporter_test"
-    vXMLData = Array( _
-            Array("start", "office:document-content", _
-                        "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                        "xmlns:text", "CDATA", "http://openoffice.org/2000/text", _
-                        "xmlns:table", "CDATA", "http://openoffice.org/2000/table", _
-                        "office:class", "CDATA", "spreadsheet"), _
-            Array("start", "office:body"), _
-            Array("start", "table:table", _
-                "table:name", "CDATA", sValue), _
-            Array("end", "table:table"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document-content"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim sheets As Object
-    out.log("checking of import...")
-    sheets = oDoc.getSheets()
-    res = sheets.hasByName(sValue)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLImporter/script.xlb
deleted file mode 100644
index 0f1844030b73..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/sc_XMLMetaExporter.xba b/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/sc_XMLMetaExporter.xba
deleted file mode 100644
index 0677211a3bdc..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/sc_XMLMetaExporter.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLMetaExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLMetaExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim expString As String
-    Dim oDocInfo As Object
-    
-    printXML = true
-    expString = "NewTitleOfCalcDoc"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-meta")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1, Tag2), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Calc.XMLMetaExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "scalc: StarOffice XML (spreadsheet)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/script.xlb
deleted file mode 100644
index a21f959a083b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLMetaExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLMetaExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLMetaExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/sc_XMLMetaImporter.xba b/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/sc_XMLMetaImporter.xba
deleted file mode 100644
index 7bb319975478..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/sc_XMLMetaImporter.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLMetaImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sTitle As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLMetaImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Calc.XMLMetaImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sTitle = "XMLMetaImporter"
-    vXMLData = Array( _
-            Array("start", "office:document-meta", _
-                        "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                        "xmlns:meta", "CDATA", "http://openoffice.org/2000/meta", _
-                        "xmlns:dc", "CDATA", "http://purl.org/dc/elements/1.1/"), _
-            Array("start", "office:meta"), _
-            Array("start", "dc:title"), _
-            Array("chars", sTitle), _
-            Array("end", "dc:title"), _
-            Array("end", "office:meta"), _
-            Array("end", "office:document-meta"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim docInfo As Object
-    Dim title As String
-    out.log("checking of import...")
-    docInfo = oDoc.getDocumentInfo()
-    title = docInfo.getPropertyValue("Title")
-    res = title = sTitle
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/script.xlb
deleted file mode 100644
index b206fbd0b7f2..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLMetaImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLMetaImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLMetaImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/sc_XMLSettingsExporter.xba b/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/sc_XMLSettingsExporter.xba
deleted file mode 100644
index 6134c2e9b535..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/sc_XMLSettingsExporter.xba
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLSettingsExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLSettingsExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim oProp, oPropToSet As Boolean
-    Dim oController As Object
-    
-    printXML = true
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    oController = oDoc.getCurrentController()
-    oProp = oController.getPropertyValue("ShowGrid")
-    if (oProp = false) then
-        oPropToSet = true
-    else
-        oPropToSet = false
-    endif
-    
-
-    Tag1 = Array("office:document-settings")
-    Tag2 = Array("office:settings")
-    Tag3 = Array("config:config-item", "config:name", "ShowGrid")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("CharsEnclosed", Tag3, LCase(oPropToSet)) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Calc.XMLSettingsExporter", initArgs())
-
-    oController.setPropertyValue("ShowGrid", oPropToSet)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "scalc: StarOffice XML (spreadsheet)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/script.xlb
deleted file mode 100644
index 78a3fcfeac0d..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLSettingsExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLSettingsExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLSettingsExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/sc_XMLSettingsImporter.xba b/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/sc_XMLSettingsImporter.xba
deleted file mode 100644
index c29b15d20727..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/sc_XMLSettingsImporter.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLSettingsImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLSettingsImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Calc.XMLSettingsImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    vXMLData = Array( _
-            Array("start", "office:document-settings", _
-                    "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                    "xmlns:xlink", "CDATA", "http://www.w3.org/1999/xlink", _
-                    "xmlns:config", "CDATA", "http://openoffice.org/2001/config"), _
-            Array("start", "office:settings"), _
-            Array("start", "config:config-item-set", _
-                    "config:name", "CDATA", "view-settings"), _
-            Array("start", "config:config-item-map-indexed", _
-                    "config:name", "CDATA", "Views"), _
-            Array("start", "config:config-item-map-entry"), _
-            Array("start", "config:config-item", _
-                    "config:name", "CDATA", "ShowGrid", _
-                    "config:type", "CDATA", "boolean"), _
-            Array("chars", "false"), _
-            Array("end", "config:config-item"), _
-            Array("end", "config:config-item-map-entry"), _
-            Array("end", "config:config-item-map-indexed"), _
-            Array("end", "config:config-item-set"), _
-            Array("end", "office:settings"), _
-            Array("end", "office:document-settings"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim controller As Object
-    Dim isShowGrid As Boolean
-    out.log("checking of import...")
-    controller = oDoc.getCurrentController()
-    isShowGrid = controller.getPropertyValue("ShowGrid")
-    res = not isShowGrid
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/script.xlb
deleted file mode 100644
index 108809c8a8bf..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLSettingsImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLSettingsImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLSettingsImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/sc_XMLStylesExporter.xba b/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/sc_XMLStylesExporter.xba
deleted file mode 100644
index 509c07e8abfa..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/sc_XMLStylesExporter.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLStylesExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLStylesExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2 As Variant
-    Dim expString As String
-    Dim oStyleFamilies, oSFNames, oFamilyName, oFamily, oStyle As Object
-    
-    printXML = true
-    expString = "NewCellStyle"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-styles")
-    Tag2 = Array("style:style", "style:name", expString)
-    filter = Array(Array("TagExists", Tag1, Tag2))
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Calc.XMLStylesExporter", initArgs())
-
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oSFNames = oStyleFamilies.getElementNames()
-    oFamilyName = oSFNames(0)
-    oFamily = oStyleFamilies.getByName(oFamilyName)
-    oStyle = oDoc.createInstance("com.sun.star.style.CellStyle")
-    oFamily.insertByName(expString, oStyle)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "scalc: StarOffice XML (spreadsheet)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/script.xlb
deleted file mode 100644
index 49e80bcb9391..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLStylesExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLStylesExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLStylesExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/sc_XMLStylesImporter.xba b/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/sc_XMLStylesImporter.xba
deleted file mode 100644
index 3d451d4054c0..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/sc_XMLStylesImporter.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sc_XMLStylesImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sStyleName As String
-
-' Required for  com.sun.star.document.XImporter
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sc.XMLStylesImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Calc.XMLStylesImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sStyleName = "XMLStylesImporter"
-    vXMLData = Array( _
-            Array("start", "office:document-styles", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:style", "CDATA", "http://openoffice.org/2000/style", _
-                "xmlns:fo", "CDATA", "http://www.w3.org/1999/XSL/Format", _
-                "xmlns:table", "CDATA", "http://openoffice.org/2000/table"), _
-            Array("start", "office:styles"), _
-            Array("start", "style:style", _
-                "style:name", "CDATA", sStyleName, _
-                "style:family", "CDATA", "table-cell", _
-                "style:parent-style-name", "CDATA", "Default"), _
-            Array("start", "style:properties", _
-                "fo:width", "CDATA", "12cm", _
-                "fo:background-color", "CDATA", "light-grey"), _
-            Array("end", "style:properties"), _
-            Array("end", "style:style"), _
-            Array("end", "office:styles"), _
-            Array("end", "office:document-styles"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oStyleFamilies, oFamily As Object
-    Dim vNames As Variant
-    out.log("checking of import...")
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oFamily = oStyleFamilies.getByName("CellStyles")
-    res = oFamily.hasByName(sStyleName)    
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/script.xlb b/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/script.xlb
deleted file mode 100644
index 3a39542a031b..000000000000
--- a/qadevOOo/tests/basic/mod/sc/XMLStylesImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sc_XMLStylesImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sc_XMLStylesImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccArea/sch_AccArea.xba b/qadevOOo/tests/basic/mod/sch/AccArea/sch_AccArea.xba
deleted file mode 100644
index 8ba48afa97f1..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccArea/sch_AccArea.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccArea" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' com::sun::star::accessibility::XAccessibleEventBroadcaster#optional
- ' needs the following Global variables:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccArea
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-	Dim oChart as Object
-	
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Area")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccArea/script.xlb b/qadevOOo/tests/basic/mod/sch/AccArea/script.xlb
deleted file mode 100644
index 02c7830060bb..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccArea/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccArea" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccArea"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccAxis/sch_AccAxis.xba b/qadevOOo/tests/basic/mod/sch/AccAxis/sch_AccAxis.xba
deleted file mode 100644
index b80e9b9c7f25..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccAxis/sch_AccAxis.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccAxis" script:language="StarBasic">
-
-&apos;*************************************************************************
-&apos;*
-' 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.
-'
-&apos;*************************************************************************
-&apos;*************************************************************************
-
-
-
-
-
-&apos; REQUIRED VARIABLES for interface/service tests:
-
-Dim oListener1 As Object
-Dim oListener2 As Object
-Dim bL1called As Boolean
-Dim bL2called As Boolean
-Dim oDoc as Object
-
-Sub CreateObj()
-
-&apos;*************************************************************************
-&apos; COMPONENT: 
-&apos; sch.AccAxis
-&apos;*************************************************************************
-
-
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, &quot;axis&quot;)
-
-	Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
\ No newline at end of file
diff --git a/qadevOOo/tests/basic/mod/sch/AccAxis/script.xlb b/qadevOOo/tests/basic/mod/sch/AccAxis/script.xlb
deleted file mode 100644
index 012b217481a8..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccAxis/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccAxis" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccAxis"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDataPoint/sch_AccDataPoint.xba b/qadevOOo/tests/basic/mod/sch/AccDataPoint/sch_AccDataPoint.xba
deleted file mode 100644
index af177ef65942..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDataPoint/sch_AccDataPoint.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccDataPoint" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccDataPoint
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "DataPoint")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDataPoint/script.xlb b/qadevOOo/tests/basic/mod/sch/AccDataPoint/script.xlb
deleted file mode 100644
index 2402c2773442..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDataPoint/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccDataPoint" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccDataPoint"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDataSeries/sch_AccDataSeries.xba b/qadevOOo/tests/basic/mod/sch/AccDataSeries/sch_AccDataSeries.xba
deleted file mode 100644
index 92aa828e6d9a..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDataSeries/sch_AccDataSeries.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccDataSeries" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccDataSeries
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Data")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDataSeries/script.xlb b/qadevOOo/tests/basic/mod/sch/AccDataSeries/script.xlb
deleted file mode 100644
index 5fd9a49a7639..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDataSeries/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccDataSeries" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccDataSeries"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDiagram/sch_AccDiagram.xba b/qadevOOo/tests/basic/mod/sch/AccDiagram/sch_AccDiagram.xba
deleted file mode 100644
index 8244d25a9e2e..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDiagram/sch_AccDiagram.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccDiagram" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Diagram")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccDiagram/script.xlb b/qadevOOo/tests/basic/mod/sch/AccDiagram/script.xlb
deleted file mode 100644
index 3479707bb2ca..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccFloor/sch_AccFloor.xba b/qadevOOo/tests/basic/mod/sch/AccFloor/sch_AccFloor.xba
deleted file mode 100644
index 7aefe5a882d2..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccFloor/sch_AccFloor.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccFloor" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccFloor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-	Dim oDiagram as Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	Out.Log("Change Diagram to 3D...")
-	oDiagram = oDoc.getDiagram()
-	oDiagram.Dim3D = TRUE
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Floor")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccFloor/script.xlb b/qadevOOo/tests/basic/mod/sch/AccFloor/script.xlb
deleted file mode 100644
index 644d958fc792..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccFloor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccFloor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccFloor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccGrid/sch_AccGrid.xba b/qadevOOo/tests/basic/mod/sch/AccGrid/sch_AccGrid.xba
deleted file mode 100644
index 1bbc5d13fcd1..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccGrid/sch_AccGrid.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccGrid" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccGrid
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Grid")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccGrid/script.xlb b/qadevOOo/tests/basic/mod/sch/AccGrid/script.xlb
deleted file mode 100644
index a00c5cd9a74f..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccGrid/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccGrid" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccGrid"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccLegend/sch_AccLegend.xba b/qadevOOo/tests/basic/mod/sch/AccLegend/sch_AccLegend.xba
deleted file mode 100644
index 5bb91900a303..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccLegend/sch_AccLegend.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccLegend" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccLegend
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Legend")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccLegend/script.xlb b/qadevOOo/tests/basic/mod/sch/AccLegend/script.xlb
deleted file mode 100644
index 53bdb8a79574..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccLegend/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccLegend" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccLegend"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccLegendEntry/sch_AccLegendEntry.xba b/qadevOOo/tests/basic/mod/sch/AccLegendEntry/sch_AccLegendEntry.xba
deleted file mode 100644
index f5bc8834af80..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccLegendEntry/sch_AccLegendEntry.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccLegendEntry" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccLegendEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "LegendEntry")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccLegendEntry/script.xlb b/qadevOOo/tests/basic/mod/sch/AccLegendEntry/script.xlb
deleted file mode 100644
index 6bb8fe3f891a..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccLegendEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccLegendEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccLegendEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/sch_AccStatisticsObject.xba b/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/sch_AccStatisticsObject.xba
deleted file mode 100644
index c24631b604ad..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/sch_AccStatisticsObject.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccStatisticsObject" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccStatisticsObject
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-	Dim oDiagram as Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	Out.Log("Display MeanValue")
-	oDiagram = oDoc.getDiagram()
-	oDiagram.MeanValue = TRUE
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"average")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/script.xlb b/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/script.xlb
deleted file mode 100644
index eeee1ade4019..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccStatisticsObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccStatisticsObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccStatisticsObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccTitle/sch_AccTitle.xba b/qadevOOo/tests/basic/mod/sch/AccTitle/sch_AccTitle.xba
deleted file mode 100644
index 1615c9ed7bd3..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccTitle/sch_AccTitle.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccTitle" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccTitle
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Title")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccTitle/script.xlb b/qadevOOo/tests/basic/mod/sch/AccTitle/script.xlb
deleted file mode 100644
index cc042284ca9f..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccTitle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccTitle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccTitle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccWall/sch_AccWall.xba b/qadevOOo/tests/basic/mod/sch/AccWall/sch_AccWall.xba
deleted file mode 100644
index 9db84ee9dbf5..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccWall/sch_AccWall.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccWall" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccWall
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-    Dim oWin As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE, "Wall")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccWall/script.xlb b/qadevOOo/tests/basic/mod/sch/AccWall/script.xlb
deleted file mode 100644
index fad5fe8d21c0..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccWall/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccWall" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccWall"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/sch_AccessibleDocumentView.xba b/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/sch_AccessibleDocumentView.xba
deleted file mode 100644
index a0bed4161c98..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/sch_AccessibleDocumentView.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_AccessibleDocumentView" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' fireEvent()
-Global oWin As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.AccessibleDocumentView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object
-
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-	wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT, _
-											"AccessibleChartDocumentView")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-	Dim rect as new com.sun.star.awt.Rectangle
-	rect = oWin.getPosSize()
-	oWin.setPosSize(100,100,100,100,com.sun.star.awt.PosSize.POSSIZE)
-	oWin.setPosSize(rect.X,rect.Y,rect.Width,rect.Height,_
-										 com.sun.star.awt.PosSize.POSSIZE)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/script.xlb b/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/script.xlb
deleted file mode 100644
index b5ea1024c8a4..000000000000
--- a/qadevOOo/tests/basic/mod/sch/AccessibleDocumentView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_AccessibleDocumentView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_AccessibleDocumentView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartAxis/sch_ChXChartAxis.xba b/qadevOOo/tests/basic/mod/sch/ChXChartAxis/sch_ChXChartAxis.xba
deleted file mode 100644
index a5388e82a420..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartAxis/sch_ChXChartAxis.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXChartAxis" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXChartAxis
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim mRangeAddress(0) As New com.sun.star.table.CellRangeAddress
-    Dim oChart As Variant
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-	oChart = utils.createChartObject(oDoc, cObjectName)
-
-    oObj = oChart.Diagram.YAxis
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartAxis/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXChartAxis/script.xlb
deleted file mode 100644
index 03789abfa172..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartAxis/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXChartAxis" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXChartAxis"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartData/sch_ChXChartData.xba b/qadevOOo/tests/basic/mod/sch/ChXChartData/sch_ChXChartData.xba
deleted file mode 100644
index 78355716fd80..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartData/sch_ChXChartData.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXChartData" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.chart.XChartData
-Global oCellToChange As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXChartData
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-	Dim oChart as Object
-	Dim oDataArray as Object
-	
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oChart = utils.createChartObject(oDoc, cObjectName)
-    oDataArray = oChart.getdata()
-    oObj = oDataArray
-
-    oCellToChange = oDoc.Sheets(0).getCellByPosition(1, 1)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartData/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXChartData/script.xlb
deleted file mode 100644
index f2e2e820e542..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartData/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXChartData" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXChartData"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/sch_ChXChartDataArray.xba b/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/sch_ChXChartDataArray.xba
deleted file mode 100644
index 1c71c1e32d8f..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/sch_ChXChartDataArray.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXChartDataArray" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.chart.XChartData
- Global oCellToChange As Object
-
-' Requiered for XChartDataArray
- Global nTableH As Integer
- Global nTableW As Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXChartDataArray
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oChart = utils.createChartObject(oDoc, cObjectName)
-
-    Dim mRangeAddress(0) As New com.sun.star.table.CellRangeAddress
-    Dim aRect As New com.sun.star.awt.Rectangle
-
-    nTableH = 5
-    nTableW = 5
-
-    oObj = oChart.getdata()
-	oCellToChange = oDoc.Sheets(0).getCellByPosition(1, 1)	
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/script.xlb
deleted file mode 100644
index bbed0513544f..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartDataArray/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXChartDataArray" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXChartDataArray"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartDocument/sch_ChXChartDocument.xba b/qadevOOo/tests/basic/mod/sch/ChXChartDocument/sch_ChXChartDocument.xba
deleted file mode 100644
index 760da775c6e5..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartDocument/sch_ChXChartDocument.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXChartDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.frame.XModel
- Global oXModelController As Object
- Global oXModelSel As Object
- Global oXModelToSel As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXChartDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim aProp(0 to 0) As New com.sun.star.beans.PropertyValue
-    Dim oControllerDoc As Object
-	Dim oChart as Object
-	Dim oCompChart as Object
-	Dim oContChart as Object
-	Dim oContDoc as Object
-	
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-
-    oComponentInstance = utils.loadTestDocument("emptyChart.sds", cObjectName &amp; "1")
-	
-    oControllerDoc = utils.loadTestDocument("emptyChart.sds", cObjectName &amp; "2")
-	
-    oObj = oDoc
-    oXModelToSel = oDoc.getTitle()
-    oXModelController = oControllerDoc.getCurrentController()
-    oXModelSel = oDoc.getCurrentController()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentInstance) then oComponentInstance.dispose()
-
-    Dim oControllerDoc As Object
-    ' To successfully dispose oControllerDoc re-open it first.
-    oControllerDoc = utils.loadTestDocument("emptyChart.sds", cObjectName &amp; "2")
-    oControllerDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartDocument/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXChartDocument/script.xlb
deleted file mode 100644
index f3ece473ed8c..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXChartDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXChartDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartView/sch_ChXChartView.xba b/qadevOOo/tests/basic/mod/sch/ChXChartView/sch_ChXChartView.xba
deleted file mode 100644
index ea65387c5af0..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartView/sch_ChXChartView.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXChartView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.view.XSelectionSupplier
- Global SelectableObj1 As Object
- Global SelectableObj2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXChartView
-'*************************************************************************
-On Error Goto ErrHndl
-	Dim oChart as Object
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oObj = oDoc.getCurrentController()
-
-    SelectableObj1 = oDoc.Legend
-    SelectableObj2 = oDoc.Title
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXChartView/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXChartView/script.xlb
deleted file mode 100644
index 2ef9ba454a24..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXChartView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXChartView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXChartView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDataPoint/sch_ChXDataPoint.xba b/qadevOOo/tests/basic/mod/sch/ChXDataPoint/sch_ChXDataPoint.xba
deleted file mode 100644
index ffaa96356df1..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDataPoint/sch_ChXDataPoint.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXDataPoint" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXDataPoint
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCharts As Variant, oChart As Variant
-
-    bOK = true
-
-    oDoc = utils.loadTestDocument("TransparencyCalcChart.sxc", cObjectName)
-
-    oCharts = oDoc.Sheets(0).Charts
-
-    Dim aNames(), i as integer
-    aNames = oCharts.getElementNames()
-    Out.Log("Chart names :")
-    for  i = 0 to ubound(aNames()) 
-        Out.Log("'" + aNames(i) + "'")
-    next i
-        
-    oChart = oCharts.getByName("TestTransparentChart").embeddedObject
-
-    oObj = oChart.Diagram.getDataPointProperties(0, 0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDataPoint/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXDataPoint/script.xlb
deleted file mode 100644
index 47800a7f456b..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDataPoint/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXDataPoint" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXDataPoint"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDataRow/sch_ChXDataRow.xba b/qadevOOo/tests/basic/mod/sch/ChXDataRow/sch_ChXDataRow.xba
deleted file mode 100644
index 14fee9c685b5..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDataRow/sch_ChXDataRow.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXDataRow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXDataRow
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oCharts As Variant, oChart As Variant
-
-    bOK = true
-
-    oDoc = utils.loadTestDocument("TransparencyCalcChart.sxc", cObjectName)
-
-    oCharts = oDoc.Sheets(0).Charts
-
-    Dim aNames(), i as integer
-    aNames = oCharts.getElementNames()
-    Out.Log("Chart names :")
-    for  i = 0 to ubound(aNames()) 
-        Out.Log("'" + aNames(i) + "'")
-    next i
-        
-    oChart = oCharts.getByName("TestTransparentChart").embeddedObject
-
-' --- create the object to test here
-    oObj = oChart.Diagram.getDataRowProperties(0)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDataRow/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXDataRow/script.xlb
deleted file mode 100644
index f8437a29636a..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDataRow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXDataRow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXDataRow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDiagram/sch_ChXDiagram.xba b/qadevOOo/tests/basic/mod/sch/ChXDiagram/sch_ChXDiagram.xba
deleted file mode 100644
index 7bc63b5809eb..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDiagram/sch_ChXDiagram.xba
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChXDiagram" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-Dim nCol As Integer
-Dim nRow As Integer
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oLineDiagram As Object
-Global oStackDiagram As Object
-Global oStockDiagram As Object
-Global oBarDiagram As Object
-Global nGlobalBarDiagram As Long
-
-' For drawing.XShapeDescriptor
-Global cShapeType As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChXDiagram
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCharts As Object
-    Dim oChart As Object
-    Dim cType(4) As String
-    Dim mRangeAddress(0) As New com.sun.star.table.CellRangeAddress
-    Dim aRect As New com.sun.star.awt.Rectangle
-    Dim n As Integer
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    cType(0) = "StockDiagram"
-    cType(1) = "BarDiagram"
-    cType(2) = "XYDiagram"
-    cType(3) = "StackableDiagram"
-    cType(4) = "LineDiagram"
-
-    nCol = 5
-    nRow = 6
-    FillCells()
-
-    aRect.Width = 5000
-    aRect.Height = 5000
-    mRangeAddress(0).Sheet = 0
-    mRangeAddress(0).StartColumn = 0
-    mRangeAddress(0).StartRow = 0
-    mRangeAddress(0).EndColumn = nCol
-    mRangeAddress(0).EndRow = nRow
-
-    for n = 0 to 4
-        aRect.X = 500 * n
-        aRect.Y = 3000 * n
-        oCharts = oDoc.Sheets(0).Charts
-        oCharts.addNewByName(cObjectName + cType(n) + n, aRect, mRangeAddress(), true, true)
-        oChart = oCharts.getByName(cObjectName + cType(n) + n).EmbeddedObject
-        oChart.Diagram = oChart.createInstance("com.sun.star.chart." + cType(n))
-    next n
-
-    oStockDiagram = oCharts.getByName(cObjectName + cType(0) + 0).EmbeddedObject.Diagram
-    oBarDiagram   = oCharts.getByName(cObjectName + cType(1) + 1).EmbeddedObject.Diagram
-    oLineDiagram  = oCharts.getByName(cObjectName + cType(2) + 2).EmbeddedObject.Diagram
-    oStackDiagram = oCharts.getByName(cObjectName + cType(3) + 3).EmbeddedObject.Diagram
-    oObj          = oCharts.getByName(cObjectName + cType(4) + 4).EmbeddedObject.Diagram
-
-    nGlobalBarDiagram = 4
-
-    ' For drawing.XShapeDescriptor
-    cShapeType = "com.sun.star.chart.Diagram"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub FillCells()
-    Dim oCell As Object
-    Dim oRange As Object
-    Dim n1 As Integer
-    Dim n2 As Integer
-    Dim oFormats As Variant
-    Dim nFormat As Integer
-    Dim nKey As Integer
-    Dim aLanguage As New com.sun.star.lang.Locale
-
-    oRange = oDoc.Sheets(0).getCellRangeByPosition(0, 0, nCol, nRow)
-
-    for n1 = 1 to nCol - 1
-        For n2 = 1 To nRow - 1
-            oRange.getCellByPosition(n1, n2).Value = n2 * (n1 + 1)
-        Next n2
-    next n1
-
-    for n1 = 1 to nCol - 1
-        oRange.getCellByPosition(n1, 0).String = "Col " + n1
-    next n1
-    for n2 = 1 to nRow - 1
-        oRange.getCellByPosition(0, n2).String = "Row " + n2
-    next n2
-
-    oFormats = oDoc.NumberFormats
-    nFormat = com.sun.star.util.NumberFormat.CURRENCY
-    nKey = oFormats.getStandardFormat(nFormat, aLanguage)
-    oRange.NumberFormat = nKey
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChXDiagram/script.xlb b/qadevOOo/tests/basic/mod/sch/ChXDiagram/script.xlb
deleted file mode 100644
index ad6b03bad01c..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChXDiagram/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChXDiagram" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChXDiagram"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartArea/sch_ChartArea.xba b/qadevOOo/tests/basic/mod/sch/ChartArea/sch_ChartArea.xba
deleted file mode 100644
index 6329b64ed4bb..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartArea/sch_ChartArea.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChartArea" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-Dim nCol As Integer
-Dim nRow As Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChartArea
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oCharts As Variant, oChart As Variant
-
-    bOK = true
-
-    oDoc = utils.loadTestDocument("TransparencyCalcChart.sxc", cObjectName)
-
-    oCharts = oDoc.Sheets(0).Charts
-
-    Dim aNames(), i as integer
-    aNames = oCharts.getElementNames()
-    Out.Log("Chart names :")
-    for  i = 0 to ubound(aNames()) 
-        Out.Log("'" + aNames(i) + "'")
-    next i
-        
-    oChart = oCharts.getByName("TestTransparentChart").embeddedObject
-
-    oObj = oChart.Area()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartArea/script.xlb b/qadevOOo/tests/basic/mod/sch/ChartArea/script.xlb
deleted file mode 100644
index 0265cd6bf756..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartArea/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChartArea" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChartArea"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartGrid/sch_ChartGrid.xba b/qadevOOo/tests/basic/mod/sch/ChartGrid/sch_ChartGrid.xba
deleted file mode 100644
index 890e396d093d..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartGrid/sch_ChartGrid.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChartGrid" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChartGrid
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-	Dim oChart as Object
-	
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-	oChart = utils.createChartObject(oDoc, cObjectName)
-
-    oObj = oChart.Diagram.XMainGrid
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartGrid/script.xlb b/qadevOOo/tests/basic/mod/sch/ChartGrid/script.xlb
deleted file mode 100644
index 29630a9e330a..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartGrid/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChartGrid" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChartGrid"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartLegend/sch_ChartLegend.xba b/qadevOOo/tests/basic/mod/sch/ChartLegend/sch_ChartLegend.xba
deleted file mode 100644
index e947d4f53e23..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartLegend/sch_ChartLegend.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChartLegend" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oComponentInstance As Object ' it will be disposed
-
-Global oComponentDoc As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChartLegend
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oCharts As Object, oChart As Object
-	Dim oCompChart as Object
-	
-    bOK = true
-    oDoc = utils.loadTestDocument("TransparencyCalcChart.sxc", cObjectName)
-    oComponentDoc = utils.createDocument("scalc", cObjectName &amp; "1")
-
-    oCharts = oDoc.Sheets(0).Charts
-
-    Dim aNames(), i as integer
-    aNames = oCharts.getElementNames()
-    Out.Log("Chart names :")
-    for  i = 0 to ubound(aNames()) 
-        Out.Log("'" + aNames(i) + "'")
-    next i
-        
-    oChart = oCharts.getByName("TestTransparentChart").embeddedObject
-
-    oObj = oChart.Legend
-	oCompChart = utils.createChartObject(oComponentDoc, cObjectName &amp; "1")
-    oComponentInstance = oCompChart.Legend
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentDoc) then oComponentDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartLegend/script.xlb b/qadevOOo/tests/basic/mod/sch/ChartLegend/script.xlb
deleted file mode 100644
index 812179674e54..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartLegend/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChartLegend" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChartLegend"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartLine/sch_ChartLine.xba b/qadevOOo/tests/basic/mod/sch/ChartLine/sch_ChartLine.xba
deleted file mode 100644
index 8ca4921a894c..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartLine/sch_ChartLine.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChartLine" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChartLine
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-	Dim oChart as Object
-    bOK = true
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    oChart = utils.createChartObject(oDoc, cObjectName)
-
-    oChart.Diagram = oChart.createInstance("com.sun.star.chart.LineDiagram")
-    oObj = oChart.Diagram.MinMaxLine
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartLine/script.xlb b/qadevOOo/tests/basic/mod/sch/ChartLine/script.xlb
deleted file mode 100644
index 90051ab34bfd..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartLine/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChartLine" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChartLine"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartTitle/sch_ChartTitle.xba b/qadevOOo/tests/basic/mod/sch/ChartTitle/sch_ChartTitle.xba
deleted file mode 100644
index 4cc3135dc4a8..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartTitle/sch_ChartTitle.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sch_ChartTitle" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentDoc As Object
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sch.ChartTitle
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oChart As Object
-	Dim oCompChart as Object
-	
-    oDoc = utils.createDocument("scalc", cObjectName)
-    oChart = utils.createChartObject(oDoc, cObjectName)
-    oComponentDoc = utils.createDocument("scalc", cObjectName &amp; "1")
-    oCompChart = utils.createChartObject(oComponentDoc, cObjectName)
-
-    oChart.hasMainTitle = true
-    oObj = oChart.Title
-    oComponentInstance = oComponentDoc.Title
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub FillCells()
-    Dim oRange As Object
-    Dim n1 As Integer
-    Dim n2 As Integer
-
-    oRange = oDoc.Sheets(0).getCellRangeByPosition(0, 0, nCol, nRow)
-
-    for n1 = 1 to nCol - 1
-        For n2 = 1 To nRow - 1
-            oRange.getCellByPosition(n1, n2).Value = n2 * (n1 + 1)
-        Next n2
-    next n1
-
-    for n1 = 1 to nCol - 1
-        oRange.getCellByPosition(n1, 0).String = "Col " + n1
-    next n1
-    for n2 = 1 to nRow - 1
-        oRange.getCellByPosition(0, n2).String = "Row " + n2
-    next n2
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentDoc) then oComponentDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sch/ChartTitle/script.xlb b/qadevOOo/tests/basic/mod/sch/ChartTitle/script.xlb
deleted file mode 100644
index 0958c2b7525a..000000000000
--- a/qadevOOo/tests/basic/mod/sch/ChartTitle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sch_ChartTitle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sch_ChartTitle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/script.xlb b/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/script.xlb
deleted file mode 100644
index 749d06a8e422..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_AccessibleDrawDocumentView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_AccessibleDrawDocumentView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/sd_AccessibleDrawDocumentView.xba b/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/sd_AccessibleDrawDocumentView.xba
deleted file mode 100644
index 8a1a5c077e68..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleDrawDocumentView/sd_AccessibleDrawDocumentView.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_AccessibleDrawDocumentView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oDP1 As Object, oDP2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.AccessibleDrawDocumentView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oDPs As Object
-    Dim oWin As Object, xRoot As Object, oShape As Object
-    Dim oSearchedContext As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    Out.Log("Getting drawpages...")
-    oDPs = oDoc.getDrawPages()
-    oDP1 = oDPs.insertNewByIndex(1)
-    oDP2 = oDPs.getByIndex(0)
-    Out.Log("Inserting a shape...")
-    oShape = toolkittools.addShapeToDrawDoc(oDP2,1000,2000,"Rectangle")
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oSearchedContext = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-    oObj = oSearchedContext
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oDoc.getCurrentController().setCurrentPage(oDP2)
-    oDoc.getCurrentController().setCurrentPage(oDP1)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/script.xlb b/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/script.xlb
deleted file mode 100644
index 5d66d87def30..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_AccessibleOutlineView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_AccessibleOutlineView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/sd_AccessibleOutlineView.xba b/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/sd_AccessibleOutlineView.xba
deleted file mode 100644
index d44233ef697f..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleOutlineView/sd_AccessibleOutlineView.xba
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_AccessibleOutlineView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oDPn As Variant
-Global fireCount as Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.AccessibleOutlineView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim aSlotID As String
-    Dim urls As Variant
-    Dim url as new com.sun.star.util.URL
-    Dim UrlTransformer As Object, xDispatcher As Object
-    Dim oCntr As Object, oWin As Object, xRoot As Object
-    Dim oSearchedContext As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oCntr = oDoc.getCurrentController()
-
-    Out.log("Switching to outline view...")
-    switchOutlineView(oDoc)
-    
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oSearchedContext = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-    oObj = oSearchedContext
-    oDPn = oDoc.getDrawPages()
-    fireCount = 0
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-
-' This method is used for XAccessibleEventBroadcaster interface
-Sub fireEvent()
-    fireCount = fireCount + 1
-    Out.log("fire event...")
-    Dim oDP as Object
-	oDP = oDPn.getByIndex(0)
-    addShape(oDP, fireCount * 500, fireCount * 500)
-    
-    
-    wait(500)
-End Sub
-
-Sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oRectangleShape)
-End Sub
-
-Sub switchOutlineView(xDoc as Object)
-On Error Goto ErrHndl
-
-        Dim Contrl as Variant, disp as Variant, transf as Object
-        Dim URL as new com.sun.star.util.URL
-        Dim noProps()
-        Dim res as Boolean
-        
-        Contrl = xDoc.getCurrentController()
-        URL.Complete = "slot:27010"
-        transf = createUnoService("com.sun.star.util.URLTransformer")
-        res = transf.parseStrict(URL)
-        
-        out.log("URL parsed :" + res)
-        
-        disp = Contrl.queryDispatch(URL, "", 0)
-
-        out.log("disp get.")
-
-        disp.dispatch(URL, noProps())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/script.xlb b/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/script.xlb
deleted file mode 100644
index ab6b9acb40d2..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_AccessibleSlideView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_AccessibleSlideView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/sd_AccessibleSlideView.xba b/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/sd_AccessibleSlideView.xba
deleted file mode 100644
index 7e2686874f69..000000000000
--- a/qadevOOo/tests/basic/mod/sd/AccessibleSlideView/sd_AccessibleSlideView.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_AccessibleSlideView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oDP1 As Object
-Global oDP2 As Object
-Global oCntr As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.AccessibleSlideView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oDPs As Object
-    Dim oWin As Object, xRoot As Object
-    Dim oSearchedContext As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    Out.Log("Getting drawpages...")
-    oDPs = oDoc.getDrawPages()
-    oDP1 = oDPs.insertNewByIndex(1)
-    oDP2 = oDPs.insertNewByIndex(2)
-    switchOutlineView(oDoc)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oSearchedContext = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-    oObj = oSearchedContext
-    oCntr = oDoc.getCurrentController()
-    multiSelection = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub switchOutlineView(xDoc as Object)
-On Error Goto ErrHndl
-
-        Dim Contrl as Variant, disp as Variant, transf as Object
-        Dim URL as new com.sun.star.util.URL
-        Dim noProps()
-        Dim res as Boolean
-        
-        Contrl = xDoc.getCurrentController()
-        URL.Complete = "slot:27011"
-        transf = createUnoService("com.sun.star.util.URLTransformer")
-        res = transf.parseStrict(URL)
-        
-        out.log("URL parsed :" + res)
-        
-        disp = Contrl.queryDispatch(URL, "", 0)
-
-        out.log("disp get.")
-
-        disp.dispatch(URL, noProps())
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-' This method is used for XAccessibleEventBroadcaster interface
-Sub fireEvent()
-    oCntr.setCurrentPage(oDP1)
-    oCntr.setCurrentPage(oDP2)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/script.xlb b/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/script.xlb
deleted file mode 100644
index 766c8a8b244d..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdDocLinkTargets" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdDocLinkTargets"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/sd_SdDocLinkTargets.xba b/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/sd_SdDocLinkTargets.xba
deleted file mode 100644
index bd597de6e243..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDocLinkTargets/sd_SdDocLinkTargets.xba
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdDocLinkTargets" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdDocLinkTargets
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = oDoc.Links
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDrawPage/script.xlb b/qadevOOo/tests/basic/mod/sd/SdDrawPage/script.xlb
deleted file mode 100644
index 3caf8119a5c1..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDrawPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdDrawPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdDrawPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDrawPage/sd_SdDrawPage.xba b/qadevOOo/tests/basic/mod/sd/SdDrawPage/sd_SdDrawPage.xba
deleted file mode 100644
index 847e390bb839..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDrawPage/sd_SdDrawPage.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdDrawPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oXShapeInstance As Object
-Global oGrouperCollection AS Object
-Global oCombinerCollection As Object
-Global oBinderCollection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdDrawPage
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-
-    oObj = oDoc.DrawPages.getByIndex(0)
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oCombinerCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oBinderCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    addShape(oObj, 1000, 1000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 2000, 2000)
-    addShape(oObj, 3000, 3000)
-    addShape(oObj, 4000, 4000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 6000, 6000)
-    addShape(oObj, 7000, 7000)
-
-    oGrouperCollection.Add(oObj.getByIndex(0))
-    oGrouperCollection.Add(oObj.getByIndex(1))
-    oCombinerCollection.Add(oObj.getByIndex(2))
-    oCombinerCollection.Add(oObj.getByIndex(3))
-    oBinderCollection.Add(oObj.getByIndex(4))
-    oBinderCollection.Add(oObj.getByIndex(5))
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oRectangleShape)
-End Sub
-
-Sub DisposeObj()
-    if hasUnoInterfaces(oDoc, "com.sun.star.lang.XComponent") then
-        oDoc.Dispose()
-    end if
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/script.xlb b/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/script.xlb
deleted file mode 100644
index 3edb0cacc218..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdDrawPagesAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdDrawPagesAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/sd_SdDrawPagesAccess.xba b/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/sd_SdDrawPagesAccess.xba
deleted file mode 100644
index fd9ed80e1d5b..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdDrawPagesAccess/sd_SdDrawPagesAccess.xba
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdDrawPagesAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdDrawPagesAccess
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-
-    oObj = oDoc.DrawPages
-    oObj.insertNewByIndex(oObj.count)
-    oObj.insertNewByIndex(oObj.count)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/script.xlb b/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/script.xlb
deleted file mode 100644
index 3f1e419281e6..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdGenericDrawPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdGenericDrawPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/sd_SdGenericDrawPage.xba b/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/sd_SdGenericDrawPage.xba
deleted file mode 100644
index 49ef3a47be08..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdGenericDrawPage/sd_SdGenericDrawPage.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdGenericDrawPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oGrouperCollection AS Object
-Global oCombinerCollection As Object
-Global oBinderCollection As Object
-
-'Required for com.sun.star.drawing.XShapes
-Global oXShapeInstance As Object 'to add/remove
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdGenericDrawPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oDrawPage As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oDrawPage = oDoc.DrawPages(0)
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oCombinerCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oBinderCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    oObj = oDrawPage
-
-    addShape(oObj, 1000, 1000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 2000, 2000)
-    addShape(oObj, 3000, 3000)
-    addShape(oObj, 4000, 4000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 6000, 6000)
-    addShape(oObj, 7000, 7000)
-
-    oGrouperCollection.Add(oObj.getByIndex(0))
-    oGrouperCollection.Add(oObj.getByIndex(1))
-    oCombinerCollection.Add(oObj.getByIndex(2))
-    oCombinerCollection.Add(oObj.getByIndex(3))
-    oBinderCollection.Add(oObj.getByIndex(4))
-    oBinderCollection.Add(oObj.getByIndex(5))
-
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255,0,0)
-    oPage.add(oRectangleShape)
-End Sub
-
-Sub DisposeObj()
-    if hasUnoInterfaces(oDoc, "com.sun.star.lang.XComponent") then
-        oDoc.dispose()
-    end if
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdLayer/script.xlb b/qadevOOo/tests/basic/mod/sd/SdLayer/script.xlb
deleted file mode 100644
index 809c1d5b1bd6..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdLayer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdLayer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdLayer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdLayer/sd_SdLayer.xba b/qadevOOo/tests/basic/mod/sd/SdLayer/sd_SdLayer.xba
deleted file mode 100644
index 0bd8fb5b929d..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdLayer/sd_SdLayer.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdLayer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdLayer
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.LayerManager.getByIndex(0)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdLayerManager/script.xlb b/qadevOOo/tests/basic/mod/sd/SdLayerManager/script.xlb
deleted file mode 100644
index 5eb4e7cd2fa9..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdLayerManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdLayerManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdLayerManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdLayerManager/sd_SdLayerManager.xba b/qadevOOo/tests/basic/mod/sd/SdLayerManager/sd_SdLayerManager.xba
deleted file mode 100644
index 9df4a862b3aa..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdLayerManager/sd_SdLayerManager.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdLayerManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdLayerManager
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.LayerManager
-    nGlobalLong = oObj.Count
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdMasterPage/script.xlb b/qadevOOo/tests/basic/mod/sd/SdMasterPage/script.xlb
deleted file mode 100644
index d0d4f390c1ad..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdMasterPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdMasterPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdMasterPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdMasterPage/sd_SdMasterPage.xba b/qadevOOo/tests/basic/mod/sd/SdMasterPage/sd_SdMasterPage.xba
deleted file mode 100644
index 4d7506dacdf8..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdMasterPage/sd_SdMasterPage.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdMasterPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oGrouperCollection AS Object
-Global oCombinerCollection As Object
-Global oBinderCollection As Object
-
-'Required for com.sun.star.drawing.XShapes
-Global oXShapeInstance As Object 'to add/remove
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdMasterPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMasterPages As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oXShapeInstance =  oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oCombinerCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oBinderCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    oMasterPages = oDoc.MasterPages
-    oObj = oMasterPages(0)
-
-    addShape(oObj, 1000, 1000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 2000, 2000)
-    addShape(oObj, 3000, 3000)
-    addShape(oObj, 4000, 4000)
-    addShape(oObj, 5000, 5000)
-    addShape(oObj, 6000, 6000)
-    addShape(oObj, 7000, 7000)
-
-    oGrouperCollection.Add(oObj.getByIndex(0))
-    oGrouperCollection.Add(oObj.getByIndex(1))
-    oCombinerCollection.Add(oObj.getByIndex(2))
-    oCombinerCollection.Add(oObj.getByIndex(3))
-    oBinderCollection.Add(oObj.getByIndex(4))
-    oBinderCollection.Add(oObj.getByIndex(5))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oRectangleShape)
-End Sub
-
-Sub DisposeObj()
-    if hasUnoInterfaces(oDoc, "com.sun.star.lang.XComponent") then
-        oDoc.dispose()
-    end if
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/script.xlb b/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/script.xlb
deleted file mode 100644
index a709ee13a2c7..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdMasterPagesAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdMasterPagesAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/sd_SdMasterPagesAccess.xba b/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/sd_SdMasterPagesAccess.xba
deleted file mode 100644
index fc828ab1f6d9..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdMasterPagesAccess/sd_SdMasterPagesAccess.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdMasterPagesAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdMasterPagesAccess
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.MasterPages
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/script.xlb b/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/script.xlb
deleted file mode 100644
index 6f0236efd0b8..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdPageLinkTargets" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdPageLinkTargets"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/sd_SdPageLinkTargets.xba b/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/sd_SdPageLinkTargets.xba
deleted file mode 100644
index d55b34d3f0b9..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdPageLinkTargets/sd_SdPageLinkTargets.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdPageLinkTargets" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdPageLinkTargets
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPage As Object
-    Dim oShape As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oPage = oDoc.DrawPages(0)
-
-    oShape = addShape(oPage, 1000, 1000)
-    oShape.setPropertyValue("CLSID","12DCAE26-281F-416F-a234-c3086127382e")
-
-    oObj = oPage.getLinks()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function AddShape(oPage as Object, nPosX as Integer, nPosY as Integer) as Object
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oShape = oDoc.createInstance("com.sun.star.drawing.OLE2Shape")
-    oShape.Size = aSize
-    oShape.Position = aPoint
-
-    oPage.add(oShape)
-    AddShape = oShape
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/script.xlb b/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/script.xlb
deleted file mode 100644
index e9b771303803..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdUnoDrawView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdUnoDrawView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/sd_SdUnoDrawView.xba b/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/sd_SdUnoDrawView.xba
deleted file mode 100644
index 66fca1b31e45..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoDrawView/sd_SdUnoDrawView.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdUnoDrawView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for drawing.XDrawView
-Global oPages As Object
-
-' Required for frame.XController
-Global oFrameToAttach As Object
-Global oModelToAttach As Object
-Global bHasNoViewData As Boolean
-Global oObjToSuspend As Object
-Global bHasNoModel As Boolean
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-' Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-' Required for view.XSelectionSupplier
-Global SelectableObj1 As Object
-Global SelectableObj2 As Object
-
-Global oSecDoc As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdUnoDrawView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.getCurrentController()
-
-    oPages = oDoc.getDrawPages()
-
-    oSecDoc = utils.createDocument("sdraw", "For frame.XController")
-    bHasNoViewData = false
-    bHasNoModel = false
-    oObjToSuspend = oObj
-    oFrameToAttach = StarDesktop.getCurrentFrame()
-    oModelToAttach = oSecDoc
-
-    oComponentInstance = oObj
-
-    dispatchUrl = "slot:27009"
-
-    Dim page As Object
-    page = oPages.getByIndex(0)
-    AddShape(page, 100, 100)
-    AddShape(page, 12000, 100)
-
-    SelectableObj1 = page.getByIndex(0)
-    SelectableObj2 = page.getByIndex(1)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oSecDoc.dispose()
-End Sub
-
-sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oRectangleShape)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/script.xlb b/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/script.xlb
deleted file mode 100644
index d7108b233a4e..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdUnoOutlineView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdUnoOutlineView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/sd_SdUnoOutlineView.xba b/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/sd_SdUnoOutlineView.xba
deleted file mode 100644
index edea9b2a0dd5..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoOutlineView/sd_SdUnoOutlineView.xba
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdUnoOutlineView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for frame.XController
-Global oFrameToAttach As Object
-Global oModelToAttach As Object
-Global bHasNoViewData As Boolean
-Global oObjToSuspend As Object
-Global bHasNoModel As Boolean
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-' Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-' Required for awt.XWindow
-Global oXWindow As Object
-Global oCtrlShape as Object
-
-
-Global oSecDoc As Object
-Global oXComponentDoc as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdUnoOutlineView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    
-    bOK = true
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oXComponentDoc = utils.createImpressDocument(cObjectName+ "XComponent")
-    
-    oObj = oDoc.getCurrentController()
-    oComponentInstance = oXComponentDoc.getCurrentController()
-
-    Out.log("Change to Outline view")
-    Dim aSlotID As String
-    aSlotID = "slot:27010"
-
-    Dim url as new com.sun.star.util.URL
-    url.Complete = aSlotID
-
-    Dim UrlTransformer As Object
-    UrlTransformer = createUnoService("com.sun.star.util.URLTransformer")
-    UrlTransformer.parseStrict(url)
-
-    Dim xDispatcher As Object
-    xDispatcher = oObj.queryDispatch( url,"",0)
-    if Not IsNULL(xDispatcher) then
-        xDispatcher.dispatch( url, DimArray() )
-        wait(5000)
-    else
-        Out.log("queryDispatch FAILED... Object SdUnoOutlineView can't be created")
-        oObj =  NULL_OBJECT
-    endif
-    
-    xDispatcher = oComponentInstance.queryDispatch( url,"",0)
-    if Not IsNULL(xDispatcher) then
-        xDispatcher.dispatch( url, DimArray() )
-        wait(5000)
-    else
-        Out.log("queryDispatch FAILED... Object SdUnoOutlineView can't be created")
-    endif
-
-    oSecDoc = utils.createImpressDocument("For frame.XController")
-    bHasNoViewData = false
-    bHasNoModel = false
-    oObjToSuspend = oObj
-    oFrameToAttach = StarDesktop.getCurrentFrame()
-    oModelToAttach = oSecDoc
-
-
-    dispatchUrl = "slot:27069"
-    
-    ' For awt.XWindow
-    oXWindow = utils.at_getCurrentWindow(oSecDoc)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oSecDoc)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoPresView/script.xlb b/qadevOOo/tests/basic/mod/sd/SdUnoPresView/script.xlb
deleted file mode 100644
index 85375cd665b4..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoPresView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdUnoPresView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdUnoPresView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdUnoPresView/sd_SdUnoPresView.xba b/qadevOOo/tests/basic/mod/sd/SdUnoPresView/sd_SdUnoPresView.xba
deleted file mode 100644
index 305dc5da6571..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdUnoPresView/sd_SdUnoPresView.xba
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdUnoPresView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for frame.XController
-Global oFrameToAttach As Object
-Global oModelToAttach As Object
-Global bHasNoViewData As Boolean
-Global oObjToSuspend As Object
-Global bHasNoModel As Boolean
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-' Required for frame.XDispatchProvider
-Global dispatchUrl As String
-
-' Required for drawing.XDrawView
-Global oPages As Variant
-
-' Required for awt.XWindow
-Global oXWindow As Object
-Global oCtrlShape as Object
-
-Global oSecDoc As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdUnoPresView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oDP As Object, oDP1 As Object
-    Dim oDPs As Object
-    bOK = true
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oSecDoc = utils.createImpressDocument(cObjectName+"1")
-    wait(500)
-
-    oDPs = oDoc.getDrawPages()
-    oDP = oDPs.getByIndex(0)
-    oDPs.insertNewByIndex(0)
-    oDP1 = oDPs.getByIndex(1)
-
-    addShape(oDP, 1000, 1000, "Rectangle")
-    addShape(oDP, 5000, 5000, "Ellipse")
-
-    oObj = oDoc.getCurrentController()
-
-    ' For XDrawPages
-    oPages = oDoc.getDrawPages()
-
-    ' For XComponent
-    oComponentInstance = oObj
-
-    ' For XDispatchProvider
-    dispatchUrl = "slot:27009"
-
-    ' For frame.XController
-    oFrameToAttach = StarDesktop.getCurrentFrame()
-    oModelToAttach = oSecDoc
-    bHasNoViewData = false
-    bHasNoModel = false
-    oObjToSuspend = oObj
-
-    ' For awt.XWindow
-    oXWindow = utils.at_getCurrentWindow(oSecDoc)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oDoc.dispose()
-    oSecDoc.dispose()
-End Sub
-
-Sub addShape(oPage as Object, nPosX as Integer, nPosY as Integer, oType As String)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 2000
-    aSize.Height = 1000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing."+oType+"Shape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(128, 255, 0)
-    oPage.add(oRectangleShape)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/script.xlb b/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/script.xlb
deleted file mode 100644
index eff48affc0c0..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdXCustomPresentation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdXCustomPresentation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/sd_SdXCustomPresentation.xba b/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/sd_SdXCustomPresentation.xba
deleted file mode 100644
index c02a4a34970d..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentation/sd_SdXCustomPresentation.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdXCustomPresentation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.container.XIndexContainer
-Global oInstance As Object 'for InsertByName
-
-' Required for XIndexReplace
-Global oIdxReplaceInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdXCustomPresentation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPresentations As Object
-    Dim oPresentation As Object
-    Dim oDrawPages As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-
-    oPresentations = oDoc.getCustomPresentations()
-    oDrawPages = oDoc.getDrawPages
-    oDrawPages.insertNewByIndex(oDrawPages.getCount())
-    oDrawPages.insertNewByIndex(oDrawPages.getCount())
-    oDrawPages.insertNewByIndex(oDrawPages.getCount())
-    oDrawPages.insertNewByIndex(oDrawPages.getCount())
-
-    oPresentation = oPresentations.createInstance()
-    oPresentations.insertByName(cObjectName, oPresentation)
-    oIdxReplaceInstance = oDrawPages.getByIndex(3)
-
-    oObj = oPresentations.getByName(oPresentations.elementNames(0))
-
-    oObj.insertByIndex(oObj.Count, oDrawPages.getByIndex(0))
-    oObj.insertByIndex(oObj.Count, oDrawPages.getByIndex(1))
-    oObj.insertByIndex(oObj.Count, oDrawPages.getByIndex(2))
-    oInstance = oDrawPages.getByIndex(3)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/script.xlb b/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/script.xlb
deleted file mode 100644
index 92f8c79f7d0d..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdXCustomPresentationAccess" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdXCustomPresentationAccess"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/sd_SdXCustomPresentationAccess.xba b/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/sd_SdXCustomPresentationAccess.xba
deleted file mode 100644
index d626a83a2256..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXCustomPresentationAccess/sd_SdXCustomPresentationAccess.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdXCustomPresentationAccess" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.container.XNameContainer
-Global oInstance As Object 'instance to insert
-
-'Required for com.sun.star.container.XNameReplace
-Global oReplaceInstance As Object
-Global cNameToReplace As String
-
-'For lang.XSingleServiceFactory
-Global aMustSupportInterface As Variant 
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdXCustomPresentationAccess
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = oDoc.getCustomPresentations()
-
-    oInstance = oObj.createInstance()
-    oObj.insertByName("FirstPresentation", oInstance)
-    oInstance = oObj.createInstance()
-    oObj.insertByName("SecondPresentation", oInstance)
-    oInstance = oObj.createInstance()
-
-    cNameToReplace = "SecondPresentation"
-    oReplaceInstance = oObj.createInstance()
-    
-    aMustSupportInterface = Array("com.sun.star.container.XIndexContainer")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/script.xlb b/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/script.xlb
deleted file mode 100644
index 54c30454d5df..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdXImpressDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdXImpressDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/sd_SdXImpressDocument.xba b/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/sd_SdXImpressDocument.xba
deleted file mode 100644
index 5b7aee65ec94..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXImpressDocument/sd_SdXImpressDocument.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdXImpressDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XMultiServiceFactory
-  Global cServiceName As String ' ex. "com.sun.star.drawing.RectangleShape"
-  Global bCreateInstanceWithoutArguments As Boolean
-  Global aArguments() As Variant
-
-' Requiered for  com.sun.star.drawing.XDrawPageDuplicator
-  Global oCollection As Object ' = oDoc.DrawPages(0)
-
-' com.sun.star.frame.XModel
-  Global oXModelController as Object
-  Global oXModelSel as Object
-  Global oXModelToSel as Object
-
-  
-  Global oComponentInstance As Object
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdXImpressDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oControllerDoc as Object
-    Dim oRectangleShape as Object
-    Dim oPage as Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oControllerDoc = utils.createImpressDocument(cObjectName + "XModel")
-    oComponentInstance = utils.createImpressDocument(cObjectName + "XComponent")
-    
-    oCollection = oDoc.DrawPages(0)
-    oObj = oDoc
-
-    cServiceName = "com.sun.star.drawing.RectangleShape"
-    bCreateInstanceWithoutArguments = true
-    aArguments() = noargs()
-    
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oPage = oDoc.getDrawPages().getByIndex(0)
-    oPage.add(oRectangleShape)
-
-    oXModelToSel = oRectangleShape
-    oXModelController = oControllerDoc.getCurrentController()
-    oXModelSel = oDoc.getCurrentController()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentInstance) then oComponentInstance.dispose()
-
-    ' To successfully dispose oControllerDoc re-open it first.
-    Dim oControllerDoc As Object
-    oControllerDoc = utils.createDocument(cObjectName + "XModel")
-    oControllerDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXPresentation/script.xlb b/qadevOOo/tests/basic/mod/sd/SdXPresentation/script.xlb
deleted file mode 100644
index 20b9fca530b8..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXPresentation/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdXPresentation" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdXPresentation"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXPresentation/sd_SdXPresentation.xba b/qadevOOo/tests/basic/mod/sd/SdXPresentation/sd_SdXPresentation.xba
deleted file mode 100644
index 2ef0232aafe2..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXPresentation/sd_SdXPresentation.xba
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdXPresentation" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdXPresentation
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPres As Object
-    Dim oInst As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oPres = oDoc.getCustomPresentations()
-    oInst = oPres.createInstance()
-    oPres.insertByName("FirstPresentation", oInst)
-    oInst = oPres.createInstance()
-    oPres.insertByName("SecondPresentation", oInst)
-
-    oObj = oDoc.getPresentation()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXShape/script.xlb b/qadevOOo/tests/basic/mod/sd/SdXShape/script.xlb
deleted file mode 100644
index 55ca6e4df6fa..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sd_SdXShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sd_SdXShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sd/SdXShape/sd_SdXShape.xba b/qadevOOo/tests/basic/mod/sd/SdXShape/sd_SdXShape.xba
deleted file mode 100644
index 0e719ec6a88a..000000000000
--- a/qadevOOo/tests/basic/mod/sd/SdXShape/sd_SdXShape.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sd_SdXShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.lang.XComponent
-Global oComponentInstance as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sd.SdXShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oDrawPage As Object
-    Dim oDrawPages As Object
-    Dim oCollection As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oDrawPages = oDoc.DrawPages
-    oDrawPage = oDrawPages.getByIndex(0)
-    addShape(oDrawPage, 1000, 1000)
-    addShape(oDrawPage, 5000, 5000)
-    oCollection = oDrawPage
-    oObj = oDrawPage.getByIndex(0)
-    oComponentInstance = oDrawPage.getByIndex(1)
-
-
-    Dim oLayerManager As Object
-    Dim nLayer As Integer
-    Dim oLayer As Object
-
-    oLayerManager = oDoc.LayerManager
-    nLayer = oLayerManager.Count
-    oLayer = oLayerManager.insertNewByIndex(nLayer)
-    oLayer.Name = "Test"
-    oLayerManager.attachShapeToLayer(oObj, oLayer)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub AddShape(oPage as Object, nPosX as Integer, nPosY as Integer)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oRectangleShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oRectangleShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oRectangleShape.Size = aSize
-    oRectangleShape.Position = aPoint
-    oRectangleShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oRectangleShape)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/script.xlb b/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/script.xlb
deleted file mode 100644
index b242aa37d010..000000000000
--- a/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="servicemgr_uno_OServiceManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="servicemgr_uno_OServiceManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/servicemgr_uno_OServiceManager.xba b/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/servicemgr_uno_OServiceManager.xba
deleted file mode 100644
index c9d796c6469f..000000000000
--- a/qadevOOo/tests/basic/mod/servicemgr.uno/OServiceManager/servicemgr_uno_OServiceManager.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="servicemgr_uno_OServiceManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XMultiServiceFactory
-  Global cServiceName As String ' ex. "com.sun.star.drawing.RectangleShape"
-  Global bCreateInstanceWithoutArguments As Boolean
-  Global aArguments() As Variant
-
-' Requiered for  com.sun.star.lang.XMultiComponentFactory
-  Global aContext() As Variant
-
-' Requiered for  com.sun.star.lang.XComponent
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' smgr.OServiceManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPres As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.lang.ServiceManager")
-
-    oPres = oDoc.getCustomPresentations()
-    oObj.insert(oPres)
-    cServiceName = "com.sun.star.presentation.CustomPresentationAccess"
-    bCreateInstanceWithoutArguments = true
-    aArguments() = noargs()
-    aContext() = noargs()
-
-    oComponentInstance = createUnoService("com.sun.star.lang.ServiceManager")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/script.xlb b/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/script.xlb
deleted file mode 100644
index 85e442c44ef6..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sfx_DocumentTemplates" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sfx_DocumentTemplates"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/sfx_DocumentTemplates.xba b/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/sfx_DocumentTemplates.xba
deleted file mode 100644
index 244a330bfee5..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/DocumentTemplates/sfx_DocumentTemplates.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sfx_DocumentTemplates" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' variable for frame.XDocumentTemplates
-Global oStore As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sfx.DocumentTemplates
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.frame.DocumentTemplates")
-
-    ' setting variable for XDocumentTemplates
-    oStore = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sfx/FrameLoader/script.xlb b/qadevOOo/tests/basic/mod/sfx/FrameLoader/script.xlb
deleted file mode 100644
index 9f2b3fdd828a..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/FrameLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sfx_FrameLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sfx_FrameLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sfx/FrameLoader/sfx_FrameLoader.xba b/qadevOOo/tests/basic/mod/sfx/FrameLoader/sfx_FrameLoader.xba
deleted file mode 100644
index 35fb72701b14..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/FrameLoader/sfx_FrameLoader.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sfx_FrameLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.frame.XSynchronousFrameLoader
-  Global oFrame As Object
-  Global sURL As String
-
-' For XFrameLoader
-Global FrameLoaderURL As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sfx.FrameLoader
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oObj = createUnoService("com.sun.star.frame.FrameLoader")
-
-    oFrame = oDoc.getCurrentController().getFrame()
-
-    sURL = utils.Path2URL(cTestDocsDir &amp; "Iterator.sxw")
-
-    FrameLoaderURL = "private:factory/swriter"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/script.xlb b/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/script.xlb
deleted file mode 100644
index bd2aedea255e..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sfx_SfxMacroLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sfx_SfxMacroLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/sfx_SfxMacroLoader.xba b/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/sfx_SfxMacroLoader.xba
deleted file mode 100644
index f52e40d0a2b8..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/SfxMacroLoader/sfx_SfxMacroLoader.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sfx_SfxMacroLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' For XFrameLoader
-Global FrameLoaderURL As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sfx.SfxMacroLoader
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.comp.sfx2.SfxMacroLoader")
-
-    FrameLoaderURL = "private:factory/swriter"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/script.xlb b/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/script.xlb
deleted file mode 100644
index 12430abdaff5..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sfx_StandaloneDocumentInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sfx_StandaloneDocumentInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/sfx_StandaloneDocumentInfo.xba b/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/sfx_StandaloneDocumentInfo.xba
deleted file mode 100644
index 28b277e4432e..000000000000
--- a/qadevOOo/tests/basic/mod/sfx/StandaloneDocumentInfo/sfx_StandaloneDocumentInfo.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sfx_StandaloneDocumentInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' variable for document.XStandaloneDocumentInfo
-Global documentURL As String
-
-'variable for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sfx.StandaloneDocumentInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim srcDoc As String, destDoc As String
-    Dim facc As Object
-
-    oObj = createUnoService("com.sun.star.document.StandaloneDocumentInfo")
-
-    srcDoc = utils.Path2URL(cTestDocsDir) + "SfxStandaloneDocInfoObject.sdw"
-    destDoc = utils.getTempFileURL("SfxStandaloneDocInfoObject.sdw", true)
-    facc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    facc.copy(srcDoc, destDoc)
-
-    oObj.loadFromURL(destDoc)
-
-    'setting  variable for document.XStandaloneDocumentInfo
-    documentURL = destDoc
-
-    oComponentInstance = oObj
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/script.xlb b/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/script.xlb
deleted file mode 100644
index 9aa0cb96a425..000000000000
--- a/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="shlibloader_uno_DLLComponentLoader" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="shlibloader_uno_DLLComponentLoader"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/shlibloader_uno_DLLComponentLoader.xba b/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/shlibloader_uno_DLLComponentLoader.xba
deleted file mode 100644
index 3ae0dbee8cdb..000000000000
--- a/qadevOOo/tests/basic/mod/shlibloader.uno/DLLComponentLoader/shlibloader_uno_DLLComponentLoader.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="shlibloader_uno_DLLComponentLoader" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global cImpLoader As String
-Global cImpURL As String
-Global cImpName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' cpld.DLLComponentLoader
-'*************************************************************************
-    oObj = createUNOService("com.sun.star.loader.SharedLibrary")
-    
-    cImpLoader = "com.sun.star.loader.SharedLibrary"
-    cImpURL = Path2URL(cTestDocsDir + "XImpReg.dll")
-    cImpName = "com.sun.star.comp.stoc.JavaComponentLoader"
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/script.xlb b/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/script.xlb
deleted file mode 100644
index c6693d1e331a..000000000000
--- a/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="simplereg_uno_SimpleRegistry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="simplereg_uno_SimpleRegistry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/simplereg_uno_SimpleRegistry.xba b/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/simplereg_uno_SimpleRegistry.xba
deleted file mode 100644
index 18e36c1eca52..000000000000
--- a/qadevOOo/tests/basic/mod/simplereg.uno/SimpleRegistry/simplereg_uno_SimpleRegistry.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="simplereg_uno_SimpleRegistry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' simreg.SimpleRegistry
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.registry.SimpleRegistry")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/script.xlb b/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/script.xlb
deleted file mode 100644
index 1f58776db999..000000000000
--- a/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="simreg_SimpleRegistry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="simreg_SimpleRegistry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/simreg_SimpleRegistry.xba b/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/simreg_SimpleRegistry.xba
deleted file mode 100644
index 5772540867db..000000000000
--- a/qadevOOo/tests/basic/mod/simreg/SimpleRegistry/simreg_SimpleRegistry.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="simreg_SimpleRegistry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' simreg.SimpleRegistry
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.registry.SimpleRegistry")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/SmEditAccessible/script.xlb b/qadevOOo/tests/basic/mod/sm/SmEditAccessible/script.xlb
deleted file mode 100644
index a19ead0edc9b..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmEditAccessible/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_SmEditAccessible" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_SmEditAccessible"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/SmEditAccessible/sm_SmEditAccessible.xba b/qadevOOo/tests/basic/mod/sm/SmEditAccessible/sm_SmEditAccessible.xba
deleted file mode 100644
index fef7c4783a37..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmEditAccessible/sm_SmEditAccessible.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_SmEditAccessible" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for XAccessibleText
-Global accText As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.SmEditAccessible
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-
-    accText = "sum hat a"
-    oDoc.Formula = accText
-
-    wait(2000)
-
-    Dim oWin As Object
-    Dim xRoot As Object
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL, "Commands")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    oDoc.Formula = "sum hat x"
-    wait(2000)
-    oDoc.Formula = accText
-    wait(2000)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/script.xlb b/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/script.xlb
deleted file mode 100644
index aff350c9c197..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_SmGraphicAccessible" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_SmGraphicAccessible"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/sm_SmGraphicAccessible.xba b/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/sm_SmGraphicAccessible.xba
deleted file mode 100644
index 4990d276e4fd..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmGraphicAccessible/sm_SmGraphicAccessible.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_SmGraphicAccessible" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for XAccessibleText
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.SmGraphicAccessible
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-
-    accText = "sum a cdot b"
-    oDoc.Formula = accText
-
-    wait(2000)
-
-    Dim oWin As Object
-    Dim xRoot As Object
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT, "Formula")
-    readOnly = false
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    oDoc.Formula = "sum hat x"
-    wait(2000)
-    oDoc.Formula = accText
-    wait(2000)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/SmModel/script.xlb b/qadevOOo/tests/basic/mod/sm/SmModel/script.xlb
deleted file mode 100644
index 0ef9ff02ff5a..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_SmModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_SmModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/SmModel/sm_SmModel.xba b/qadevOOo/tests/basic/mod/sm/SmModel/sm_SmModel.xba
deleted file mode 100644
index 0247417e56c1..000000000000
--- a/qadevOOo/tests/basic/mod/sm/SmModel/sm_SmModel.xba
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_SmModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.SmModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-    oObj = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLExporter/script.xlb
deleted file mode 100644
index aa91c6231059..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLExporter/sm_XMLExporter.xba b/qadevOOo/tests/basic/mod/sm/XMLExporter/sm_XMLExporter.xba
deleted file mode 100644
index 9b3f4a00eea4..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLExporter/sm_XMLExporter.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim expFormula As String
-    
-    printXML = true
-    expFormula = "a - b"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("smath", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("math:math")
-    Tag2 = Array("math:annotation")
-    Tag3 = Array("math:semantics")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag3), _
-                Array("CharsEnclosed", Tag2, expFormula) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Math.XMLExporter", initArgs())
-
-    oDoc.setPropertyValue("Formula", expFormula)
-    
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "smath: StarOffice XML (Formula)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLImporter/script.xlb
deleted file mode 100644
index a0d5abd5eff0..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLImporter/sm_XMLImporter.xba b/qadevOOo/tests/basic/mod/sm/XMLImporter/sm_XMLImporter.xba
deleted file mode 100644
index 4f7e90db93a1..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLImporter/sm_XMLImporter.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sFormula As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Math.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sFormula = "a - b"
-    vXMLData = Array( _
-        Array("start", "math:math", _
-                "xmlns:math", "CDATA", "http://www.w3.org/1998/Math/MathML"), _
-        Array("start", "math:semantics"), _
-        Array("start", "math:annotation", _
-                "math:encoding", "CDATA", "StarMath 5.0"), _
-        Array("chars", sFormula), _
-        Array("end", "math:annotation"), _
-        Array("end", "math:semantics"), _
-        Array("end", "math:math") )
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    out.log("checking of import...")
-    CheckImport() = (oDoc.getPropertyValue("Formula") = sFormula)
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/script.xlb
deleted file mode 100644
index cfc33f047031..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLMetaExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLMetaExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/sm_XMLMetaExporter.xba b/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/sm_XMLMetaExporter.xba
deleted file mode 100644
index 503d50e37ff8..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLMetaExporter/sm_XMLMetaExporter.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLMetaExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLMetaExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2 As Variant
-    Dim expMetaName, expMetaValue As String
-    Dim oDocInfo As Object
-    
-    printXML = true
-    expMetaName = "XMLMetaExporterName"
-    expMetaValue = "XMLMetaExporterValue"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("smath", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-meta")
-    Tag2 = Array("meta:user-defined", "meta:name", expMetaName)
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("CharsEnclosed", Tag2, expMetaValue) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Math.XMLMetaExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setUserFieldName(0, expMetaName)
-    oDocInfo.setUserFieldValue(0, expMetaValue)
-    
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "smath: StarOffice XML (Formula)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/script.xlb
deleted file mode 100644
index 7231ac372d02..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLMetaImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLMetaImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/sm_XMLMetaImporter.xba b/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/sm_XMLMetaImporter.xba
deleted file mode 100644
index 12210bf62867..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLMetaImporter/sm_XMLMetaImporter.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLMetaImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sTitle, sName, sValue As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLMetaImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Math.XMLMetaImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sTitle = "XMLMetaImporter Title" 
-    sName = "XMLMetaImporter"
-    sValue = "XMLMetaImporter_Value"
-    vXMLData = Array( _
-        Array("start", "office:document-meta", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:meta", "CDATA", "http://openoffice.org/2000/meta", _
-                "xmlns:xlink", "CDATA", "http://www.w3.org/1999/xlink", _
-                "xmlns:dc", "CDATA", "http://purl.org/dc/elements/1.1/"), _
-        Array("start", "office:meta"), _
-        Array("start", "dc:title"), _
-        Array("chars", sTitle), _
-        Array("end", "dc:title"), _
-        Array("start", "meta:user-defined", _
-                "meta:name", "CDATA", sName), _
-        Array("chars", sValue), _
-        Array("end", "meta:user-defined"), _
-        Array("end", "office:meta"), _
-        Array("end", "office:document-meta"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    out.log("checking of import...")
-    Dim res As Boolean
-    Dim i As Integer
-    Dim docInfo As Object
-    Dim fieldValue, fieldName, title as String 
-    docInfo = oDoc.getDocumentInfo()
-    res = false
-    For i = 0 to docInfo.getUserFieldCount() - 1
-        fieldName = docInfo.getUserFieldName(i)
-        fieldValue = docInfo.getUserFieldValue(i)
-        out.log("Field name: " + fieldName + " Value: " + fieldValue)
-        If (fieldName = sName) and (fieldValue = sValue) then
-            res = true
-        EndIf    
-    Next i
-
-    title = docInfo.getPropertyValue("Title")
-    out.log("Title: " + title)
-    res = res and (title = sTitle)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/script.xlb
deleted file mode 100644
index 5fdd3687c0bb..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLSettingsExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLSettingsExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/sm_XMLSettingsExporter.xba b/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/sm_XMLSettingsExporter.xba
deleted file mode 100644
index 7fa1af0005bd..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLSettingsExporter/sm_XMLSettingsExporter.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLSettingsExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLSettingsExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2 As Variant
-    Dim expMargin As Integer
-    
-    printXML = true
-    expMargin = 67
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("smath", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-settings")
-    Tag2 = Array("config:config-item", "config:name", "TopMargin")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("CharsEnclosed", Tag2, ""+expMargin) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Math.XMLSettingsExporter", initArgs())
-
-    oDoc.setPropertyValue("TopMargin", expMargin)
-    
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "smath: StarOffice XML (Formula)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/script.xlb b/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/script.xlb
deleted file mode 100644
index 055b77c7819a..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sm_XMLSettingsImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sm_XMLSettingsImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/sm_XMLSettingsImporter.xba b/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/sm_XMLSettingsImporter.xba
deleted file mode 100644
index b6f047f02d83..000000000000
--- a/qadevOOo/tests/basic/mod/sm/XMLSettingsImporter/sm_XMLSettingsImporter.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sm_XMLSettingsImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sMargin As Integer
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sm.XMLSettingsImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("smath", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Math.XMLSettingsImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sMargin = "67"
-    vXMLData = Array( _
-        Array("start", "office:document-settings", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:config", "CDATA", "http://openoffice.org/2001/config", _
-                "xmlns:xlink", "CDATA", "http://www.w3.org/1999/xlink", _
-                "office:version", "CDATA", "1.0"), _
-        Array("start", "office:settings"), _
-        Array("start", "config:config-item-set", _
-                "config:name", "CDATA", "configuration-settings"), _
-        Array("start", "config:config-item", _
-                "config:name", "CDATA", "TopMargin", _
-                "config:type", "CDATA", "short"), _
-        Array("chars", sMargin), _
-        Array("end", "config:config-item"), _
-        Array("end", "config:config-item-set"), _
-        Array("end", "office:settings"), _
-        Array("end", "office:document-settings"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    out.log("checking of import...")
-    Dim res As Boolean
-    Dim margin As String
-    margin = oDoc.getPropertyValue("TopMargin")
-    res = margin = sMargin
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/smgr/OServiceManager/script.xlb b/qadevOOo/tests/basic/mod/smgr/OServiceManager/script.xlb
deleted file mode 100644
index 2b1ca666431b..000000000000
--- a/qadevOOo/tests/basic/mod/smgr/OServiceManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="smgr_OServiceManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="smgr_OServiceManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/smgr/OServiceManager/smgr_OServiceManager.xba b/qadevOOo/tests/basic/mod/smgr/OServiceManager/smgr_OServiceManager.xba
deleted file mode 100644
index ad027f869cb7..000000000000
--- a/qadevOOo/tests/basic/mod/smgr/OServiceManager/smgr_OServiceManager.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="smgr_OServiceManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XMultiServiceFactory
-  Global cServiceName As String ' ex. "com.sun.star.drawing.RectangleShape"
-  Global bCreateInstanceWithoutArguments As Boolean
-  Global aArguments() As Variant
-
-' Requiered for  com.sun.star.lang.XMultiComponentFactory
-  Global aContext() As Variant
-
-' Requiered for  com.sun.star.lang.XComponent
-  Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' smgr.OServiceManager
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPres As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.lang.ServiceManager")
-
-    oPres = oDoc.getCustomPresentations()
-    oObj.insert(oPres)
-    cServiceName = "com.sun.star.presentation.CustomPresentationAccess"
-    bCreateInstanceWithoutArguments = true
-    aArguments() = noargs()
-    aContext() = noargs()
-
-    oComponentInstance = createUnoService("com.sun.star.lang.ServiceManager")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/script.xlb b/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/script.xlb
deleted file mode 100644
index 4e1022aac7b8..000000000000
--- a/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="smplmail_SimpleSystemMail" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="smplmail_SimpleSystemMail"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/smplmail_SimpleSystemMail.xba b/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/smplmail_SimpleSystemMail.xba
deleted file mode 100644
index 9c7de18a21fd..000000000000
--- a/qadevOOo/tests/basic/mod/smplmail/SimpleSystemMail/smplmail_SimpleSystemMail.xba
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="smplmail_SimpleSystemMail" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' smplmail.SimpleSystemMail
-'*************************************************************************
-On Error Goto ErrHndl
-    if (GetGuiType() = GUI_TYPE_WINDOWS) then
-        Out.Log("OS is Win : trying to create service ...")
-        oDoc = createUNOService("com.sun.star.system.SimpleSystemMail")
-        oObj = oDoc
-    else
-        Out.Log("OS is not Win : service is not available ...")
-        Out.Log("Creating Dummy object to avoid error in BasicBridge ...")
-        oObj = createUnoService("com.sun.star.io.Pipe")
-        Test.skipObjectCheck()
-    endif
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/script.xlb b/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/script.xlb
deleted file mode 100644
index dcab36c3a4de..000000000000
--- a/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="srtrs_SortedDynamicResultSetFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="srtrs_SortedDynamicResultSetFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/srtrs_SortedDynamicResultSetFactory.xba b/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/srtrs_SortedDynamicResultSetFactory.xba
deleted file mode 100644
index a3c5eff4937e..000000000000
--- a/qadevOOo/tests/basic/mod/srtrs/SortedDynamicResultSetFactory/srtrs_SortedDynamicResultSetFactory.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="srtrs_SortedDynamicResultSetFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' srtrs.SortedDynamicResultSetFactory
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUnoService("com.sun.star.ucb.SortedDynamicResultSetFactory")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/DataInputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/DataInputStream/script.xlb
deleted file mode 100644
index e139fe6fdc1c..000000000000
--- a/qadevOOo/tests/basic/mod/stm/DataInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_DataInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_DataInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/DataInputStream/stm_DataInputStream.xba b/qadevOOo/tests/basic/mod/stm/DataInputStream/stm_DataInputStream.xba
deleted file mode 100644
index 541ee3f12d70..000000000000
--- a/qadevOOo/tests/basic/mod/stm/DataInputStream/stm_DataInputStream.xba
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_DataInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.DataInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oOS As Object
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicDataInputStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.DataInputStream")
-
-    'Creating a file...
-    oOS = oFileAcc.openFileWrite(cFileName)
-    oOS.closeOutput()
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    Dim oFO As Object
-    ResetStreams()
-    oInputStream.closeInput()
-    oOutputStream = createUnoService("com.sun.star.io.DataOutputStream")
-    oFileAcc.kill(cFileName)
-    oFO = oFileAcc.openFileWrite(cFileName)
-    oOutputStream.setOutputStream(oFO)
-    bOutputStream = true
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-
-    if NOT oFileAcc.exists(cFileName) then
-        Dim oFO As Object
-        oFO = oFileAcc.openFileWrite(cFileName)
-        oFO.closeOutput()
-    end if
-
-    oInputStream = oFileAcc.openFileRead(cFileName)
-    bInputStream = true
-    oObj.setInputStream(oInputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/DataOutputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/DataOutputStream/script.xlb
deleted file mode 100644
index efe7b2965fe1..000000000000
--- a/qadevOOo/tests/basic/mod/stm/DataOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_DataOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_DataOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/DataOutputStream/stm_DataOutputStream.xba b/qadevOOo/tests/basic/mod/stm/DataOutputStream/stm_DataOutputStream.xba
deleted file mode 100644
index 35344daf0705..000000000000
--- a/qadevOOo/tests/basic/mod/stm/DataOutputStream/stm_DataOutputStream.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_DataOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.DataOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicDataOutputStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.DataOutputStream")
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    Dim oFI As Object
-    ResetStreams()
-    oInputStream = createUnoService("com.sun.star.io.DataInputStream")
-    oFI = oFileAcc.openFileRead(cFileName)
-    oInputStream.setInputStream(oFI)
-    bInputStream = true
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/MarkableInputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/MarkableInputStream/script.xlb
deleted file mode 100644
index 111d34113e5e..000000000000
--- a/qadevOOo/tests/basic/mod/stm/MarkableInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_MarkableInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_MarkableInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/MarkableInputStream/stm_MarkableInputStream.xba b/qadevOOo/tests/basic/mod/stm/MarkableInputStream/stm_MarkableInputStream.xba
deleted file mode 100644
index 2e4b93d772a8..000000000000
--- a/qadevOOo/tests/basic/mod/stm/MarkableInputStream/stm_MarkableInputStream.xba
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_MarkableInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.MarkableInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oOS As Object
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicMarkableIOStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.MarkableInputStream")
-    'Creating a file...
-    if oFileAcc.exists(cFileName) then oFileAcc.Kill(cFileName)
-    oOS = oFileAcc.openFileWrite(cFileName)
-    oOS.closeOutput()
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    Dim oFO As Object
-
-    ResetStreams()
-    oOutputStream = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oInputStream.closeInput()
-    oFileAcc.Kill(cFileName)
-    oFO = oFileAcc.openFileWrite(cFileName)
-    oOutputStream.setOutputStream(oFO)
-    bOutputStream = true
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    oInputStream = oFileAcc.openFileRead(cFileName)
-    bInputStream = true
-    oObj.setInputStream(oInputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/script.xlb
deleted file mode 100644
index 98c1f2b8c4d3..000000000000
--- a/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_MarkableOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_MarkableOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/stm_MarkableOutputStream.xba b/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/stm_MarkableOutputStream.xba
deleted file mode 100644
index b9e9835dcd43..000000000000
--- a/qadevOOo/tests/basic/mod/stm/MarkableOutputStream/stm_MarkableOutputStream.xba
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_MarkableOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.MarkableOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicMarkableIOStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.MarkableOutputStream")
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    CloseStreams()
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    Dim oFI As Object
-
-    CloseStreams()
-    oInputStream = createUnoService("com.sun.star.io.MarkableInputStream")
-    oFI = oFileAcc.openFileRead(cFileName)
-    oInputStream.setInputStream(oFI)
-    bInputStream = true
-    getInStream() = oInputStream
-
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    CloseStreams()
-    oFileAcc.Kill(cFileName)
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub CloseStreams()
-    if bOutputStream then
-        oObj.closeOutput()
-        bOutputStream = false
-    end if
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/ObjectInputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/ObjectInputStream/script.xlb
deleted file mode 100644
index 27475e3cc3c0..000000000000
--- a/qadevOOo/tests/basic/mod/stm/ObjectInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_ObjectInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_ObjectInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/ObjectInputStream/stm_ObjectInputStream.xba b/qadevOOo/tests/basic/mod/stm/ObjectInputStream/stm_ObjectInputStream.xba
deleted file mode 100644
index df0bbfd4e9b9..000000000000
--- a/qadevOOo/tests/basic/mod/stm/ObjectInputStream/stm_ObjectInputStream.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_ObjectInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global oMarkOut As Object, oMarkIn As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.ObjectInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPipe As Object
-
-    oObj = createUnoService("com.sun.star.io.ObjectInputStream")
-    oMarkIn = createUnoService("com.sun.star.io.MarkableInputStream")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkOut = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oOutputStream = createUnoService("com.sun.star.io.ObjectOutputStream")
-    oObj.setInputStream(oMarkIn)
-    oMarkIn.setInputStream(oPipe)
-    oMarkOut.setOutputStream(oPipe)
-    oOutputStream.setOutputStream(oMarkOut)
-    oInputStream = oObj
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    Dim oNewPipe As Object 
-
-    oNewPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkIn.getInputStream().closeInput()
-    oMarkOut.getOutputStream().closeOutput()
-    oMarkIn.setInputStream(oNewPipe)
-    oMarkOut.setOutputStream(oNewPipe)
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-Exit Sub
-ErrHndl:
-    Out.Log("ResetStreams: exception: " + error)
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/script.xlb b/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/script.xlb
deleted file mode 100644
index 2388085a07d5..000000000000
--- a/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_ObjectOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_ObjectOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/stm_ObjectOutputStream.xba b/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/stm_ObjectOutputStream.xba
deleted file mode 100644
index 2e041224c9ac..000000000000
--- a/qadevOOo/tests/basic/mod/stm/ObjectOutputStream/stm_ObjectOutputStream.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_ObjectOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global oMarkOut As Object, oMarkIn As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.ObjectOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPipe As Object
-
-    oObj = createUnoService("com.sun.star.io.ObjectOutputStream")
-    oMarkOut = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkIn = createUnoService("com.sun.star.io.MarkableInputStream")
-    oInputStream = createUnoService("com.sun.star.io.ObjectInputStream")
-    oObj.setOutputStream(oMarkOut)
-    oMarkOut.setOutputStream(oPipe)
-    oMarkIn.setInputStream(oPipe)
-    oInputStream.setInputStream(oMarkIn)
-    oOutputStream = oObj
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    Dim oFI As Object
-
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/Pipe/script.xlb b/qadevOOo/tests/basic/mod/stm/Pipe/script.xlb
deleted file mode 100644
index f13f198a9dd0..000000000000
--- a/qadevOOo/tests/basic/mod/stm/Pipe/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_Pipe" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_Pipe"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/Pipe/stm_Pipe.xba b/qadevOOo/tests/basic/mod/stm/Pipe/stm_Pipe.xba
deleted file mode 100644
index 2aab9c88cc2a..000000000000
--- a/qadevOOo/tests/basic/mod/stm/Pipe/stm_Pipe.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_Pipe" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.Pipe
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.io.Pipe")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    getInStream() = oObj
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    getOutStream() = oObj
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error Goto ErrHndl
-    oObj.closeInput()
-    oObj.closeOutput()
-    oObj = createUnoService("com.sun.star.io.Pipe")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/stm/Pump/script.xlb b/qadevOOo/tests/basic/mod/stm/Pump/script.xlb
deleted file mode 100644
index 848abf83b3ba..000000000000
--- a/qadevOOo/tests/basic/mod/stm/Pump/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="stm_Pump" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="stm_Pump"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/stm/Pump/stm_Pump.xba b/qadevOOo/tests/basic/mod/stm/Pump/stm_Pump.xba
deleted file mode 100644
index 46f1a9e77835..000000000000
--- a/qadevOOo/tests/basic/mod/stm/Pump/stm_Pump.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="stm_Pump" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oPipe As Object
-Global PumpOUTFileName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.Pump
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oFileAcc As Object
-    Dim oDataInput As Object
-    Dim oDataOutput As Object
-    Dim oSFA As Object
-    Dim oOS As Object
-
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    PumpOUTFileName = utils.getTempFileURL("PumpOUT.dat")
-    if (FileExists(PumpOUTFileName)) then
-        oFileAcc.Kill(PumpOUTFileName)
-    end if
-
-    oObj = createUnoService("com.sun.star.io.Pump")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-
-    oDataInput = createUnoService("com.sun.star.io.DataInputStream")
-    oDataInput.setInputStream(oPipe)
-
-    oDataOutput = createUnoService("com.sun.star.io.DataOutputStream")
-    oSFA = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    oOS = oSFA.openFileWrite(PumpOUTFileName)
-    oDataOutput.setOutputStream(oOS)
-
-    oObj.setInputStream(oDataInput)
-    oObj.setOutputStream(oDataOutput)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error goto ErrHndl
-    oObj.terminate()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub ResetStreams()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/script.xlb
deleted file mode 100644
index 41b969bb8788..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_DataInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_DataInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/streams_uno_DataInputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/streams_uno_DataInputStream.xba
deleted file mode 100644
index bfa5f3ed20cd..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/DataInputStream/streams_uno_DataInputStream.xba
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_DataInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.DataInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oOS As Object
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicDataInputStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.DataInputStream")
-
-    'Creating a file...
-    oOS = oFileAcc.openFileWrite(cFileName)
-    oOS.closeOutput()
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    Dim oFO As Object
-    ResetStreams()
-    oInputStream.closeInput()
-    oOutputStream = createUnoService("com.sun.star.io.DataOutputStream")
-    oFileAcc.kill(cFileName)
-    oFO = oFileAcc.openFileWrite(cFileName)
-    oOutputStream.setOutputStream(oFO)
-    bOutputStream = true
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-
-    if NOT oFileAcc.exists(cFileName) then
-        Dim oFO As Object
-        oFO = oFileAcc.openFileWrite(cFileName)
-        oFO.closeOutput()
-    end if
-
-    oInputStream = oFileAcc.openFileRead(cFileName)
-    bInputStream = true
-    oObj.setInputStream(oInputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/script.xlb
deleted file mode 100644
index f7ad5002b6ec..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_DataOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_DataOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/streams_uno_DataOutputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/streams_uno_DataOutputStream.xba
deleted file mode 100644
index fb0aa1208a50..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/DataOutputStream/streams_uno_DataOutputStream.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_DataOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.DataOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicDataOutputStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.DataOutputStream")
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    Dim oFI As Object
-    ResetStreams()
-    oInputStream = createUnoService("com.sun.star.io.DataInputStream")
-    oFI = oFileAcc.openFileRead(cFileName)
-    oInputStream.setInputStream(oFI)
-    bInputStream = true
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/script.xlb
deleted file mode 100644
index 4b4425f434ec..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_MarkableInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_MarkableInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/streams_uno_MarkableInputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/streams_uno_MarkableInputStream.xba
deleted file mode 100644
index 1422df8ecc59..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/MarkableInputStream/streams_uno_MarkableInputStream.xba
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_MarkableInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.MarkableInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oOS As Object
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicMarkableIOStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.MarkableInputStream")
-    'Creating a file...
-    if oFileAcc.exists(cFileName) then oFileAcc.Kill(cFileName)
-    oOS = oFileAcc.openFileWrite(cFileName)
-    oOS.closeOutput()
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error goto ErrHndl
-    ResetStreams()
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error goto ErrHndl
-    Dim oFO As Object
-
-    ResetStreams()
-    oOutputStream = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oInputStream.closeInput()
-    oFileAcc.Kill(cFileName)
-    oFO = oFileAcc.openFileWrite(cFileName)
-    oOutputStream.setOutputStream(oFO)
-    bOutputStream = true
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    if bOutputStream then
-        oOutputStream.closeOutput()
-        bOutputStream = false
-    end if
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-    oInputStream = oFileAcc.openFileRead(cFileName)
-    bInputStream = true
-    oObj.setInputStream(oInputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/script.xlb
deleted file mode 100644
index 6663e7824216..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_MarkableOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_MarkableOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/streams_uno_MarkableOutputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/streams_uno_MarkableOutputStream.xba
deleted file mode 100644
index e22c3c08920d..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/MarkableOutputStream/streams_uno_MarkableOutputStream.xba
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_MarkableOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global bInputStream  As Boolean
-Global bOutputStream As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.MarkableOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-
-    bInputStream  = false
-    bOutputStream = false
-    cFileName = utils.getTempFileURL("BasicMarkableIOStream.dat")
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-
-    oObj = createUnoService("com.sun.star.io.MarkableOutputStream")
-
-    ResetStreams()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    CloseStreams()
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    Dim oFI As Object
-
-    CloseStreams()
-    oInputStream = createUnoService("com.sun.star.io.MarkableInputStream")
-    oFI = oFileAcc.openFileRead(cFileName)
-    oInputStream.setInputStream(oFI)
-    bInputStream = true
-    getInStream() = oInputStream
-
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-    CloseStreams()
-    oFileAcc.Kill(cFileName)
-    oOutputStream = oFileAcc.openFileWrite(cFileName)
-    bOutputStream = true
-    oObj.setOutputStream(oOutputStream)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub CloseStreams()
-    if bOutputStream then
-        oObj.closeOutput()
-        bOutputStream = false
-    end if
-    if bInputStream then
-        oInputStream.closeInput()
-        bInputStream = false
-    end if
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/script.xlb
deleted file mode 100644
index 329eca656003..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_ObjectInputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_ObjectInputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/streams_uno_ObjectInputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/streams_uno_ObjectInputStream.xba
deleted file mode 100644
index aff5365ea042..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/ObjectInputStream/streams_uno_ObjectInputStream.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_ObjectInputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global oMarkOut As Object, oMarkIn As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.ObjectInputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPipe As Object
-
-    oObj = createUnoService("com.sun.star.io.ObjectInputStream")
-    oMarkIn = createUnoService("com.sun.star.io.MarkableInputStream")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkOut = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oOutputStream = createUnoService("com.sun.star.io.ObjectOutputStream")
-    oObj.setInputStream(oMarkIn)
-    oMarkIn.setInputStream(oPipe)
-    oMarkOut.setOutputStream(oPipe)
-    oOutputStream.setOutputStream(oMarkOut)
-    oInputStream = oObj
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    Dim oNewPipe As Object 
-
-    oNewPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkIn.getInputStream().closeInput()
-    oMarkOut.getOutputStream().closeOutput()
-    oMarkIn.setInputStream(oNewPipe)
-    oMarkOut.setOutputStream(oNewPipe)
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-Exit Sub
-ErrHndl:
-    Out.Log("ResetStreams: exception: " + error)
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeInput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/script.xlb
deleted file mode 100644
index a27b2b8d59fe..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_ObjectOutputStream" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_ObjectOutputStream"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/streams_uno_ObjectOutputStream.xba b/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/streams_uno_ObjectOutputStream.xba
deleted file mode 100644
index 3028400557ec..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/ObjectOutputStream/streams_uno_ObjectOutputStream.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_ObjectOutputStream" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global cFileName As String
-Global oFileAcc  As Object
-Global oInputStream  As Object
-Global oOutputStream As Object
-Global oMarkOut As Object, oMarkIn As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.ObjectOutputStream
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oPipe As Object
-
-    oObj = createUnoService("com.sun.star.io.ObjectOutputStream")
-    oMarkOut = createUnoService("com.sun.star.io.MarkableOutputStream")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-    oMarkIn = createUnoService("com.sun.star.io.MarkableInputStream")
-    oInputStream = createUnoService("com.sun.star.io.ObjectInputStream")
-    oObj.setOutputStream(oMarkOut)
-    oMarkOut.setOutputStream(oPipe)
-    oMarkIn.setInputStream(oPipe)
-    oInputStream.setInputStream(oMarkIn)
-    oOutputStream = oObj
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    Dim oFI As Object
-
-    getInStream() = oInputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    getOutStream() = oOutputStream
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error goto ErrHndl
-Exit Sub
-ErrHndl:
-    Test.Exception()
-    resume next
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oObj) then oObj.closeOutput()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/Pipe/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/Pipe/script.xlb
deleted file mode 100644
index 566b7ce26a32..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/Pipe/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_Pipe" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_Pipe"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/Pipe/streams_uno_Pipe.xba b/qadevOOo/tests/basic/mod/streams.uno/Pipe/streams_uno_Pipe.xba
deleted file mode 100644
index 171cda1d2359..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/Pipe/streams_uno_Pipe.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_Pipe" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.Pipe
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.io.Pipe")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function getInStream() As Object
-On Error Goto ErrHndl
-    getInStream() = oObj
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getInStream() = NULL_OBJECT
-End Function
-
-Function getOutStream() As Object
-On Error Goto ErrHndl
-    getOutStream() = oObj
-Exit Function
-ErrHndl:
-    Test.Exception()
-    getOutStream() = NULL_OBJECT
-End Function
-
-Sub ResetStreams()
-On Error Goto ErrHndl
-    oObj.closeInput()
-    oObj.closeOutput()
-    oObj = createUnoService("com.sun.star.io.Pipe")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/Pump/script.xlb b/qadevOOo/tests/basic/mod/streams.uno/Pump/script.xlb
deleted file mode 100644
index 6517d34d93ef..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/Pump/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="streams_uno_Pump" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="streams_uno_Pump"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/streams.uno/Pump/streams_uno_Pump.xba b/qadevOOo/tests/basic/mod/streams.uno/Pump/streams_uno_Pump.xba
deleted file mode 100644
index ba8397bcdcb4..000000000000
--- a/qadevOOo/tests/basic/mod/streams.uno/Pump/streams_uno_Pump.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="streams_uno_Pump" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oPipe As Object
-Global PumpOUTFileName As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' stm.Pump
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oFileAcc As Object
-    Dim oDataInput As Object
-    Dim oDataOutput As Object
-    Dim oSFA As Object
-    Dim oOS As Object
-
-    oFileAcc = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    PumpOUTFileName = utils.getTempFileURL("PumpOUT.dat")
-    if (FileExists(PumpOUTFileName)) then
-        oFileAcc.Kill(PumpOUTFileName)
-    end if
-
-    oObj = createUnoService("com.sun.star.io.Pump")
-    oPipe = createUnoService("com.sun.star.io.Pipe")
-
-    oDataInput = createUnoService("com.sun.star.io.DataInputStream")
-    oDataInput.setInputStream(oPipe)
-
-    oDataOutput = createUnoService("com.sun.star.io.DataOutputStream")
-    oSFA = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-    oOS = oSFA.openFileWrite(PumpOUTFileName)
-    oDataOutput.setOutputStream(oOS)
-
-    oObj.setInputStream(oDataInput)
-    oObj.setOutputStream(oDataOutput)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-On Error goto ErrHndl
-    oObj.terminate()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub ResetStreams()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/script.xlb
deleted file mode 100644
index 8d44d126a214..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleBrowseBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleBrowseBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/svtools_AccessibleBrowseBox.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/svtools_AccessibleBrowseBox.xba
deleted file mode 100644
index 61f454848be9..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBox/svtools_AccessibleBrowseBox.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleBrowseBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global controller As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleBrowseBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL)
-    Out.log(oObj.getImplementationName)
-
-    Dim frame1 As Object, frame2 As Object
-    frame1 = StarDesktop.getCurrentFrame()
-    frame2 = frame1.findFrame("_beamer", 4)
-    frame2.setName("DatasourceBrowser")
-    controller = frame2.getController()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Out.log("fireEvent() called")
-
-    Dim dbContext As Object
-    dbContext = createUnoService("com.sun.star.sdb.DatabaseContext")
-    if (dbContext.hasByName("Bibliography")) then
-        dbContext.revokeObject("Bibliography")
-    endif
-
-    Dim dbSource As Object
-    dbSource = createUnoService("com.sun.star.sdb.DataSource")
-    dbSource.URL = "sdbc:dbase:" + utils.Path2URL("file:///" + utils.getUserPath + "/database/biblio")
-	dbContext.registerObject("Bibliography", dbSource)
-
-    Dim params(2) As new com.sun.star.beans.PropertyValue
-    params(0).Name = "DataSourceName"
-    params(0).Value = "Bibliography"
-    params(1).Name = "CommandType"
-    params(1).Value = com.sun.star.sdb.CommandType.TABLE
-    params(2).Name = "Command"
-    params(2).Value = "biblio"
-
-    controller.initialize(params())
-    wait(2000)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/script.xlb
deleted file mode 100644
index cf9be87447ca..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleBrowseBoxHeaderBar" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleBrowseBoxHeaderBar"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/svtools_AccessibleBrowseBoxHeaderBar.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/svtools_AccessibleBrowseBoxHeaderBar.xba
deleted file mode 100644
index 77023c3fc39b..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderBar/svtools_AccessibleBrowseBoxHeaderBar.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleBrowseBoxHeaderBar" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleBrowseBoxHeaderBar
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                com.sun.star.accessibility.AccessibleRole.TABLE)
-    Out.log(oObj.getImplementationName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/script.xlb
deleted file mode 100644
index 9aaf5383f8bc..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleBrowseBoxHeaderCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleBrowseBoxHeaderCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/svtools_AccessibleBrowseBoxHeaderCell.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/svtools_AccessibleBrowseBoxHeaderCell.xba
deleted file mode 100644
index 666fad6474f7..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxHeaderCell/svtools_AccessibleBrowseBoxHeaderCell.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleBrowseBoxHeaderCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleBrowseBoxHeaderCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    Dim frame1 As Object, frame2 As Object
-    Dim controller As Object
-    frame1 = StarDesktop.getCurrentFrame()
-    frame2 = frame1.findFrame("_beamer", 4)
-    frame2.setName("DatasourceBrowser")
-    controller = frame2.getController()
-
-    Dim params(2) As new com.sun.star.beans.PropertyValue
-    params(0).Name = "DataSourceName"
-    params(0).Value = "Bibliography"
-    params(1).Name = "CommandType"
-    params(1).Value = com.sun.star.sdb.CommandType.TABLE
-    params(2).Name = "Command"
-    params(2).Value = "biblio"
-    controller.initialize(params())
-    wait(2000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-          com.sun.star.accessibility.AccessibleRole.COLUMN_HEADER, "Identifier")
-    Out.log(oObj.getImplementationName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/script.xlb
deleted file mode 100644
index 3a2e4b97b676..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleBrowseBoxTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleBrowseBoxTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/svtools_AccessibleBrowseBoxTable.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/svtools_AccessibleBrowseBoxTable.xba
deleted file mode 100644
index b7a726de892f..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTable/svtools_AccessibleBrowseBoxTable.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleBrowseBoxTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleBrowseBoxTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                       com.sun.star.accessibility.AccessibleRole.TABLE, "Table")
-    Out.log(oObj.getImplementationName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/script.xlb
deleted file mode 100644
index 15e06f1da551..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleBrowseBoxTableCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleBrowseBoxTableCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/svtools_AccessibleBrowseBoxTableCell.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/svtools_AccessibleBrowseBoxTableCell.xba
deleted file mode 100644
index e6f8b5df1e9e..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleBrowseBoxTableCell/svtools_AccessibleBrowseBoxTableCell.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleBrowseBoxTableCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleBrowseBoxTableCell
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    Dim frame1 As Object, frame2 As Object
-    Dim controller As Object
-    frame1 = StarDesktop.getCurrentFrame()
-    frame2 = frame1.findFrame("_beamer", 4)
-    frame2.setName("DatasourceBrowser")
-    controller = frame2.getController()
-
-    Dim params(2) As new com.sun.star.beans.PropertyValue
-    params(0).Name = "DataSourceName"
-    params(0).Value = "Bibliography"
-    params(1).Name = "CommandType"
-    params(1).Value = com.sun.star.sdb.CommandType.TABLE
-    params(2).Name = "Command"
-    params(2).Value = "biblio"
-    controller.initialize(params())
-    wait(2000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                           com.sun.star.accessibility.AccessibleRole.TABLE_CELL)
-    Out.log(oObj.getImplementationName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/script.xlb
deleted file mode 100644
index 84bb1302f21b..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleIconChoiceCtrl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleIconChoiceCtrl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/svtools_AccessibleIconChoiceCtrl.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/svtools_AccessibleIconChoiceCtrl.xba
deleted file mode 100644
index 882d9bc2e6f3..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrl/svtools_AccessibleIconChoiceCtrl.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleIconChoiceCtrl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global closeButton As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleIconChoiceCtrl
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object, xDispatcher As Object 
-    Dim tk As Object, urlTransformer As Object
-    Dim aUrl As new com.sun.star.util.URL
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUnoService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    'opening Hyperlink Dialog
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    aUrl.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(aUrl)
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "", 0)
-    if NOT isNull(xDispatcher) then
-        xDispatcher.dispatch(aUrl, DimArray())
-        wait(1000)
-        oWin = tk.getActiveTopWindow()
-        xRoot = utils.at_getAccessibleObject(oWin)
-        closeButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Close")
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                                com.sun.star.accessibility.AccessibleRole.TREE)
-        Out.Log("Implementation Name: "+oObj.getImplementationName())
-        multiSelection = false
-     else
-        Out.Log("Error! Cannot open Hyperlink dialog.")
-     End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(closeButton) then
-        closeButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.selectAccessibleChild(1)
-    oObj.selectAccessibleChild(0)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/script.xlb
deleted file mode 100644
index 6f46292399bd..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleIconChoiceCtrlEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleIconChoiceCtrlEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/svtools_AccessibleIconChoiceCtrlEntry.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/svtools_AccessibleIconChoiceCtrlEntry.xba
deleted file mode 100644
index 2833c8b1726f..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleIconChoiceCtrlEntry/svtools_AccessibleIconChoiceCtrlEntry.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleIconChoiceCtrlEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global closeButton As Object
-
-'Required for ifc.accessibility.XAccessibleText
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleIconChoiceCtrlEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "", 0)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot,_
-                    com.sun.star.accessibility.AccessibleRole.LABEL, "Internet")
-    Out.log(oObj.getImplementationName)
-
-    closeButton = utils.at_getAccessibleObjectForRole(xRoot, _
-                 com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON, "Close")
-    accText = "Internet"
-    readOnly = true
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    closeButton.soAccessibleAction(0)
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/script.xlb
deleted file mode 100644
index 4a0245810089..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleTabBarPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleTabBarPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/svtools_AccessibleTabBarPage.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/svtools_AccessibleTabBarPage.xba
deleted file mode 100644
index 31b998a5396d..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPage/svtools_AccessibleTabBarPage.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleTabBarPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleTabBarPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                            com.sun.star.accessibility.AccessibleRole.PAGE_TAB)
-
-    Out.log(oObj.getImplementationName)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/script.xlb
deleted file mode 100644
index 0a8715db28c7..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleTabBarPageList" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleTabBarPageList"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/svtools_AccessibleTabBarPageList.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/svtools_AccessibleTabBarPageList.xba
deleted file mode 100644
index add0261e7567..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTabBarPageList/svtools_AccessibleTabBarPageList.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleTabBarPageList" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for XAccessibleSelection
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleTabBarPageList
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB_LIST)
-    Out.log(oObj.getImplementationName)
-
-    multiSelection = false
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim oPage As Object
-    oPage = oDoc.getDrawPages().getByIndex(0)
-    oPage.Name = "New name"
-    oPage.Name = "Slide 1"
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/script.xlb
deleted file mode 100644
index 8e33c86bf389..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleTreeListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleTreeListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/svtools_AccessibleTreeListBox.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/svtools_AccessibleTreeListBox.xba
deleted file mode 100644
index 28ae95af7f0a..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBox/svtools_AccessibleTreeListBox.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleTreeListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-' Required for XAccessibleSelection
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleTreeListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                               com.sun.star.accessibility.AccessibleRole.TREE)
-    Out.log(oObj.getImplementationName)
-
-    multiSelection = false
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/script.xlb b/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/script.xlb
deleted file mode 100644
index 962db06a0175..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svtools_AccessibleTreeListBoxEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svtools_AccessibleTreeListBoxEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/svtools_AccessibleTreeListBoxEntry.xba b/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/svtools_AccessibleTreeListBoxEntry.xba
deleted file mode 100644
index 7f493975bbc2..000000000000
--- a/qadevOOo/tests/basic/mod/svtools/AccessibleTreeListBoxEntry/svtools_AccessibleTreeListBoxEntry.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svtools_AccessibleTreeListBoxEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for XAccessibleSelection
-Global multiSelection As Boolean
-
-' Required for XAccessibleText
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svtools.AccessibleTreeListBoxEntry
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    'opening DatasourceBrowser
-    Dim urlTransformer As Object
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    Dim aUrl As new com.sun.star.util.URL
-    aUrl.Complete = ".component:DB/DataSourceBrowser"
-    urlTransformer.parseStrict(aUrl)
-    Dim xDispatcher As Object
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl, "_beamer", 12)
-    Dim no_args()
-    xDispatcher.dispatch(aUrl, no_args)
-    wait(1000)
-
-    oWin = createUnoService("com.sun.star.awt.Toolkit").getActiveTopWindow()
-
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-               com.sun.star.accessibility.AccessibleRole.LABEL , "Bibliography")
-    Out.log(oObj.getImplementationName)
-
-    multiSelection = false
-    accText = "Bibliography"
-    readOnly = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/script.xlb
deleted file mode 100644
index 77d4ad179a8b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessibleControlShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessibleControlShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/svx_AccessibleControlShape.xba b/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/svx_AccessibleControlShape.xba
deleted file mode 100644
index 3c9d71237bb6..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleControlShape/svx_AccessibleControlShape.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessibleControlShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessibleControlShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-    Dim newSize As New com.sun.star.awt.Size
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oShape = toolkittools.createControlShapeWithDefaultControl("CommandButton")
-    newSize = oShape.getSize()
-    newSize.Width = 2000
-    newSize.Height = 1000
-    oShape.setSize(newSize)
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oDP.add(oShape)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"PushButton")
-    Out.Log("ImplementationName: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/script.xlb
deleted file mode 100644
index 75b3b77785b0..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessibleEditableTextPara" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="svx_AccessibleEditableTextPara"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/svx_AccessibleEditableTextPara.xba b/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/svx_AccessibleEditableTextPara.xba
deleted file mode 100644
index 3cc36dc5665b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleEditableTextPara/svx_AccessibleEditableTextPara.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="AccessibleEditableTextPara" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::accessibility::XAccessibleEditableText#optional"
- ' needs the following object relation:
-	global hasChangeableAttrs as boolean
-
-' "com::sun::star::accessibility::XAccessibleSelection#optional"
- ' needs the following object relation:
-'	Global multiSelection As Boolean
-
-' "com::sun::star::accessibility::XAccessibleText"
- ' needs the following object relation:
-   Global accText as String
-   Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.AccessibleEditableTextPara
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    Dim oShape As Object
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-
-    oDoc.DrawPages(0).add(oShape)
-    
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 7500
-    oSize.Height = 5000
-    oPos.X = 5000
-    oPos.Y = 3500
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    Dim cursor As Object
-    cursor = oShape.createTextCursor()
-
-    oShape.insertString(cursor, "Paragraph 1", false)
-    oShape.insertControlCharacter(cursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    Dim oWin as Object
-    Dim xRoot as Object
-    
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-             com.sun.star.accessibility.AccessibleRole.PARAGRAPH,"Paragraph 0")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    accText = "My AccessibleEditableTextPara text"
-    oObj.setText(accText)
-    readOnly = false
-    hasChangeableAttrs = false
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim myText as String
-    myText = oObj.getText()
-    oObj.setText(myText + "dummy")
-    wait(1000)
-    oObj.setText(myText)
-    wait(1000)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/script.xlb
deleted file mode 100644
index 68aabd47df19..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessibleGraphicShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessibleGraphicShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/svx_AccessibleGraphicShape.xba b/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/svx_AccessibleGraphicShape.xba
deleted file mode 100644
index ba3b7268d5b5..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleGraphicShape/svx_AccessibleGraphicShape.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessibleGraphicShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessibleGraphicShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oShape = toolkittools.addShapeToDrawDoc(oDP,2000,1500,"GraphicObject")
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"GraphicObject")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/script.xlb
deleted file mode 100644
index b5489ac01e47..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessibleOLEShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessibleOLEShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/svx_AccessibleOLEShape.xba b/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/svx_AccessibleOLEShape.xba
deleted file mode 100644
index f30a5d9f977f..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleOLEShape/svx_AccessibleOLEShape.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessibleOLEShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessibleOLEShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oShape = toolkittools.addShapeToDrawDoc(oDP,2000,1500,"OLE2")
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"OLEShape")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/script.xlb
deleted file mode 100644
index bae91fa48bb8..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessiblePageShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessiblePageShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/svx_AccessiblePageShape.xba b/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/svx_AccessiblePageShape.xba
deleted file mode 100644
index b657a5d9a43d..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePageShape/svx_AccessiblePageShape.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessiblePageShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oPage As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessiblePageShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oPage = oDoc.getDrawPages().getByIndex(0)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"PageShape")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oldHeight As Integer, newHeight As Integer
-    oldHeight = oPage.getPropertyValue("Height")
-    if oldHeight = 3000 then 
-        newHeight = 5000
-    else 
-        newHeight = 3000
-    end if
-    oPage.setPropertyValue("Height",newHeight)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/script.xlb
deleted file mode 100644
index 5c4ed50fcd54..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessiblePresentationGraphicShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessiblePresentationGraphicShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/svx_AccessiblePresentationGraphicShape.xba b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/svx_AccessiblePresentationGraphicShape.xba
deleted file mode 100644
index a80bad77237b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationGraphicShape/svx_AccessiblePresentationGraphicShape.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessiblePresentationGraphicShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As Object
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessiblePresentationGraphicShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oShape = oDoc.createInstance("com.sun.star.presentation.GraphicObjectShape")
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oDP.add(oShape)
-    oShape.setPropertyValue("IsEmptyPresentationObject",false)
-    wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"ImpressGraphicObject0")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then 
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/script.xlb
deleted file mode 100644
index 28a82bbc9a42..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessiblePresentationOLEShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessiblePresentationOLEShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/svx_AccessiblePresentationOLEShape.xba b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/svx_AccessiblePresentationOLEShape.xba
deleted file mode 100644
index dce2a97ed8e5..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationOLEShape/svx_AccessiblePresentationOLEShape.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessiblePresentationOLEShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessiblePresentationOLEShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oShape = oDoc.createInstance("com.sun.star.presentation.OLE2Shape")
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oDP.add(oShape)
-    oShape.setPropertyValue("IsEmptyPresentationObject",false)
-    wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"ImpressOLE0")
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/script.xlb
deleted file mode 100644
index 0d8026ccc39b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessiblePresentationShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessiblePresentationShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/svx_AccessiblePresentationShape.xba b/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/svx_AccessiblePresentationShape.xba
deleted file mode 100644
index 46c8789fb3b4..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessiblePresentationShape/svx_AccessiblePresentationShape.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessiblePresentationShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessiblePresentationShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean, oDP As Object
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createImpressDocument(cObjectName)
-    oShape = oDoc.createInstance("com.sun.star.presentation.HandoutShape")
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oDP.add(oShape)
-    oShape.setPropertyValue("IsEmptyPresentationObject",false)
-    wait(1000)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"ImpressHandout0")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then 
-        accText = oObj.getText()
-        Out.Log("Text: "+accText)
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleShape/script.xlb b/qadevOOo/tests/basic/mod/svx/AccessibleShape/script.xlb
deleted file mode 100644
index a19b93caf59c..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_AccessibleShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_AccessibleShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/AccessibleShape/svx_AccessibleShape.xba b/qadevOOo/tests/basic/mod/svx/AccessibleShape/svx_AccessibleShape.xba
deleted file mode 100644
index df23003fe75f..000000000000
--- a/qadevOOo/tests/basic/mod/svx/AccessibleShape/svx_AccessibleShape.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_AccessibleShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oShape As Object
-Global accText As String
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.AccessibleShape
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oWin As Object, xRoot As Object, oDP As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDP = oDoc.getDrawPages().getByIndex(0)
-    oShape = toolkittools.addShapeToDrawDoc(oDP,2000,1500,"Rectangle")
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SHAPE,"Rectangle")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    if hasUNOInterfaces(oObj,"com.sun.star.accessibility.XAccessibleText") then
-        accText = oObj.getText()
-    End If
-    hasChangeableAttrs = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    Dim oSize As New com.sun.star.awt.Size
-    oSize = oShape.getSize()
-    oSize.Width = oSize.Width + 100
-    oShape.setSize(oSize)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/GraphicExporter/script.xlb b/qadevOOo/tests/basic/mod/svx/GraphicExporter/script.xlb
deleted file mode 100644
index e71cdd2c295c..000000000000
--- a/qadevOOo/tests/basic/mod/svx/GraphicExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_GraphicExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_GraphicExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/GraphicExporter/svx_GraphicExporter.xba b/qadevOOo/tests/basic/mod/svx/GraphicExporter/svx_GraphicExporter.xba
deleted file mode 100644
index d2ba0465ea4a..000000000000
--- a/qadevOOo/tests/basic/mod/svx/GraphicExporter/svx_GraphicExporter.xba
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_GraphicExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-' Requiered for  com.sun.star.document.XFilter
-  Global oFilterDescriptor As Variant
-  Global pictureURL As String 
-
-' Requiered for  com.sun.star.document.XExporter
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.GraphicExporter
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.drawing.GraphicExportFilter")    
-
-    Dim shape As Object
-    shape = oDoc.createInstance("com.sun.star.drawing.GraphicObjectShape")
-    out.log("create com.sun.star.drawing.GraphicObjectShape : is NULL? " + IsNULL(shape))
-
-    Dim shapeSize As new com.sun.star.awt.Size
-    Dim shapePos As new com.sun.star.awt.Point
-    shapeSize.Width = 5000
-    shapeSize.Height = 5000
-    out.log("set size of shape : " + shapeSize.Width + ", " + shapeSize.Height)
-    shape.setSize(shapeSize)
-    shapePos.x = 1500
-    shapePos.y = 1000
-    out.log("set position of shape : " + shapePos.x + ", " + shapePos.y)
-    shape.setPosition(shapePos)
-    out.log("adds created shape")
-    oDoc.getDrawPages.getByIndex(0).add(shape)
-    out.log("set GraphicURL to " + utils.Path2URL(cTestDocsDir &amp; "space-metal.jpg") )
-    shape.GraphicURL = utils.Path2URL(cTestDocsDir &amp; "space-metal.jpg")
-    out.log("set shape as source document for created object")
-    oObj.setSourceDocument(shape)
-    oSrcDocument = shape
-
-    Dim _Filter(2) As New com.sun.star.beans.PropertyValue
-    _Filter(0).Name = "FilterName" : _Filter(0).Value = "JPG"       
-    Dim url as new com.sun.star.util.URL
-    url.Complete = utils.getTempFileURL("picture.jpg", True)
-    pictureURL = url.Complete 
-    out.log("URL descriptor : " + pictureURL)
-    _Filter(1).Name = "URL" : _Filter(1).Value = url
-    _Filter(2).Name = "MediaType" : _Filter(1).Value = "image/jpeg"
-    oFilterDescriptor = _Filter()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-    
-Function checkFilter() As Boolean
-    If IsNULL(soapi_test_hidewindows) Or soapi_test_hidewindows = True Then
-        out.log("all windows are hide")
-        checkFilter() = True
-    Else
-        Dim simpleFile As Object
-        simpleFile = createUnoService("com.sun.star.ucb.SimpleFileAccess")
-        out.log("creates com.sun.star.ucb.SimpleFileAccess : is NULL? " + IsNULL(SimpleFile))
-        checkFilter() = simpleFile.exists(pictureURL)
-        out.log("check existing of " + pictureURL + ": " + checkFilter)
-    EndIf
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxDrawPage/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxDrawPage/script.xlb
deleted file mode 100644
index 92cbb03d1a70..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxDrawPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxDrawPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxDrawPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxDrawPage/svx_SvxDrawPage.xba b/qadevOOo/tests/basic/mod/svx/SvxDrawPage/svx_SvxDrawPage.xba
deleted file mode 100644
index 93bf472a1f72..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxDrawPage/svx_SvxDrawPage.xba
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxDrawPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.drawing.XShapeGrouper
- Global oGrouperCollection As Object 'groupable objects
-' Requiered for  com.sun.star.drawing.XShapes
- Global oXShapeInstance As Object 'to add/remove
-' Requiered for  com.sun.star.drawing.XShapeCombiner
- Global oCombinerCollection As Object
-' Requiered for  com.sun.star.drawing.XShapeBinder
- Global oBinderCollection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxDrawPage
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    aPoint.x = 100
-    aPoint.y = 200
-    aSize.Width = 3000
-    aSize.Height = 4000
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oXShapeInstance.Size = aSize
-    oXShapeInstance.Position = aPoint
-    oXShapeInstance.FillColor = RGB(255, 0, 0)
-    
-    oDrawPage = oDoc.DrawPages(0)
-    oObj = oDrawPage
-
-    oGrouperCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oCombinerCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oBinderCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-
-    AddShape(oObj, 100, 200, "com.sun.star.drawing.LineShape")
-    AddShape(oObj, 200, 200, "com.sun.star.drawing.EllipseShape")
-
-    oShape = oObj.getByIndex(0)
-    oGrouperCollection.Add(oShape)
-    oShape = oObj.getByIndex(1)
-    oGrouperCollection.Add(oShape)
-
-    AddShape(oObj, 300, 200, "com.sun.star.drawing.LineShape")
-    AddShape(oObj, 400, 200, "com.sun.star.drawing.EllipseShape")
-    oShape = oObj.getByIndex(2)
-    oCombinerCollection.Add(oShape)
-    oShape = oObj.getByIndex(3)
-    oCombinerCollection.Add(oShape)
-     
-    AddShape(oObj, 500, 200, "com.sun.star.drawing.LineShape")
-    AddShape(oObj, 600, 200, "com.sun.star.drawing.EllipseShape")
-    oShape = oObj.getByIndex(4)
-    oBinderCollection.Add(oShape)
-    oShape = oObj.getByIndex(5)
-    oBinderCollection.Add(oShape)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-sub AddShape(oPage as Object, nPosX, nPosY as Integer, shapeService As String)
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oShape As Object
-
-    aPoint.x = nPosX
-    aPoint.y = nPosY
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oShape = oDoc.createInstance(shapeService)
-    oShape.Size = aSize
-    oShape.Position = aPoint
-    oShape.FillColor = RGB(255, 0, 0)
-    oPage.add(oShape)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/script.xlb
deleted file mode 100644
index 91ba4fe53e18..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxGraphCtrlAccessibleContext" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxGraphCtrlAccessibleContext"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/svx_SvxGraphCtrlAccessibleContext.xba b/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/svx_SvxGraphCtrlAccessibleContext.xba
deleted file mode 100644
index 1eff0e117047..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxGraphCtrlAccessibleContext/svx_SvxGraphCtrlAccessibleContext.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxGraphCtrlAccessibleContext" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global xController As Object
-Global oShape As Object
-Global multiSelection As Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxGraphCtrlAccessibleContext
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim oDP As Object, url As String
-    Dim newSize As New com.sun.star.awt.Size
-    Dim aUrl As new com.sun.star.util.URL
-    Dim xDispatcher As Object, urlTransformer As Object
-    Dim tk As Object
-
-    'creating document, toolkit and adding shape
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    tk = createUnoService("com.sun.star.awt.Toolkit")
-    oShape = oDoc.createInstance("com.sun.star.drawing.GraphicObjectShape")
-    newSize = oShape.getSize()
-    newSize.Width = 5000
-    newSize.Height = 5000
-    oShape.setSize(newSize)
-    url = utils.Path2URL(cTestDocsDir + "space-metal.jpg")
-    Out.log("URL: "+url)
-    oShape.setPropertyValue("GraphicURL", url)
-    wait(500)
-    oDoc.getDrawPages().getByIndex(0).add(oShape)
-    wait(1000)
-
-    'opening ImageMapDialog
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    aUrl.Complete = "slot:10371"
-    urlTransformer.parseStrict(aUrl)
-    wait(500)
-    xController = oDoc.getCurrentController()
-    xDispatcher = xController.queryDispatch(aUrl,"",0)
-    if (NOT isNull(xDispatcher)) then
-        xDispatcher.dispatch(aUrl, DimArray())
-        wait(2000)
-        oWin = tk.getActiveTopWindow()
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL)
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        multiSelection = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open ImageMapDialog...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    xController.select(oShape)
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/script.xlb
deleted file mode 100644
index 7a7140bbdc62..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxGraphicObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxGraphicObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/svx_SvxGraphicObject.xba b/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/svx_SvxGraphicObject.xba
deleted file mode 100644
index 2eced4069f0d..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxGraphicObject/svx_SvxGraphicObject.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxGraphicObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxGraphicObject
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape As Object
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    cShapeType = "com.sun.star.drawing.GraphicObjectShape"
-
-    oShape = oDoc.createInstance("com.sun.star.drawing.GraphicObjectShape")
-
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-
-    aPoint.x = 100
-    aPoint.y = 100
-    aSize.Width = 10000
-    aSize.Height = 10000
-    oShape.Size = aSize
-    oShape.Position = aPoint
-        
-    oDoc.DrawPages(0).add(oShape)
-    oShape.setString("Graphic Object")   
-    oObj = oShape
-
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.GraphicObjectShape")
-
-    aPoint.x = 100
-    aPoint.y = 10200
-    aSize.Width = 20000
-    aSize.Height = 10000
-    oComponentInstance.Size = aSize
-    oComponentInstance.Position = aPoint
-    oDoc.DrawPages(0).add(oComponentInstance)
-    oComponentInstance.setString("For com.sun.star.lang.XComponent")
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShape/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShape/script.xlb
deleted file mode 100644
index 7fb4aa928ddd..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShape/svx_SvxShape.xba b/qadevOOo/tests/basic/mod/svx/SvxShape/svx_SvxShape.xba
deleted file mode 100644
index c1d24e64033b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShape/svx_SvxShape.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShape
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.loadTestDocument("SvxShape.sxd")
-
-    Dim oDrawPage As Object
-    oDrawPage = oDoc.DrawPages(0)
-    
-    oObj = oDrawPage.getByIndex(0)
-
-    cShapeType = "com.sun.star.drawing.RectangleShape"
-
-    oComponentInstance = oDrawPage.getByIndex(1)
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/script.xlb
deleted file mode 100644
index b86c75094fb8..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeCircle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeCircle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/svx_SvxShapeCircle.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/svx_SvxShapeCircle.xba
deleted file mode 100644
index f70fded68818..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeCircle/svx_SvxShapeCircle.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeCircle" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeCircle
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oDrawPage As Object, oShape As Object
-
-    bOK = true
-
-    oDoc = utils.loadTestDocument("SvxShape.sxd")
-
-    oDrawPage = oDoc.DrawPages(0)
-
-    oShape = CreateShape(5000, 5000, 3000, 3000, "EllipseShape", oDoc)
-    oDrawPage.Add(oShape)
-
-    oShape.setPropertyValue("CircleKind", com.sun.star.drawing.CircleKind.FULL)
-
-    oObj = oShape
-
-    cShapeType = "com.sun.star.drawing.EllipseShape"
-
-    oComponentInstance = oDrawPage.getByIndex(1)
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CreateShape(x As Integer, y As Integer, width As Integer, height As Integer, kind As String, doc As Object)
-    Dim oShape As Object
-    Dim pos As new com.sun.star.awt.Point
-    Dim size As new com.sun.star.awt.Size
-    
-    oShape = doc.createInstance("com.sun.star.drawing." + kind)
-    pos.X = x
-    pos.Y = y
-    oShape.setPosition(pos)
-    size.Width = width
-    size.Height = height
-    oShape.setSize(size)
-
-    CreateShape = oShape
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/script.xlb
deleted file mode 100644
index d8b9b68aa10b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeCollection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeCollection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/svx_SvxShapeCollection.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/svx_SvxShapeCollection.xba
deleted file mode 100644
index 735877f852aa..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeCollection/svx_SvxShapeCollection.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeCollection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.drawing.XShapes
- Global oXShapeInstance As Object 'to add/remove
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeCollection
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = createUnoService("com.sun.star.drawing.ShapeCollection")
-
-    oInstance = oDoc.createInstance("com.sun.star.drawing.LineShape")
-    oObj.add(oInstance)
-
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.EllipseShape")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/script.xlb
deleted file mode 100644
index 9543a130574d..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeConnector" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeConnector"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/svx_SvxShapeConnector.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/svx_SvxShapeConnector.xba
deleted file mode 100644
index cdc3affad516..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeConnector/svx_SvxShapeConnector.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeConnector" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeConnector
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.createInstance("com.sun.star.drawing.ConnectorShape")
-    oDoc.DrawPages(0).add(oObj)
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.ConnectorShape")
-    oDoc.DrawPages(0).add(oComponentInstance)
-
-    cShapeType = "com.sun.star.drawing.ConnectorShape"
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeControl/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeControl/script.xlb
deleted file mode 100644
index 5545f03095c2..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeControl/svx_SvxShapeControl.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeControl/svx_SvxShapeControl.xba
deleted file mode 100644
index ab0ed81abf79..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeControl/svx_SvxShapeControl.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XControlShape
- Global oControlToSet As Object
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oDrawPage As Object, oShape As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oDrawPage = oDoc.DrawPages(0)
-
-    oControlToSet = oDoc.createInstance("com.sun.star.form.component.CheckBox")
-
-    ' insert ControlShape    
-    Dim aPoint As New com.sun.star.awt.Point
-    Dim aSize As New com.sun.star.awt.Size
-    Dim oControl, oCShape As Object
-
-    aPoint.x = 3000
-    aPoint.y = 4500
-    aSize.Width = 15000
-    aSize.Height = 1000
-    oCShape = oDoc.createInstance("com.sun.star.drawing.ControlShape")
-    oCShape.Size = aSize
-    oCShape.Position = aPoint
-
-    oControl = oDoc.createInstance("com.sun.star.form.component.CommandButton")
-    oControl.DefaultControl = "com.sun.star.form.control.CommandButton"
-
-    oCShape.setControl(oControl)
-
-    oDrawPage.add(oCShape)
-
-    oObj = oCShape
-
-    cShapeType = "com.sun.star.drawing.ControlShape"
-
-    aPoint.x = 3000
-    aPoint.y = 10000
-    aSize.Width = 15000
-    aSize.Height = 1000
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.LineShape")
-    oComponentInstance.Size = aSize
-    oComponentInstance.Position = aPoint
-    
-    oDrawPage.add(oComponentInstance)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/script.xlb
deleted file mode 100644
index 53eb8199670e..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeDimensioning" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeDimensioning"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/svx_SvxShapeDimensioning.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/svx_SvxShapeDimensioning.xba
deleted file mode 100644
index b60010cfde5e..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeDimensioning/svx_SvxShapeDimensioning.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeDimensioning" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeDimensioning
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oMShape As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oMShape = oDoc.createInstance("com.sun.star.drawing.MeasureShape")
-    oDoc.DrawPages(0).add(oMShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPosition As new com.sun.star.awt.Point
-
-    oSize.Width = 3000
-    oSize.Height = 3000
-    oPosition.X = 4000
-    oPosition.Y = 4000
-    oMShape.Size = oSize
-    oMShape.Position = oPosition
-
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.LineShape")
-    oDoc.DrawPages(0).Add(oComponentInstance)
-
-    oSize.Width = 7500
-    oSize.Height = 5000
-    oPosition.X = 5000
-    oPosition.Y = 3500
-    oComponentInstance.Size = oSize
-    oComponentInstance.Position = oPosition
-
-    oObj = oMShape
-    
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-
-    cShapeType = "com.sun.star.drawing.MeasureShape"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/script.xlb
deleted file mode 100644
index 55001aa96454..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapeGroup" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapeGroup"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/svx_SvxShapeGroup.xba b/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/svx_SvxShapeGroup.xba
deleted file mode 100644
index 5f68214c0fda..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapeGroup/svx_SvxShapeGroup.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapeGroup" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.drawing.XShapes
- Global oXShapeInstance As Object 'to add/remove
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapeGroup
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oInstance As Object, oDP As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oDP = oDoc.DrawPages(0)
-    oInstance = CreateShape(1000, 2000, 4000, 3000, "LineShape")
-    oDP.add(oInstance)
-
-    oInstance = CreateShape(1000, 2000, 3000, 4000, "LineShape")
-    oDP.add(oInstance)
-
-    oObj = oDP.group(oDP)
-
-    oXShapeInstance = CreateShape(1000, 6000, 4000, 3000, "EllipseShape")
-    oDP.add(oXShapeInstance)
-
-    oComponentInstance = CreateShape(10000, 5000, 6000, 4000, "RectangleShape")
-    oDP.add(oComponentInstance)
-
-    cShapeType = "com.sun.star.drawing.GroupShape"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CreateShape(x As Integer, y As Integer, width As Integer, height As Integer, kind As String)
-    Dim oShape As Object
-    Dim pos As new com.sun.star.awt.Point
-    Dim size As new com.sun.star.awt.Size
-    
-    oShape = oDoc.createInstance("com.sun.star.drawing." + kind)
-    pos.X = x
-    pos.Y = y
-    oShape.setPosition(pos)
-    size.Width = width
-    size.Height = height
-    oShape.setSize(size)
-
-    CreateShape = oShape
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/script.xlb
deleted file mode 100644
index eb6344ae8d7b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapePolyPolygon" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapePolyPolygon"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/svx_SvxShapePolyPolygon.xba b/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/svx_SvxShapePolyPolygon.xba
deleted file mode 100644
index bbe16dae426d..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygon/svx_SvxShapePolyPolygon.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapePolyPolygon" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapePolyPolygon
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.loadTestDocument("SvxShape.sxd")
-
-    oObj = oDoc.createInstance("com.sun.star.drawing.PolyPolygonShape")
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.PolyPolygonShape")
-    oDoc.DrawPages(0).add(oObj)
-    oDoc.DrawPages(0).add(oComponentInstance)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPosition As new com.sun.star.awt.Point
-
-    oSize.Width = 0
-    oSize.Height = 0
-    oPosition.X = 0
-    oPosition.Y = 0
-
-    oObj.Size = oSize
-    oObj.Position = oPosition
-
-    Dim ps1(3) As new com.sun.star.awt.Point
-    ps1(0).X = 5000 : ps1(0).Y = 5000
-    ps1(1).X = 10000 : ps1(1).Y = 5000
-    ps1(2).X = 10000 : ps1(2).Y = 10000
-    ps1(3).X = 5000 : ps1(3).Y = 10000
-
-    Dim ps2(3) As new com.sun.star.awt.Point
-    ps2(0).X = 6500 : ps2(0).Y = 6500
-    ps2(1).X = 8500 : ps2(1).Y = 6500
-    ps2(2).X = 8500 : ps2(2).Y = 8500
-    ps2(3).X = 6500 : ps2(3).Y = 8500
-
-    Dim psA(1) As Variant
-    psA(0) = ps1()
-    psA(1) = ps2()
-
-    oObj.setPropertyValue("PolyPolygon", psA())
-
-    cShapeType = "com.sun.star.drawing.PolyPolygonShape"
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/script.xlb
deleted file mode 100644
index 10c60b564753..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxShapePolyPolygonBezier" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxShapePolyPolygonBezier"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/svx_SvxShapePolyPolygonBezier.xba b/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/svx_SvxShapePolyPolygonBezier.xba
deleted file mode 100644
index 65cf58712755..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxShapePolyPolygonBezier/svx_SvxShapePolyPolygonBezier.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxShapePolyPolygonBezier" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.drawing.XShapeDescriptor
- Global cShapeType As String
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxShapePolyPolygonBezier
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.loadTestDocument("SvxShape.sxd")
-
-    cShapeType = "com.sun.star.drawing.ClosedBezierShape"
-
-    oObj = oDoc.createInstance("com.sun.star.drawing.ClosedBezierShape")
-    oDoc.DrawPages(0).add(oObj)
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPosition As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 5000
-    oPosition.X = 4000
-    oPosition.Y = 4000
-    oObj.Size = oSize
-    oObj.Position = oPosition
-
-    oComponentInstance = oDoc.createInstance("com.sun.star.drawing.ClosedBezierShape")
-    oDoc.DrawPages(0).add(oComponentInstance)
-    oSize.Width = 8000
-    oSize.Height = 8000
-    oPosition.X = 4000
-    oPosition.Y = 4000
-    oComponentInstance.Size = oSize
-    oComponentInstance.Position = oPosition
-
-    Dim ps1(3) As new com.sun.star.awt.Point
-    Dim pf1(3) As Integer
-    with com.sun.star.drawing.PolygonFlags
-
-    ps1(0).X = 5000 : ps1(0).Y = 5000 : pf1(0) = .NORMAL
-    ps1(1).X = 10000 : ps1(1).Y = 5000 : pf1(1) = .CONTROL
-    ps1(2).X = 10000 : ps1(2).Y = 10000 : pf1(2) = .CONTROL
-    ps1(3).X = 5000 : ps1(3).Y = 10000 : pf1(3) = .NORMAL
-
-    Dim ps2(3) As new com.sun.star.awt.Point
-    Dim pf2(3) As Integer
-    ps2(0).X = 6500 : ps2(0).Y = 6500 : pf2(0) = .NORMAL
-    ps2(1).X = 8500 : ps2(1).Y = 6500 : pf2(1) = .CONTROL
-    ps2(2).X = 8500 : ps2(2).Y = 8500 : pf2(2) = .CONTROL
-    ps2(3).X = 6500 : ps2(3).Y = 8500 : pf2(3) = .NORMAL
-    end with
-
-    Dim psA As Variant
-    psA = Array( ps1(), ps2() )
-
-    Dim oFlags As Variant
-    oFlags = Array( pf1(), pf2() )
-
-    Dim oCoords As New com.sun.star.drawing.PolyPolygonBezierCoords
-    oCoords.Coordinates = psA()
-    oCoords.Flags = oFlags()
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-
-    oObj.PolyPolygonBezier = oCoords
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/script.xlb
deleted file mode 100644
index dbec5ae77863..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoNumberingRules" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoNumberingRules"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/svx_SvxUnoNumberingRules.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/svx_SvxUnoNumberingRules.xba
deleted file mode 100644
index 9e810e199564..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoNumberingRules/svx_SvxUnoNumberingRules.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoNumberingRules" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoNumberingRules
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oObj = oDoc.CreateInstance("com.sun.star.text.NumberingRules")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoText/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoText/script.xlb
deleted file mode 100644
index c9bf01991831..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoText/svx_SvxUnoText.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoText/svx_SvxUnoText.xba
deleted file mode 100644
index 1e83583fb8f8..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoText/svx_SvxUnoText.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XText
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoText
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    Dim oShape As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-
-    oDoc.DrawPages(0).add(oShape)
-    
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 7500
-    oSize.Height = 5000
-    oPos.X = 5000
-    oPos.Y = 3500
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    Dim cursor As Object
-    cursor = oShape.createTextCursor()
-
-    oShape.insertString(cursor, "Paragraph 1", false)
-    oShape.insertControlCharacter(cursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(cursor, "Paragraph 2", false)
-    oShape.insertControlCharacter(cursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(cursor, "Paragraph 3", false)
-    oShape.insertControlCharacter(cursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oObj = oShape.getText()    
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/script.xlb
deleted file mode 100644
index 2e140811e9f8..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextContent" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextContent"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/svx_SvxUnoTextContent.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/svx_SvxUnoTextContent.xba
deleted file mode 100644
index 8ae855ffa829..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContent/svx_SvxUnoTextContent.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextContent" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextContent
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oEnum As Object
-    Dim oCursor As Object
-    Dim oShape As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-    oDoc.DrawPages(0).Add(oShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 3500
-    oPos.X = 7500
-    oPos.Y = 5000
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    oCursor = oShape.createTextCursor()
-    oShape.insertString(oCursor, "String1 from SvxUnoTextContent", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(oCursor, "String2 from SvxUnoTextContent", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oEnum = oShape.createEnumeration()
-
-    oObj = oEnum.nextElement()
-    oComponentInstance = oEnum.nextElement()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/script.xlb
deleted file mode 100644
index c061425efd68..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextContentEnum" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextContentEnum"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/svx_SvxUnoTextContentEnum.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/svx_SvxUnoTextContentEnum.xba
deleted file mode 100644
index c867d49d09e1..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextContentEnum/svx_SvxUnoTextContentEnum.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextContentEnum" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextContentEnum
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oCursor As Object
-    Dim oShape As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-    oDoc.DrawPages(0).Add(oShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 3500
-    oPos.X = 7500
-    oPos.Y = 5000
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    oCursor = oShape.createTextCursor()
-    oShape.insertString(oCursor, "String1 from SvxUnoTextContentEnum", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(oCursor, "String2 from SvxUnoTextContentEnum", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oObj = oShape.createEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/script.xlb
deleted file mode 100644
index be5f5a3ea2d9..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/svx_SvxUnoTextCursor.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/svx_SvxUnoTextCursor.xba
deleted file mode 100644
index 9c6dbdee9dc1..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextCursor/svx_SvxUnoTextCursor.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XParagraphCursor
- Global oText As Object
-
-' Requiered for  com.sun.star.text.XTextCursor
- Global oCursor As Object 'One more cursor
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextCursor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("scalc", cObjectName)
-
-    Dim StyleFamilies As Object
-    StyleFamilies = oDoc.getStyleFamilies
-
-    Dim PageStyles As Object
-    PageStyles = StyleFamilies.getByName("PageStyles")
-
-    Dim DefaultStyle As Object
-    DefaultStyle = PageStyles.getByName("Default")
-
-    Dim RPHC As Object
-    RPHC = DefaultStyle.getPropertyValue("RightPageHeaderContent")
-    RPHC.getCenterText.String = "Center"
-    DefaultStyle.setPropertyValue("RightPageHeaderContent", RPHC)
-
-    oText = RPHC.getCenterText
-    oObj = oText.createTextCursor()
-
-    oCursor = oText.createTextCursor()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/script.xlb
deleted file mode 100644
index 13e071929680..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/svx_SvxUnoTextField.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/svx_SvxUnoTextField.xba
deleted file mode 100644
index cc6c9e57f8cb..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextField/svx_SvxUnoTextField.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextField
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    Dim oShape As Object
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-    oDoc.DrawPages(0).Add(oShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 3500
-    oPos.X = 7500
-    oPos.Y = 5000
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    Dim oCursor As Object
-    oCursor = oShape.createTextCursor()
-    oShape.insertString(oCursor, "String1 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(oCursor, "String2 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oObj = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-    oShape.insertTextContent(oShape.createTextCursor(), oObj, false)
-    oComponentInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-    oShape.insertTextContent(oShape.createTextCursor(), oComponentInstance, false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-	oXTextContentRange = oShape.createTextCursor()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/script.xlb
deleted file mode 100644
index 10f511650187..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/svx_SvxUnoTextRange.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/svx_SvxUnoTextRange.xba
deleted file mode 100644
index ff1172f84c5f..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRange/svx_SvxUnoTextRange.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextRange
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    Dim oEnum As Object
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    Dim oShape As Object
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-    oDoc.DrawPages(0).Add(oShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 3500
-    oPos.X = 7500
-    oPos.Y = 5000
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    Dim oCursor As Object
-    oCursor = oShape.createTextCursor()
-    oShape.insertString(oCursor, "String1 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(oCursor, "String2 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oObj = oShape.CreateEnumeration().nextElement()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/script.xlb b/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/script.xlb
deleted file mode 100644
index d4b54ce26e6b..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="svx_SvxUnoTextRangeEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="svx_SvxUnoTextRangeEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/svx_SvxUnoTextRangeEnumeration.xba b/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/svx_SvxUnoTextRangeEnumeration.xba
deleted file mode 100644
index 9885dbde5056..000000000000
--- a/qadevOOo/tests/basic/mod/svx/SvxUnoTextRangeEnumeration/svx_SvxUnoTextRangeEnumeration.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="svx_SvxUnoTextRangeEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' svx.SvxUnoTextRangeEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    Dim oEnum As Object
-
-    oDoc = utils.createDocument("sdraw", cObjectName)
-
-    Dim oShape As Object
-    oShape = oDoc.createInstance("com.sun.star.drawing.TextShape")
-    oDoc.DrawPages(0).Add(oShape)
-
-    Dim oSize As new com.sun.star.awt.Size
-    Dim oPos As new com.sun.star.awt.Point
-    oSize.Width = 5000
-    oSize.Height = 3500
-    oPos.X = 7500
-    oPos.Y = 5000
-    oShape.Size = oSize
-    oShape.Position = oPos
-
-    Dim oCursor As Object
-    oCursor = oShape.createTextCursor()
-    oShape.insertString(oCursor, "String1 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    oShape.insertString(oCursor, "String2 from SvxUnoText", false)
-    oShape.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-
-    oObj = oShape.CreateEnumeration()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/script.xlb
deleted file mode 100644
index 2e29e2f9ec02..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleDocumentPageView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleDocumentPageView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/sw_SwAccessibleDocumentPageView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/sw_SwAccessibleDocumentPageView.xba
deleted file mode 100644
index 307ec2ae244e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentPageView/sw_SwAccessibleDocumentPageView.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleDocumentPageView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global prevButton As Object
-Global nextButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleDocumentPageView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, oText As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object, cursor As Object
-    Dim i As Integer, oWin As Object
-
-    oDoc = utils.createDocument("swriter",cObjectName)
-    oText = oDoc.getText()
-    cursor = oText.createTextCursor()
-
-    'inserting some lines
-    for i = 0 to 30
-      oText.insertString(cursor, "Paragraph Number: " + i, false)
-      oText.insertString(cursor,_
-        " The quick brown fox jumps over the lazy Dog: SwAccessibleDocumentPageView",_
-        false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-      oText.insertString(cursor,_
-        "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG: SwAccessibleDocumentPageView",_
-        false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.LINE_BREAK, false)
-    next i
-
-    xController = oDoc.getCurrentController()
-
-    'switch to PreviewMode
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    wait(500)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then
-      xDispatcher.dispatch(url, DimArray())
-      wait(1000)
-      oWin = utils.at_getCurrentWindow(oDoc)
-      xRoot = utils.at_getAccessibleObject(oWin)
-      oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-      Out.Log("Implementation Name: "+oObj.getImplementationName())
-      prevButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Previous Page")
-      nextButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Next Page")
-    else
-      Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-    End If
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    prevButton.doAccessibleAction(0)
-    wait(500)
-    nextButton.doAccessibleAction(0)
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/script.xlb
deleted file mode 100644
index 04d5f4164cf9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleDocumentView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleDocumentView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/sw_SwAccessibleDocumentView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/sw_SwAccessibleDocumentView.xba
deleted file mode 100644
index 0125e5245153..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleDocumentView/sw_SwAccessibleDocumentView.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleDocumentView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oScrollBar As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleDocumentView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.DOCUMENT)
-    oScrollBar = utils.at_getAccessibleObjectForRole(xRoot, _
-                                          com.sun.star.accessibility.AccessibleRole.SCROLL_BAR)
-
-    multiSelection = false
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oScrollBar.setCurrentValue(oScrollBar.getMaximumValue())
-  oScrollBar.setCurrentValue(oScrollBar.getMinimumValue())
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/script.xlb
deleted file mode 100644
index ca9a17cb761e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleEndnoteView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleEndnoteView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/sw_SwAccessibleEndnoteView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/sw_SwAccessibleEndnoteView.xba
deleted file mode 100644
index eae9937b4b6c..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleEndnoteView/sw_SwAccessibleEndnoteView.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleEndnoteView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleEndnoteView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oEndnote As Object
-    oEndnote = oDoc.createInstance("com.sun.star.text.Endnote")
-
-    Dim oText As Object
-    oText = oDoc.getText()
-
-    Dim oCursor As Object
-    oCursor = oText.createTextCursor()
-
-    oText.insertTextContent(oCursor, oEndnote, false)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-    oViewSettings.ZoomValue = 10
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                            com.sun.star.accessibility.AccessibleRole.END_NOTE)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 10
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/script.xlb
deleted file mode 100644
index cda1e969a618..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleFooterView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleFooterView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/sw_SwAccessibleFooterView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/sw_SwAccessibleFooterView.xba
deleted file mode 100644
index 6764d2574ab7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleFooterView/sw_SwAccessibleFooterView.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleFooterView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleFooterView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oStyleFamilies As Object
-    oStyleFamilies = oDoc.getStyleFamilies()
-    Dim oStyleFam As Object
-    oStyleFam = oStyleFamilies.getByName("PageStyles")
-    Dim oStyle As Object
-    oStyle = oStyleFam.getByName("Standard")
-    oStyle.FooterIsOn = true
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    Dim oViewSettings As Object
-    oViewSettings = xController.getViewSettings()
-    oViewSettings.ZoomValue = 10
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                              com.sun.star.accessibility.AccessibleRole.FOOTER)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/script.xlb
deleted file mode 100644
index e484bbbc6985..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleFootnoteView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleFootnoteView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/sw_SwAccessibleFootnoteView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/sw_SwAccessibleFootnoteView.xba
deleted file mode 100644
index 085a28a21625..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleFootnoteView/sw_SwAccessibleFootnoteView.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleFootnoteView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleFootnoteView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oFootnote As Object
-    oFootnote = oDoc.createInstance("com.sun.star.text.Footnote")
-
-    Dim oText As Object
-    oText = oDoc.getText()
-
-    Dim oCursor As Object
-    oCursor = oText.createTextCursor()
-
-    oText.insertTextContent(oCursor, oFootnote, false)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-    oViewSettings.ZoomValue = 10
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                            com.sun.star.accessibility.AccessibleRole.FOOTNOTE)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 10
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/script.xlb
deleted file mode 100644
index f327ecc79c2d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleHeaderView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleHeaderView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/sw_SwAccessibleHeaderView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/sw_SwAccessibleHeaderView.xba
deleted file mode 100644
index 42deb88c92a4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleHeaderView/sw_SwAccessibleHeaderView.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleHeaderView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oStyle As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleHeaderView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oStyleFamilies As Object, oStyleFam As Object
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oStyleFam = oStyleFamilies.getByName("PageStyles")
-    oStyle = oStyleFam.getByName("Standard")
-    oStyle.HeaderIsOn = true
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                              com.sun.star.accessibility.AccessibleRole.HEADER)
-
-    Out.Log("Implementation Name: "+oObj.getImplementationName())    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim oldValue As Integer
-    oldValue = oStyle.HeaderLeftMargin
-    oStyle.HeaderLeftMargin = oldValue + 1
-    wait(500)
-    oStyle.HeaderLeftMargin = oldValue - 1
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/script.xlb
deleted file mode 100644
index 2e841c7713e8..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessiblePageView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessiblePageView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/sw_SwAccessiblePageView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/sw_SwAccessiblePageView.xba
deleted file mode 100644
index bb1bf37a602b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessiblePageView/sw_SwAccessiblePageView.xba
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessiblePageView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global prevButton As Object
-Global nextButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessiblePageView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object, oWin As Object
-    Dim url As New com.sun.star.util.URL
-    Dim urlTransformer As Object
-    Dim oText As Object, cursor As Object 
-    Dim i As Integer
-
-    oDoc = utils.createDocument("swriter",cObjectName)
-    oText = oDoc.getText()
-    cursor = oText.createTextCursor()
-
-    'inserting some lines
-    for i = 0 to 30
-      oText.insertString(cursor, "Paragraph Number: " + i, false)
-      oText.insertString(cursor,_
-        " The quick brown fox jumps over the lazy Dog: SwAccessibleDocumentPageView",_
-        false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-      oText.insertString(cursor,_
-        "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG: SwAccessibleDocumentPageView",_
-        false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-      oText.insertControlCharacter(cursor,_
-        com.sun.star.text.ControlCharacter.LINE_BREAK, false)
-    next i
-    wait(1000)
-
-    xController = oDoc.getCurrentController()
-
-    'switch to PreviewMode
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:PrintPreview"
-    urlTransformer.parseStrict(url)
-    wait(500)
-    xDispatcher = xController.queryDispatch(url,"",0)
-    if (NOT isNull(xDispatcher)) then
-      xDispatcher.dispatch(url, DimArray())
-      wait(1000)
-      oWin = utils.at_getCurrentWindow(oDoc)
-      xRoot = utils.at_getAccessibleObject(oWin)
-      'utils.at_printAccessibleTree(xRoot)
-      oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL,"Page")
-      Out.Log("Implementation Name: "+oObj.getImplementationName())
-      prevButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Previous Page")
-      nextButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Next Page")
-    else
-      Out.Log("QueryDispatch FAILED. Cannot switch to Preview mode...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    prevButton.doAccessibleAction(0)
-    wait(500)
-    nextButton.doAccessibleAction(0)
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/script.xlb
deleted file mode 100644
index 2e709bf8c02f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleParagraphView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleParagraphView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/sw_SwAccessibleParagraphView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/sw_SwAccessibleParagraphView.xba
deleted file mode 100644
index 84855feb6eb3..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleParagraphView/sw_SwAccessibleParagraphView.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleParagraphView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oText As Object
-Global hasChangeableAttrs As Boolean
-Global multiSelection As Boolean
-Global accText As String
-Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleParagraphView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xRoot As Object, xDispatcher As Object
-    Dim xController As Object
-
-    oDoc = utils.createDocument("swriter",cObjectName)
-    oText = oDoc.getText()
-    oText.setString("Text for testing of the interface XAccessibleText")
-
-    xController = oDoc.getCurrentController()
-
-    Dim oWin As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                            com.sun.star.accessibility.AccessibleRole.PARAGRAPH)
-    hasChangeableAttrs = true
-    accText = oObj.getText()
-    multiSelection = true
-    readOnly = false
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  Dim old As String
-  old = oText.getString()
-  oText.setString("Just a line")
-  oText.setString(old)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/script.xlb
deleted file mode 100644
index e97f49aa442b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleTableCellView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleTableCellView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/sw_SwAccessibleTableCellView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/sw_SwAccessibleTableCellView.xba
deleted file mode 100644
index a5d82d7c6e60..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableCellView/sw_SwAccessibleTableCellView.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleTableCellView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleTableCellView
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object, oTable As Object
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(3, 5)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TABLE_CELL)
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    multiSelection = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/script.xlb
deleted file mode 100644
index 545aca01dfd7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleTableView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleTableView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/sw_SwAccessibleTableView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/sw_SwAccessibleTableView.xba
deleted file mode 100644
index 01ac488fbfc7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTableView/sw_SwAccessibleTableView.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleTableView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleTableView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oCursor As Object
-    oCursor = oDoc.Text.createTextCursor()
-
-    Dim oTable As Object
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(3, 5)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                com.sun.star.accessibility.AccessibleRole.TABLE)
-    multiSelection = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 100
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/script.xlb
deleted file mode 100644
index ecb50f762d30..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleTextEmbeddedObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleTextEmbeddedObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/sw_SwAccessibleTextEmbeddedObject.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/sw_SwAccessibleTextEmbeddedObject.xba
deleted file mode 100644
index fe0ed7beca97..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextEmbeddedObject/sw_SwAccessibleTextEmbeddedObject.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleTextEmbeddedObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleTextEmbeddedObject
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.loadTestDocument("SwXTextEmbeddedObject.sxw")
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-    oViewSettings.ZoomValue = 10
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                     com.sun.star.accessibility.AccessibleRole.EMBEDDED_OBJECT)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 10
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/script.xlb
deleted file mode 100644
index c671f5326134..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleTextFrameView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleTextFrameView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/sw_SwAccessibleTextFrameView.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/sw_SwAccessibleTextFrameView.xba
deleted file mode 100644
index bf92474bb7b8..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextFrameView/sw_SwAccessibleTextFrameView.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleTextFrameView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleTextFrameView
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oCursor As Object
-    oCursor = oDoc.Text.createTextCursor()
-
-    Dim oTextFrame As Object
-    oTextFrame = oDoc.createInstance("com.sun.star.text.TextFrame")
-    Dim sSize As Object
-    sSize = createUNOStruct("com.sun.star.awt.Size")
-    sSize.Height = 10000
-    sSize.Width = 10000
-    oTextFrame.Size = sSize
-    oTextFrame.SizeType = 1
-    oTextFrame.Name = cObjectName
-    oTextFrame.HoriOrient = 0
-    oTextFrame.VertOrient = 1
-
-    oDoc.Text.insertTextContent(oCursor, oTextFrame, false)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                          com.sun.star.accessibility.AccessibleRole.TEXT_FRAME)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 10
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/script.xlb b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/script.xlb
deleted file mode 100644
index 72a2af04a120..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwAccessibleTextGraphicObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwAccessibleTextGraphicObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/sw_SwAccessibleTextGraphicObject.xba b/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/sw_SwAccessibleTextGraphicObject.xba
deleted file mode 100644
index bbf7e306aea8..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwAccessibleTextGraphicObject/sw_SwAccessibleTextGraphicObject.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwAccessibleTextGraphicObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oViewSettings As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwAccessibleTextGraphicObject
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim oGraphObj As Object
-    oGraphObj = oDoc.createInstance("com.sun.star.text.GraphicObject")
-
-    Dim oText As Object
-    oText = oDoc.getText()
-
-    Dim oCursor As Object
-    oCursor = oText.createTextCursor()
-
-    oText.insertTextContent(oCursor, oGraphObj, true)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    oViewSettings = xController.getViewSettings()
-    oViewSettings.ZoomValue = 10
-
-    Dim oWin As Object
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                                             com.sun.star.accessibility.AccessibleRole.GRAPHIC)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-  oViewSettings.ZoomValue = 15
-  oViewSettings.ZoomValue = 10
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/script.xlb
deleted file mode 100644
index a4cb3b5fb28d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXAutoTextContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXAutoTextContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/sw_SwXAutoTextContainer.xba b/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/sw_SwXAutoTextContainer.xba
deleted file mode 100644
index cd73dac7da79..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextContainer/sw_SwXAutoTextContainer.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXAutoTextContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.text.XAutoTextContainer
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXAutoTextContainer
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService( "com.sun.star.text.AutoTextContainer" )
-    nGlobalLong = oObj.Count
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/script.xlb
deleted file mode 100644
index 93c51d563ab9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXAutoTextEntry" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXAutoTextEntry"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/sw_SwXAutoTextEntry.xba b/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/sw_SwXAutoTextEntry.xba
deleted file mode 100644
index decbf7e131bf..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextEntry/sw_SwXAutoTextEntry.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXAutoTextEntry" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.text.XText
-Global oCollection As Object
-Global oInstance As Object
-Global aAddons()
-
-
-Sub beforeInsertTextContent()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXAutoTextEntry
-'*************************************************************************
-    oDoc.Text.setString("")
-    oObj.applyTo(oDoc.Text.createTextCursor())
-End Sub
-
-Sub afterInsertTextContent()
-    oDoc.Text.setString("")
-    oObj.applyTo(oDoc.Text.createTextCursor())
-End Sub
-
-Sub beforeRemoveTextContent()
-    oDoc.Text.setString("")
-    oObj.applyTo(oDoc.Text.createTextCursor())
-End Sub
-
-Sub afterRemoveTextContent()
-    oDoc.Text.setString("")
-    oObj.applyTo(oDoc.Text.createTextCursor())
-End Sub
-
-Global oGroup As Object
-
-Sub CreateObj()
-On Error Goto ErrHndl
-    Dim oContainer As Object
-    Dim i As Integer
-    Dim oNames As Variant
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oContainer = createUNOService( "com.sun.star.text.AutoTextContainer" )
-    Out.Log("Looking for not empty elements")
-    i = 0
-    oGroup = oContainer.getByIndex(i)
-    while (oGroup.getCount &lt; 1)
-        i = i + 1
-        oGroup = oContainer.getByIndex(i)
-    wend
-
-    oNames = oGroup.getElementNames()
-
-    for i = 0 to ubound(oNames)
-        Out.Log("Element " + i + ": " + oNames(i))
-    next i
-
-    oObj = oGroup.getByIndex(0)
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-    oCollection = oDoc.getTextTables()
-
-    oObj.ApplyTo(oDoc.Text.createTextCursor)
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/script.xlb
deleted file mode 100644
index f774d8c7c062..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXAutoTextGroup" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXAutoTextGroup"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/sw_SwXAutoTextGroup.xba b/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/sw_SwXAutoTextGroup.xba
deleted file mode 100644
index 5cabc7055457..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXAutoTextGroup/sw_SwXAutoTextGroup.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXAutoTextGroup" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong as Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXAutoTextGroup
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim i As Integer
-    Dim oCursor As Object
-    Dim oCollection As Object
-    Dim aElementNames As Variant
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-    oCollection = createUNOService("com.sun.star.text.AutoTextContainer")
-
-    aElementNames() = oCollection.ElementNames
-    'cGlobalString = aElementNames(uBound(aElementNames())
-
-    for i = lBound(aElementNames()) to uBound(aElementNames())
-        oDoc.Text.insertString(oCursor, aElementNames(i), false )
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-        oCursor.gotoEnd(false)
-    next i
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-
-    nGlobalLong = 0
-    i = 0
-    'create the object to test here
-    while nGlobalLong = 0
-      oObj = oCollection.getByName(aElementNames(i))
-      nGlobalLong = oObj.Count
-      i = i + 1
-    wend
-    nGlobalLong = oObj.Count
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBodyText/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXBodyText/script.xlb
deleted file mode 100644
index efe9eac6f10f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBodyText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXBodyText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXBodyText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBodyText/sw_SwXBodyText.xba b/qadevOOo/tests/basic/mod/sw/SwXBodyText/sw_SwXBodyText.xba
deleted file mode 100644
index d0e548872322..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBodyText/sw_SwXBodyText.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXBodyText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.text.XText
-Global oCollection As Object
-Global oInstance As Object
-Global aAddons()
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXBodyText
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oObj = oDoc.Text
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-    oInstance.initialize(5, 5)
-
-    oCollection = oDoc.TextTables
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBookmark/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXBookmark/script.xlb
deleted file mode 100644
index e0293cfca595..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBookmark/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXBookmark" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXBookmark"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBookmark/sw_SwXBookmark.xba b/qadevOOo/tests/basic/mod/sw/SwXBookmark/sw_SwXBookmark.xba
deleted file mode 100644
index 596848ac8b15..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBookmark/sw_SwXBookmark.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXBookmark" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object ' it will be disposed
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXBookmark
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    ' create a textcursor
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' check if objectcreation succeed and write to log
-
-
-    ' write some strings to document
-    for i = 1 to 10
-        oCursor.gotoEnd(false)
-
-        ' Hilfskruecke wegen Bug im Trim oder insertString
-        cTemp = Trim(Str((i)) &amp; cText
-        oDoc.Text.insertString(oCursor, cTemp, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oCursor.gotoStart(false)
-    oCursor.gotoNextWord(false)
-
-    ' create a Bookmark and insert it
-    for i = 1 to 3
-
-        oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-        ' check if objectcreation succeed and write to log
-
-        ' set name property just for fun
-        oInstance.Name = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-        oCursor.gotoNextWord(false)
-
-    next i
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.Bookmark")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-	
-    ' create test object and initialize
-    oCollection = oDoc.Bookmarks
-    oObj = oCollection.getByIndex(0)
-    oComponentInstance = oCollection.getByIndex(1)
-    cGlobalString = oCollection.getByIndex(0).Name
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBookmarks/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXBookmarks/script.xlb
deleted file mode 100644
index 1a1a36bf69fd..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBookmarks/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXBookmarks" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXBookmarks"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXBookmarks/sw_SwXBookmarks.xba b/qadevOOo/tests/basic/mod/sw/SwXBookmarks/sw_SwXBookmarks.xba
deleted file mode 100644
index daee028206c7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXBookmarks/sw_SwXBookmarks.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXBookmarks" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXBookmarks
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-    nGlobalLong = 10
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    ' create a textcursor
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' check if objectcreation succeed
-
-    ' write some strings to document
-    for i = 1 to nGlobalLong
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor,Str(i) &amp; cText,false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    ' set Cursor to the second word
-    oCursor.gotoStart(false)
-    oCursor.gotoNextWord(false)
-
-    for i = 1 to nGlobalLong
-        oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-        ' check if objectcreation succeed and write to log
-
-
-        ' set name property
-        oInstance.Name = cObjectName &amp; i
-
-        oDoc.Text.insertTextContent(oCursor, oInstance, bOK)
-        cName = oInstance.Name
-
-        oCursor.gotoNextWord(false)
-
-    next i
-
-    oObj = oDoc.Bookmarks
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXCell/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXCell/script.xlb
deleted file mode 100644
index 794972ce49e5..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXCell/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXCell" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXCell"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXCell/sw_SwXCell.xba b/qadevOOo/tests/basic/mod/sw/SwXCell/sw_SwXCell.xba
deleted file mode 100644
index b1fa8486a06e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXCell/sw_SwXCell.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXCell" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oCollection As Object
-Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXCell
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oCursor = oDoc.Text.createTextCursor()
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(5,5)
-
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-    oCollection = oDoc.TextTables
-
-    oTable.getCellByName("A2").Value = nGlobalLong
-    oTable.getCellByName("B2").Value = nGlobalLong * 2
-    oObj = oTable.getCellByName("C2")
-
-    ' create some textcontent for insertion
-    oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-    oCollection = oDoc.Bookmarks
-
-    oObj.setFormula("=sum &lt;A2:B2&gt;")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXCellRange/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXCellRange/script.xlb
deleted file mode 100644
index 5324c38394d0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXCellRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXCellRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXCellRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXCellRange/sw_SwXCellRange.xba b/qadevOOo/tests/basic/mod/sw/SwXCellRange/sw_SwXCellRange.xba
deleted file mode 100644
index b3c5df256ade..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXCellRange/sw_SwXCellRange.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXCellRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for sheet.XCellRangeData
-Global newData As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXCellRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oTable As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(5,5)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-
-    oObj = oTable.getCellRangeByPosition(0,0,3,4)
-
-    'Required for XCellRangeData
-    newData = Array(_
-                Array(2.5, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 5.0),_
-                Array(2.5, 5.0, 2.5, 5.0),_
-                Array(2.5, 5.0, 2.5, 5.0),_
-                Array(4.0, 9.0, 2.5, 5.0))_
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/script.xlb
deleted file mode 100644
index 9863fa58f127..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXChapterNumbering" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXChapterNumbering"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/sw_SwXChapterNumbering.xba b/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/sw_SwXChapterNumbering.xba
deleted file mode 100644
index 43ee2717020f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXChapterNumbering/sw_SwXChapterNumbering.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXChapterNumbering" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXChapterNumbering
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    for i = 1 to 10
-        oDoc.Text.insertString(oCursor, cObjectName+i, false)
-        oDoc.Text.insertControlCharacter(oCursor,0,false)
-    next i
-
-    oObj = oDoc.ChapterNumberingRules
-    nGlobalLong = oObj.Count
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/script.xlb
deleted file mode 100644
index 1e65a73a9742..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXDocumentIndex" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXDocumentIndex"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/sw_SwXDocumentIndex.xba b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/sw_SwXDocumentIndex.xba
deleted file mode 100644
index c207f6e6f3a7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndex/sw_SwXDocumentIndex.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXDocumentIndex" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oCollection As Object
-Global oComponentInstance As Object ' it will be disposed
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXDocumentIndex
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim i As Integer
-    Dim n As Integer
-    Dim oCursor As Object
-    Dim oSearch As Object
-    Dim oFound As Object
-    Dim oIndexEntry As Object
-    Dim oFoundPos As Object
-    Dim oIndex As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-	' write some strings to document
-    for i = 1 to 10
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor, cObjectName, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    ' insert some IndexMakrs
-    oSearch = oDoc.createSearchDescriptor()
-    oSearch.SearchString = cObjectName
-    oFound = oDoc.findAll(oSearch)
-
-    for n = 0 to oFound.Count - 5
-        oFoundPos = oFound(n)
-        oIndexEntry = oDoc.createInstance("com.sun.star.text.DocumentIndexMark")
-        oDoc.text.insertTextContent(oFoundPos, oIndexEntry, true)
-    next n
-
-	'create an index
-    oIndex = oDoc.createInstance("com.sun.star.text.DocumentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oObj = oIndex
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.DocumentIndex")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-	
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oComponentInstance = oIndex
-
-    oCollection = oDoc.getDocumentIndexes()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/script.xlb
deleted file mode 100644
index 8e79e016f510..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXDocumentIndexMark" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXDocumentIndexMark"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/sw_SwXDocumentIndexMark.xba b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/sw_SwXDocumentIndexMark.xba
deleted file mode 100644
index 515c9b61b05d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexMark/sw_SwXDocumentIndexMark.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXDocumentIndexMark" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXDocumentIndexMark
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oIndex = oDoc.createInstance("com.sun.star.text.DocumentIndexMark")
-    oIndex.attach(oDoc.Text)
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oObj = oIndex
-    oIndex = oDoc.createInstance("com.sun.star.text.DocumentIndexMark")
-    oIndex.attach(oDoc.Text)
-
-    oComponentInstance = oIndex
-
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oIndex = oDoc.createInstance("com.sun.star.text.DocumentIndexMark")
-    oIndex.attach(oDoc.Text)
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.DocumentIndexMark")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-	
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/script.xlb
deleted file mode 100644
index d7187cc8f6ca..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXDocumentIndexes" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXDocumentIndexes"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/sw_SwXDocumentIndexes.xba b/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/sw_SwXDocumentIndexes.xba
deleted file mode 100644
index 7fb5286675b9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDocumentIndexes/sw_SwXDocumentIndexes.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXDocumentIndexes" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXDocumentIndexes
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    bOK = NOT isNull(oDoc)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-    oIndex = oDoc.createInstance("com.sun.star.text.ContentIndex")
-    oDoc.Text.insertTextContent(oCursor, oIndex, false)
-
-    oObj = oDoc.getDocumentIndexes()
-
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDrawPage/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXDrawPage/script.xlb
deleted file mode 100644
index 0f908a3b103b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDrawPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXDrawPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXDrawPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXDrawPage/sw_SwXDrawPage.xba b/qadevOOo/tests/basic/mod/sw/SwXDrawPage/sw_SwXDrawPage.xba
deleted file mode 100644
index cb69d58f6093..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXDrawPage/sw_SwXDrawPage.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXDrawPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
-Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.drawing.XShapeGrouper
-Global oGrouperCollection As Object 'groupable objects
-
-' Requiered for  com.sun.star.drawing.XShapes
-Global oXShapeInstance As Object 'to add/remove
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXDrawPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCollection As Object
-    Dim oInstance As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = oDoc.getDrawPage()
-
-    oCollection = createUNOService("com.sun.star.drawing.ShapeCollection")
-    oInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oObj.add(oInstance)
-    oCollection.add(oInstance)
-    oInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oObj.add(oInstance)
-    oCollection.add(oInstance)
-    oInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oObj.add(oInstance)
-    oInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-    oObj.add(oInstance)
-    oXShapeInstance = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-
-    oGrouperCollection = oCollection
-
-    cNameToSet = "ADrawPage"
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/script.xlb
deleted file mode 100644
index a831b798f246..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXEndnoteProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXEndnoteProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/sw_SwXEndnoteProperties.xba b/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/sw_SwXEndnoteProperties.xba
deleted file mode 100644
index 4fc9577723a9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXEndnoteProperties/sw_SwXEndnoteProperties.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXEndnoteProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXEndnoteProperties
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oNote = oDoc.createInstance("com.sun.star.text.Endnote")
-
-    oDoc.Text.insertTextContent(oCursor, oNote, false)
-
-    oObj = oDoc.getEndnoteSettings()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/script.xlb
deleted file mode 100644
index b93edc648c90..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFieldEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFieldEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/sw_SwXFieldEnumeration.xba b/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/sw_SwXFieldEnumeration.xba
deleted file mode 100644
index e0fa327a836d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFieldEnumeration/sw_SwXFieldEnumeration.xba
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFieldEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFieldEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim FieldMaster As Object
-    Dim TextField As Object
-    Dim the_Text As Object
-    Dim the_Cursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    FieldMaster = oDoc.createInstance( "com.sun.star.text.FieldMaster.Database" )
-    TextField = oDoc.createInstance( "com.sun.star.text.TextField.Database" )
-
-    FieldMaster.setPropertyValue("DataBaseName", "Bibliography")
-    FieldMaster.setPropertyValue("DataTableName", "biblio")
-    FieldMaster.setPropertyValue("DataColumnName", "Address")
-    the_Text = oDoc.getText()
-    the_Cursor = the_Text.createTextCursor()
-
-    TextField.attachTextFieldMaster(FieldMaster)
-    the_Text.insertTextContent(the_Cursor, TextField, false)
-
-    oObj = oDoc.getTextFields().createEnumeration()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/script.xlb
deleted file mode 100644
index 717a73f4ed49..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFieldMaster" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFieldMaster"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/sw_SwXFieldMaster.xba b/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/sw_SwXFieldMaster.xba
deleted file mode 100644
index 8c6f7dd17905..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFieldMaster/sw_SwXFieldMaster.xba
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFieldMaster" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFieldMaster
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnote/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFootnote/script.xlb
deleted file mode 100644
index 26fde0605a73..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnote/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFootnote" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFootnote"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnote/sw_SwXFootnote.xba b/qadevOOo/tests/basic/mod/sw/SwXFootnote/sw_SwXFootnote.xba
deleted file mode 100644
index 4bff96ac2b59..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnote/sw_SwXFootnote.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFootnote" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global oInstance as Object
-Global oCollection as Object
-Global oComponentInstance as Object
-Global cGlobalString as String
-Global nGlobalLong as Long
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFootnote
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim i As Integer
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    for i = 1 to 5
-        oInstance = oDoc.createInstance("com.sun.star.text.Footnote")
-        oInstance.Label = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    next i
-
-    oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-    oCollection = oDoc.getBookmarks()
-    oComponentInstance = oDoc.Footnotes(2)
-    cGlobalString = cObjectName
-    nGlobalLong = 2
-
-    oObj = oDoc.Footnotes(nGlobalLong-1)
-	
-	oXTextContent = oDoc.createInstance("com.sun.star.text.Footnote")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/script.xlb
deleted file mode 100644
index 3df9abbc74f6..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFootnoteProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFootnoteProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/sw_SwXFootnoteProperties.xba b/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/sw_SwXFootnoteProperties.xba
deleted file mode 100644
index d9e23b870ec0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnoteProperties/sw_SwXFootnoteProperties.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFootnoteProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFootnoteProperties
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oCursor = oDoc.Text.createTextCursor()
-    oInst = oDoc.createInstance("com.sun.star.text.Footnote")
-
-    oDoc.Text.insertTextContent(oCursor, oInst, false)
-
-    oObj = oDoc.getFootnoteSettings()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/script.xlb
deleted file mode 100644
index 070f117c0b0b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFootnoteText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFootnoteText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/sw_SwXFootnoteText.xba b/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/sw_SwXFootnoteText.xba
deleted file mode 100644
index 5a7642df2d3a..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnoteText/sw_SwXFootnoteText.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFootnoteText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oInstance As Object
-Global oCollection As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFootnoteText
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    nGlobalLong = 10
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-   	oCursor = oDoc.Text.createTextCursor()
-
-
-   	for i = 1 to nGlobalLong
-        oFootNote = oDoc.createInstance("com.sun.star.text.Footnote")
-        oFootNote.Label = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oFootNote, false)
-    next i
-
-    oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-    oCollection = oDoc.Bookmarks
-
-    oObj = oFootNote.getText()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnotes/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFootnotes/script.xlb
deleted file mode 100644
index 7e265118287e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnotes/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFootnotes" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFootnotes"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFootnotes/sw_SwXFootnotes.xba b/qadevOOo/tests/basic/mod/sw/SwXFootnotes/sw_SwXFootnotes.xba
deleted file mode 100644
index 18100dddb1a4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFootnotes/sw_SwXFootnotes.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFootnotes" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFootnotes
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oInstance As Object
-    Dim i As Integer
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    for i = 1 to 5
-        oInstance = oDoc.createInstance("com.sun.star.text.Footnote")
-        oInstance.Label = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    next i
-
-    oObj = oDoc.Footnotes
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFrames/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXFrames/script.xlb
deleted file mode 100644
index 3aed8ca84894..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFrames/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXFrames" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXFrames"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXFrames/sw_SwXFrames.xba b/qadevOOo/tests/basic/mod/sw/SwXFrames/sw_SwXFrames.xba
deleted file mode 100644
index 031cdf270816..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXFrames/sw_SwXFrames.xba
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXFrames" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XContainer
- Global oElementToInsert As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXFrames
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' create some frames on doc
-    for i= 1 to 3
-        oInstance = oDoc.createInstance("com.sun.star.text.TextFrame")
-        sSize = createUNOStruct("com.sun.star.awt.Size")
-        sSize.Height = 100
-        sSize.Width = 100
-        oInstance.Size = sSize
-        oInstance.SizeType = 1
-        oInstance.Name = cObjectName &amp; i
-        oInstance.HoriOrient = i
-        oInstance.VertOrient = i
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    next i
-
-
-
-    oObj = oDoc.TextFrames
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/script.xlb
deleted file mode 100644
index efc59272d689..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXHeadFootText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXHeadFootText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/sw_SwXHeadFootText.xba b/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/sw_SwXHeadFootText.xba
deleted file mode 100644
index 30e6852188cc..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXHeadFootText/sw_SwXHeadFootText.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXHeadFootText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oCollection As Object
-Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXHeadFootText
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oPagestyle = oDoc.StyleFamilies.getByName("PageStyles").getByName("Standard")
-    oPageStyle.HeaderIsOn = true
-
-    oObj = oPageStyle.HeaderText
-    oCursor = oObj.createTextCursor()
-
-    nGlobalLong = 3
-
-    ' insert some Tables to Header
-    for i = 1 to nGlobalLong
-        ' initialize appropirate textcontent for insertion
-        oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-        oInstance.initialize(1, 2)
-        oCursor.gotoEnd(false)
-        oObj.insertTextContent(oCursor, oInstance, false)
-    next i
-
-    ' create another table to insert via XText-module
-    oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-    oInstance.initialize(5, 5)
-
-    ' initialize corresponding collection for verifying
-    oCollection = oDoc.TextTables
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/script.xlb
deleted file mode 100644
index 833b05eb14d8..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXLineNumberingProperties" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXLineNumberingProperties"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/sw_SwXLineNumberingProperties.xba b/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/sw_SwXLineNumberingProperties.xba
deleted file mode 100644
index 33e20cc676b2..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXLineNumberingProperties/sw_SwXLineNumberingProperties.xba
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXLineNumberingProperties" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXLineNumberingProperties
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oText = oDoc.getText()
-    oCursor = oText.createTextCursor()
-
-    For i = 1 to 5
-        oText.insertString(oCursor,_
-            "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG", false)
-        oText.insertControlCharacter( oCursor,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false )
-    Next i
-
-    oObj = oDoc.getLineNumberingProperties()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXMailMerge/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXMailMerge/script.xlb
deleted file mode 100644
index 7889f2929f95..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXMailMerge/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXMailMerge" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="sw_SwXMailMerge"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXMailMerge/sw_SwXMailMerge.xba b/qadevOOo/tests/basic/mod/sw/SwXMailMerge/sw_SwXMailMerge.xba
deleted file mode 100644
index dffb0d341a5d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXMailMerge/sw_SwXMailMerge.xba
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXMailMerge" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' com.sun.star.task.XJob:
-Global vXJobArgs(0 to 3) as Variant
-
-' com.sun.star.text.MailMerge
-Global cMailMerge_DocumentURL as String
-
-Dim cDataSourceName  as String
-Dim cDataCommand as String
-Dim oXResultSet as Variant
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.sw.SwXMailMerge
-'*************************************************************************
-On Error Goto ErrHndl
-
-	Dim vXJobArg0(0 to 7) as new com.sun.star.beans.NamedValue
-	Dim vXJobArg1(0 to 6) as new com.sun.star.beans.NamedValue
-	Dim vXJobArg2(0 to 9) as new com.sun.star.beans.NamedValue
-	Dim vXJobArg3(0) as new com.sun.star.beans.NamedValue
-	Dim cTestDoc as String
-	Dim cOutputURL as String
-    Dim oXConnection as Variant
-    Dim myBookMarks as Variant
-	
-    oObj = createUnoService("com.sun.star.text.MailMerge")
-
-	cTestDoc = utils.Path2URL(cTestDocsDir + "/" + "MailMerge.sxw")
-    cMailMerge_DocumentURL = cTestDoc
-	cOutputURL = ConvertToURL(utils.getUserPath())
-    cDataSourceName  = "Bibliography"
-    cDataCommand = "biblio"
-    oXResultSet = getXResultSet()
-    oXConnection = oXResultSet.ActiveConnection
-    
-	' create arguments for XJob:
-    myBookMarks = getMyBookMarks()
-	
-    oObj.DataSourceName = cDataSourceName
-    oObj.Command = cDataCommand
-    oObj.CommandType = com.sun.star.sdb.CommandType.TABLE
-    oObj.OutputType = com.sun.star.text.MailMergeType.FILE
-    oObj.DocumentURL = cTestDoc
-    oObj.OutputURL = cOutputURL
-    oObj.FileNamePrefix = "Author"
-    oObj.FileNameFromColumn = TRUE
-    oObj.Selection = DimArray()
-    
-	' use a simple DataBase with simple Table
-	vXJobArg0(0).Name = "DataSourceName" : vXJobArg0(0).Value = cDataSourceName
-	vXJobArg0(1).Name = "Command" : vXJobArg0(1).Value = cDataCommand
-	vXJobArg0(2).Name = "CommandType" : vXJobArg0(2).Value = com.sun.star.sdb.CommandType.TABLE
-	vXJobArg0(3).Name = "OutputType" : vXJobArg0(3).Value = com.sun.star.text.MailMergeType.FILE
-	vXJobArg0(4).Name = "DocumentURL" : vXJobArg0(4).Value = cTestDoc
-	vXJobArg0(5).Name = "OutputURL" : vXJobArg0(5).Value = cOutputURL
-	vXJobArg0(6).Name = "FileNamePrefix" : vXJobArg0(6).Value = "Identifier"
-	vXJobArg0(7).Name = "FileNameFromColumn" : vXJobArg0(7).Value = true
-	
-	' use a simple DataBase with simple Table and write to printer
-	vXJobArg1(0).Name = "DataSourceName" : vXJobArg1(0).Value = cDataSourceName
-	vXJobArg1(1).Name = "Command" : vXJobArg1(1).Value = cDataCommand
-	vXJobArg1(2).Name = "CommandType" : vXJobArg1(2).Value = com.sun.star.sdb.CommandType.TABLE
-	vXJobArg1(3).Name = "OutputType" : vXJobArg1(3).Value = com.sun.star.text.MailMergeType.PRINTER
-	vXJobArg1(4).Name = "FileNamePrefix" : vXJobArg1(4).Value = "Author"
-	vXJobArg1(5).Name = "FileNameFromColumn" : vXJobArg1(5).Value = true
-	vXJobArg1(6).Name = "DocumentURL" : vXJobArg1(6).Value = cTestDoc
-	
-	' use a XConnection
-	vXJobArg2(0).Name = "ActiveConnection" : vXJobArg2(0).Value = oXConnection
-	vXJobArg2(1).Name = "DataSourceName" : vXJobArg2(1).Value = cDataSourceName
-	vXJobArg2(2).Name = "Command" : vXJobArg2(2).Value = cDataCommand
-	vXJobArg2(3).Name = "CommandType" : vXJobArg2(3).Value = com.sun.star.sdb.CommandType.TABLE
-	vXJobArg2(4).Name = "OutputType" : vXJobArg2(4).Value = com.sun.star.text.MailMergeType.FILE
-	vXJobArg2(5).Name = "ResultSet" : vXJobArg2(5).Value = oXResultSet
-	vXJobArg2(6).Name = "OutputURL" : vXJobArg2(6).Value = cOutputURL
-	vXJobArg2(7).Name = "FileNamePrefix" : vXJobArg2(7).Value = "Identifier"
-	vXJobArg2(8).Name = "FileNameFromColumn" : vXJobArg2(8).Value = true
-	vXJobArg2(9).Name = "Selection" : vXJobArg2(9).Value = myBookMarks()
-	
-	vXJobArgs(0) = vXJobArg0()
-	vXJobArgs(1) = vXJobArg1()
-	vXJobArgs(2) = vXJobArg2()
-	vXJobArgs(3) = DimArray()
-    
-	out.log("com.sun.star.text.MailMerge created.")
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub XMailMergeEvent()
-    oObj.execute(vXJobArgs(2))
-end sub
-
-Function getXResultSet() as Variant
-    Dim oRowSet as Object
-    oRowSet = createUnoService("com.sun.star.sdb.RowSet")
-    oRowSet.DataSourceName = cDataSourceName
-    oRowSet.Command = cDataCommand
-    oRowSet.CommandType = com.sun.star.sdb.CommandType.TABLE
-    oRowSet.execute()
-    wait(200)
-'    oRowSet.getFirst()
-    getXResultSet() = oRowSet 
-end Function
-
-Function getMyBookMarks() as Variant
-    Dim BookMarks(1) as Variant
-    oXResultSet.first()
-    BookMarks(0) = oXResultSet.getBookmark()
-    oXResultSet.next()
-    BookMarks(1) = oXResultSet.getBookmark()
-    getMyBookMarks() = BookMarks()
-end Function
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXModule/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXModule/script.xlb
deleted file mode 100644
index 0a065a01386a..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXModule/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXModule" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXModule"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXModule/sw_SwXModule.xba b/qadevOOo/tests/basic/mod/sw/SwXModule/sw_SwXModule.xba
deleted file mode 100644
index 11d08996a639..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXModule/sw_SwXModule.xba
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXModule" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXModule
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.text.GlobalSettings")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/script.xlb
deleted file mode 100644
index 047311ba12f1..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXNumberingRules" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXNumberingRules"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/sw_SwXNumberingRules.xba b/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/sw_SwXNumberingRules.xba
deleted file mode 100644
index 7ab97cba229d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXNumberingRules/sw_SwXNumberingRules.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXNumberingRules" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXNumberingRules
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oText As Object
-    Dim oCursor As Object
-    Dim oStyleFamilies As Object
-    Dim oNumStyles As Object
-    Dim bOK As Boolean
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-
-    oText = oDoc.getText()
-    oCursor = oText.createTextCursor()
-    for i = 0 to 5
-        oText.insertString(oCursor, "The quick brown fox jumps over the lazy Dog", false)
-        oText.insertControlCharacter(oCursor,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    Next i
-
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oNumStyles = oStyleFamilies.getByName("NumberingStyles")
-
-    oObj = oNumStyles.getByIndex(0).NumberingRules
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXParagraph/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXParagraph/script.xlb
deleted file mode 100644
index 0a85ca0129a4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXParagraph/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXParagraph" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXParagraph"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXParagraph/sw_SwXParagraph.xba b/qadevOOo/tests/basic/mod/sw/SwXParagraph/sw_SwXParagraph.xba
deleted file mode 100644
index 9ba860b23737..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXParagraph/sw_SwXParagraph.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXParagraph" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-  Global bXTextContentImpossible As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXParagraph
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim nWidth As Integer
-    Dim nHeight As Integer
-    Dim cText As String
-    Dim oCursor As Object
-    Dim i As Integer
-    Dim oInstance As Object
-    Dim oEnum As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    nWidth = 5000
-    nHeight = 4000
-    cText = ". Zeile : test of " &amp; cObjectName
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' write some strings to document
-    for i = 1 to 10
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor,Trim(Str(i)) &amp; cText,false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oCursor.gotoEnd(false)
-    oInstance = oDoc.createInstance("com.sun.star.text.TextFrame")
-    sSize = createUNOStruct("com.sun.star.awt.Size")
-    sSize.Height = nHeight
-    sSize.Width = nWidth
-    oInstance.Size = sSize
-    oInstance.SizeType = 1
-    oInstance.AnchorType = 0
-    oInstance.Name = cObjectName
-    oInstance.HoriOrient = 2
-    oInstance.VertOrient = 2
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-
-    oEnum = oDoc.Text.createEnumeration()
-    oObj = oEnum.nextElement()
-    oComponentInstance = oEnum.nextElement()
-	 
-	bXTextContentImpossible = TRUE
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/script.xlb
deleted file mode 100644
index 2e8a40a04a15..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXParagraphEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXParagraphEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/sw_SwXParagraphEnumeration.xba b/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/sw_SwXParagraphEnumeration.xba
deleted file mode 100644
index 4f9f4b4ae6d0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXParagraphEnumeration/sw_SwXParagraphEnumeration.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXParagraphEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXParagraphEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    nGlobalLong = 7
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' write some strings to document
-    for i = 1 to nGlobalLong
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor,Trim(Str(i)) &amp; cText,false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oObj = oDoc.Text.createEnumeration()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/script.xlb
deleted file mode 100644
index 863c2eb1bc8c..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXPrintSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXPrintSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/sw_SwXPrintSettings.xba b/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/sw_SwXPrintSettings.xba
deleted file mode 100644
index 8762350cb324..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPrintSettings/sw_SwXPrintSettings.xba
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXPrintSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXPrintSettings
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oInst As Variant
-    
-    bOK = true
-
-	oInst = createUnoService("com.sun.star.text.GlobalSettings")
-    oObj = oInst.getPrintSettings()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPropertySet/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXPropertySet/script.xlb
deleted file mode 100644
index 568f0fccb1d7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPropertySet/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXPropertySet" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXPropertySet"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPropertySet/sw_SwXPropertySet.xba b/qadevOOo/tests/basic/mod/sw/SwXPropertySet/sw_SwXPropertySet.xba
deleted file mode 100644
index d482db98cea9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPropertySet/sw_SwXPropertySet.xba
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXPropertySet" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXPropertySet
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/script.xlb
deleted file mode 100644
index d613c13e2ecf..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXPropertySetInfo" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXPropertySetInfo"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/sw_SwXPropertySetInfo.xba b/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/sw_SwXPropertySetInfo.xba
deleted file mode 100644
index 2621c918a002..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXPropertySetInfo/sw_SwXPropertySetInfo.xba
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXPropertySetInfo" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXPropertySetInfo
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = oDoc.getPropertySetInfo()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/script.xlb
deleted file mode 100644
index ad3eadd337b9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXReferenceMark" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXReferenceMark"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/sw_SwXReferenceMark.xba b/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/sw_SwXReferenceMark.xba
deleted file mode 100644
index 2a48e55f78f2..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXReferenceMark/sw_SwXReferenceMark.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXReferenceMark" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oCollection As Object
-Global oComponentInstance As Object ' it will be disposed
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXReferenceMark
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    ' create the textcursor and verify initialization
-    oCursor = oDoc.Text.createTextCursor()
-
-    nGlobalLong = 7
-
-    ' write some strings to document
-    for i = 1 to nGlobalLong
-        oCursor.gotoEnd(false)
-        ' helpvar cause of bug in trim or insertString
-        cTemp = Trim(Str((i)) &amp; cText
-        oDoc.Text.insertString(oCursor, cTemp, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oCursor.gotoStart(false)
-
-    for i = 1 to nGlobalLong
-        oObj = oDoc.createInstance("com.sun.star.text.ReferenceMark")
-        oObj.Name = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oObj, false)
-        oCursor.gotoNextParagraph(false)
-    next i
-
-    oCollection = oDoc.ReferenceMarks
-    oObj = oCollection.getByIndex(0)
-    oComponentInstance = oCollection.getByIndex(1)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.ReferenceMark")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/script.xlb
deleted file mode 100644
index 87e12bcbf371..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXReferenceMarks" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXReferenceMarks"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/sw_SwXReferenceMarks.xba b/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/sw_SwXReferenceMarks.xba
deleted file mode 100644
index 33fc407703e0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXReferenceMarks/sw_SwXReferenceMarks.xba
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXReferenceMarks" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXReferenceMarks
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    nGlobalLong = 5
-
-    ' write some strings to document
-    for i = 1 to nGlobalLong
-        oCursor.gotoEnd(false)
-        ' Hilfskruecke wegen Bug im Trim oder insertString
-        cTemp = Trim(Str((i)) &amp; cText
-        oDoc.Text.insertString(oCursor, cTemp, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oCursor.gotoStart(false)
-
-    for i = 1 to nGlobalLong
-        oInstance = oDoc.createInstance("com.sun.star.text.ReferenceMark")
-        oInstance.Name = cObjectName &amp; i
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-        oCursor.gotoNextParagraph(false)
-    next i
-
-
-    ' create the object to test here
-    oObj = oDoc.ReferenceMarks
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXShape/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXShape/script.xlb
deleted file mode 100644
index b95a641374d7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXShape/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXShape" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXShape"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXShape/sw_SwXShape.xba b/qadevOOo/tests/basic/mod/sw/SwXShape/sw_SwXShape.xba
deleted file mode 100644
index 09a09c71efe5..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXShape/sw_SwXShape.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXShape" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.drawing.XShapeDescriptor :
-  Global cShapeType As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXShape
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim n As Integer
-    Dim sSize as new com.sun.star.awt.Size
-    Dim sPoint as new com.sun.star.awt.Point
-    Dim oShape As Object, oDrawPage As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oDrawPage = oDoc.DrawPage
-
-    For n = 1 to 3
-        oShape = oDoc.createInstance("com.sun.star.drawing.RectangleShape")
-        sSize.Height = 5000
-        sSize.Width = 5000
-        oShape.Size = sSize
-        sPoint.X = 5000
-        sPoint.Y = n * 1000
-        oShape.Position = sPoint
-        oDrawPage.Add(oShape)
-    Next
-
-    oObj = oDrawPage.getByIndex(1)
-
-    oObj.AnchorType = com.sun.star.text.TextContentAnchorType.AT_PAGE
-    oComponentInstance = oDrawPage.getByIndex(0)
-
-    cShapeType = "com.sun.star.drawing.RectangleShape"
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyle/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXStyle/script.xlb
deleted file mode 100644
index 96da6a7f5e67..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyle/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXStyle" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXStyle"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyle/sw_SwXStyle.xba b/qadevOOo/tests/basic/mod/sw/SwXStyle/sw_SwXStyle.xba
deleted file mode 100644
index 53aa0ece1116..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyle/sw_SwXStyle.xba
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXStyle" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-' Requiered for  com.sun.star.style.XStyle
-Global oStandartStyle As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXStyle
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oStyleFamilies = oDoc.StyleFamilies
-    aElementNames() = oStyleFamilies.Elementnames
-
-    oDoc.Text.insertString(oCursor, "Elements of StyleFamlilies are:", false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-
-    for i = lBound(aElementNames()) to uBound(aElementNames())
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor, aElementNames(i), false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-
-    oObj = oStyleFamilies.getByIndex(0)
-
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oCursor.gotoEnd(false)
-
-    oDoc.Text.insertString(oCursor,"Elements of StyleFamlilie " &amp; aElementNames(0) &amp; "  are:", false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-
-    aElementNames() = oObj.Elementnames
-    for i = lBound(aElementNames()) to uBound(aElementNames())
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor, aElementNames(i), false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oNew = oDoc.createInstance("com.sun.star.style.CharacterStyle")
-    oStyleFamily = oStyleFamilies.getByIndex(0)'
-    oStyleFamily.insertByName("Dummy", oNew)
-
-    oObj = oStyleFamily.getByName("Dummy")
-
-    'Use the style...
-    oCursor.setPropertyValue("CharStyleName", "Dummy")
-
-    oStandartStyle = oStyleFamily.getByName(aElementNames(1))
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/script.xlb
deleted file mode 100644
index 59114cb7f7e6..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXStyleFamilies" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXStyleFamilies"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/sw_SwXStyleFamilies.xba b/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/sw_SwXStyleFamilies.xba
deleted file mode 100644
index 47710c6df682..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyleFamilies/sw_SwXStyleFamilies.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXStyleFamilies" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXStyleFamilies
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = oDoc.getStyleFamilies()
-    nGlobalLong = oObj.count
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/script.xlb
deleted file mode 100644
index bd646d605dbf..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXStyleFamily" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXStyleFamily"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/sw_SwXStyleFamily.xba b/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/sw_SwXStyleFamily.xba
deleted file mode 100644
index 8c8a79680f05..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXStyleFamily/sw_SwXStyleFamily.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXStyleFamily" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNameContainer
- Global oInstance As Variant 'instance to insert
-
-
-' Requiered for  com.sun.star.container.XNameReplace
- Global cNameToReplace As String 'name of instance to be replased
- Global oReplaceInstance As Variant 'instance, that will be inserted
-                                   'instead old one
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXStyleFamily
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oInstance = oDoc.createInstance("com.sun.star.style.CharacterStyle")
-
-    oReplaceInstance = oDoc.createInstance("com.sun.star.style.CharacterStyle")
-    
-
-    oObj = oDoc.getStyleFamilies.getByIndex(0)
-    oObj.insertByName(cObjectName, oDoc.createInstance("com.sun.star.style.CharacterStyle"))
-    cNameToReplace = cObjectName
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableCellText/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTableCellText/script.xlb
deleted file mode 100644
index f869097aaf87..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableCellText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTableCellText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTableCellText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableCellText/sw_SwXTableCellText.xba b/qadevOOo/tests/basic/mod/sw/SwXTableCellText/sw_SwXTableCellText.xba
deleted file mode 100644
index 0410af6be6c9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableCellText/sw_SwXTableCellText.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTableCellText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for com.sun.star.text.XText
- Global oCollection As Object
- Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTableCellText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oTable As Object
-    Dim oCell As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(3, 5)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-
-    oCell = oTable.getCellByPosition(1, 1)
-
-    oObj = oCell.Text
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextField.DateTime")
-    oCollection = oDoc.TextFields
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableColumns/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTableColumns/script.xlb
deleted file mode 100644
index aa249610df79..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableColumns/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTableColumns" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTableColumns"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableColumns/sw_SwXTableColumns.xba b/qadevOOo/tests/basic/mod/sw/SwXTableColumns/sw_SwXTableColumns.xba
deleted file mode 100644
index d5d505a44130..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableColumns/sw_SwXTableColumns.xba
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTableColumns" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XTableColumns
- Global oTable As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTableColumns
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim nRows As Long, nCols As Long
-
-    bOK = true
-
-    nRows = 5
-    nCols = 5
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Out.Log("Create a table")
-    oCursor = oDoc.Text.createTextCursor()
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(nRows, nCols)
-
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oTable.Columns.DBG_SupportedInterfaces, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oTable.Columns.DBG_Methods, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oTable.Columns.DBG_Properties, false)
-
-    oObj = oTable.Columns
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableRows/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTableRows/script.xlb
deleted file mode 100644
index e53c2e4756a4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableRows/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTableRows" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTableRows"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTableRows/sw_SwXTableRows.xba b/qadevOOo/tests/basic/mod/sw/SwXTableRows/sw_SwXTableRows.xba
deleted file mode 100644
index 8028ea126953..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTableRows/sw_SwXTableRows.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTableRows" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XTableRows
- Global oTable As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTableRows
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim nRows As Long, nCols As Long
-
-    bOK = true
-    nRows = 5
-    nCols = 5
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    ' create a table first
-    oCursor = oDoc.Text.createTextCursor()
-
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(nRows, nCols)
-    oCursor.gotoEnd(false)
-
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-
-    oDoc.Text.insertString(oCursor, oTable.Rows.DBG_SupportedInterfaces, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oTable.Rows.DBG_Methods, false)
-    oCursor.gotoEnd(false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oTable.Rows.DBG_Properties, false)
-
-    ' create test object
-    oObj = oTable.Rows
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextColumns/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextColumns/script.xlb
deleted file mode 100644
index 37058dec0fe6..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextColumns/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextColumns" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextColumns"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextColumns/sw_SwXTextColumns.xba b/qadevOOo/tests/basic/mod/sw/SwXTextColumns/sw_SwXTextColumns.xba
deleted file mode 100644
index 999f5fa52850..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextColumns/sw_SwXTextColumns.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextColumns" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.text.XTextColumns
-Global oPageStyle As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextColumns
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    oPageStyle = oDoc.StyleFamilies.getByName("PageStyles").getByName("Standard")
-    oObj = oPageStyle.TextColumns
-
-    oDoc.Text.insertString(oCursor, oObj.DBG_SupportedInterfaces, false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oObj.DBG_Properties, false)
-    oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    oDoc.Text.insertString(oCursor, oObj.DBG_Methods, false)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextCursor/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextCursor/script.xlb
deleted file mode 100644
index aecd1d225eed..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextCursor/sw_SwXTextCursor.xba b/qadevOOo/tests/basic/mod/sw/SwXTextCursor/sw_SwXTextCursor.xba
deleted file mode 100644
index e5a8014ef5ea..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextCursor/sw_SwXTextCursor.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XParagraphCursor
- Global oText As Object
-' Requiered for  com.sun.star.text.XTextCursor
- Global oCursor As Object 'One more cursor
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextCursor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oText = oDoc.Text
-    oObj = oText.createTextCursor()
-    oCursor = oText.createTextCursor()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/script.xlb
deleted file mode 100644
index c4021b17323a..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextDefaults" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextDefaults"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/sw_SwXTextDefaults.xba b/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/sw_SwXTextDefaults.xba
deleted file mode 100644
index ded6377d7e27..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextDefaults/sw_SwXTextDefaults.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextDefaults" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextDefaults
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    ' create a textcursor
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' write some strings to document
-    for i = 1 to 10
-        oCursor.gotoEnd(false)
-
-        cTemp = Trim(Str((i)) &amp; cText
-        oDoc.Text.insertString(oCursor, cTemp, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oCursor.gotoStart(false)
-    oCursor.gotoNextWord(false)
-
-    oObj = oDoc.createInstance("com.sun.star.text.Defaults")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextDocument/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextDocument/script.xlb
deleted file mode 100644
index e2a798dfd3d6..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextDocument/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextDocument" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextDocument"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextDocument/sw_SwXTextDocument.xba b/qadevOOo/tests/basic/mod/sw/SwXTextDocument/sw_SwXTextDocument.xba
deleted file mode 100644
index 2a903e5bdfd2..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextDocument/sw_SwXTextDocument.xba
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextDocument" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.util.XSearchable:
-' Required for com.sun.star.util.XReplaceable:
-Global cStringToSearch As String ' should appears more than once
-Global nSearchedEntriesAmount As Integer
-
-' Required for com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-' Required for com.sun.star.frame.XModel:
-Global oXModelController As Object
-Global oXModelSel As Object
-Global oXModelToSel As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextDocument
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oControllerDoc As Object
-    Dim oFrame As Object
-    Dim oCursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oControllerDoc = utils.createDocument("swriter", cObjectName + "1")
-    oComponentInstance = utils.createDocument("swriter", cObjectName + "2")
-
-    oObj = oDoc
-
-    oObj.Text.String = "This string comes from SwXTextDocument, and contains three 'co' entries. This 'Co' shouldn't be found!"
-    cStringToSearch = "co"
-    nSearchedEntriesAmount = 3
-
-    oFrame = oDoc.createInstance("com.sun.star.text.TextFrame")
-    oCursor = oDoc.Text.createTextCursor()
-    oDoc.Text.InsertTextContent(oCursor, oFrame, false)
-
-    oXModelToSel = oFrame
-    oXModelController = oControllerDoc.getCurrentController()
-    oXModelSel = oDoc.getCurrentController()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNULL(oComponentInstance) then oComponentInstance.dispose()
-
-    ' To successfully dispose oControllerDoc re-open it first.
-    Dim oControllerDoc As Object
-    oControllerDoc = utils.createDocument("swriter", cObjectName + "1")
-    oControllerDoc.dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/script.xlb
deleted file mode 100644
index e17f0e1cf940..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextEmbeddedObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextEmbeddedObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/sw_SwXTextEmbeddedObject.xba b/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/sw_SwXTextEmbeddedObject.xba
deleted file mode 100644
index d51f3cb3b8e8..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObject/sw_SwXTextEmbeddedObject.xba
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextEmbeddedObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-Global oComponentInstance As Object ' it will be disposed
-
-Global bXTextContentImpossible As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextEmbeddedObject
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oEmbededObjs As Variant
-
-    oDoc = utils.loadTestDocument("SwXTextEmbeddedObject.sxw")
-    oEmbededObjs = oDoc.getEmbeddedObjects
-    oObj = oEmbededObjs(0)
-    oComponentInstance = oEmbededObjs(1)
-	
-	bXTextContentImpossible = True
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/script.xlb
deleted file mode 100644
index 39b944518e4b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextEmbeddedObjects" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextEmbeddedObjects"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/sw_SwXTextEmbeddedObjects.xba b/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/sw_SwXTextEmbeddedObjects.xba
deleted file mode 100644
index ca4a60b7105b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextEmbeddedObjects/sw_SwXTextEmbeddedObjects.xba
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextEmbeddedObjects" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextEmbeddedObjects
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.loadTestDocument("SwXTextEmbeddedObject.sdw")
-    oObj = oDoc.getEmbeddedObjects
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextField/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextField/script.xlb
deleted file mode 100644
index b6e2a90b9e1f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextField/sw_SwXTextField.xba b/qadevOOo/tests/basic/mod/sw/SwXTextField/sw_SwXTextField.xba
deleted file mode 100644
index bd6348d41c64..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextField/sw_SwXTextField.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.lang.XComponent
-Global oComponentInstance As Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oFieldMaster As Object
-    Dim oFieldMaster2 As Object
-    Dim oFieldMaster3 As Object
-    Dim oCursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oFieldMaster = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-    oFieldMaster2 = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-    oFieldMaster3 = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-    oObj = oDoc.createInstance("com.sun.star.text.TextField.Database")
-    oComponentInstance = oDoc.createInstance("com.sun.star.text.TextField.Database")
-
-    oFieldMaster.setPropertyValue("DataBaseName","Address Book File")
-    oFieldMaster.setPropertyValue("DataTableName","address")
-    oFieldMaster.setPropertyValue("DataColumnName","FIRSTNAME")
-
-    oFieldMaster2.setPropertyValue("DataBaseName","Address Book File")
-    oFieldMaster2.setPropertyValue("DataTableName","address")
-    oFieldMaster2.setPropertyValue("DataColumnName","FIRSTNAME")
-
-    oFieldMaster3.setPropertyValue("DataBaseName","Address Book File")
-    oFieldMaster3.setPropertyValue("DataTableName","address")
-    oFieldMaster3.setPropertyValue("DataColumnName","FIRSTNAME")
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oObj.attachTextFieldMaster(oFieldMaster)
-    oDoc.Text.insertTextContent(oCursor, oObj, false)
-    oComponentInstance.attachTextFieldMaster(oFieldMaster2)
-    oDoc.Text.insertTextContent(oCursor, oComponentInstance, false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextField.Database")
-	oXTextContent.attachTextFieldMaster(oFieldMaster3)
-	oXTextContentRange = oDoc.Text.createTextCursor()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/script.xlb
deleted file mode 100644
index 798b78fec579..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextFieldMasters" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextFieldMasters"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/sw_SwXTextFieldMasters.xba b/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/sw_SwXTextFieldMasters.xba
deleted file mode 100644
index bafab9031175..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFieldMasters/sw_SwXTextFieldMasters.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextFieldMasters" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextFieldMasters
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-
-    oFieldMaster = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-    oDBF = oDoc.createInstance("com.sun.star.text.TextField.Database")
-
-    oFieldMaster.setPropertyValue("DataBaseName","Address Book File")
-    oFieldMaster.setPropertyValue("DataTableName","address")
-    oFieldMaster.setPropertyValue("DataColumnName","FIRSTNAME")
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oDBF.attachTextFieldMaster(oFieldMaster)
-    oDoc.Text.insertTextContent(oCursor, oDBF, false)
-
-
-    oObj = oDoc.getTextFieldMasters()
-    nGlobalLong = uBound(oObj.getElementNames) + 1
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/script.xlb
deleted file mode 100644
index a8419edf98ab..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextFieldTypes" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextFieldTypes"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/sw_SwXTextFieldTypes.xba b/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/sw_SwXTextFieldTypes.xba
deleted file mode 100644
index 6c00c183e93d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFieldTypes/sw_SwXTextFieldTypes.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextFieldTypes" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextFieldTypes
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oFieldMaster As Object
-    Dim oDBF As Object
-    Dim oCursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oFieldMaster = oDoc.createInstance("com.sun.star.text.FieldMaster.Database")
-    oDBF = oDoc.createInstance("com.sun.star.text.TextField.Database")
-
-    oFieldMaster.setPropertyValue("DataBaseName","Address Book File")
-    oFieldMaster.setPropertyValue("DataTableName","address")
-    oFieldMaster.setPropertyValue("DataColumnName","FIRSTNAME")
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oDBF.attachTextFieldMaster(oFieldMaster)
-    oDoc.Text.insertTextContent(oCursor, oDBF, false)
-
-    oObj = oDoc.getTextFields()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFrame/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextFrame/script.xlb
deleted file mode 100644
index f538f6e0b64e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFrame/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextFrame" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextFrame"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFrame/sw_SwXTextFrame.xba b/qadevOOo/tests/basic/mod/sw/SwXTextFrame/sw_SwXTextFrame.xba
deleted file mode 100644
index cac50858b95f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFrame/sw_SwXTextFrame.xba
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextFrame" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-Global oCollection As Object
-Global oComponentInstance As Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextFrame
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim nHeight As Integer
-    Dim nWidth As Integer
-    Dim i As Integer
-    Dim oCursor As Object
-    Dim sSize As Object
-    Dim aFrame As Object
-    Dim oBookmark As Object
-
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    nHeight = 10000
-    nWidth = 10000
-    nGlobalLong = 2
-
-    for i = 1 to nGlobalLong
-        ' create some frames on doc
-        oObj = oDoc.createInstance("com.sun.star.text.TextFrame")
-        sSize = createUNOStruct("com.sun.star.awt.Size")
-        sSize.Height = nHeight
-        sSize.Width = nWidth
-        oObj.Size = sSize
-        oObj.SizeType = 1
-        oObj.Name = cObjectName + i
-        oObj.HoriOrient = i
-        oObj.VertOrient = 1
-
-        ' AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, 3 = frame/paragraph 4= at char
-        oObj.AnchorType = 2
-        oDoc.Text.insertTextContent(oCursor, oObj, false)
-        If i = 1 Then
-          oComponentInstance = oObj
-        End If
-    next i
-
-    ' the tested frame must be inside another frame to check the property AnchorType
-    ' (the value AT_FRAME can be set only in this case)
-    aFrame = oDoc.createInstance("com.sun.star.text.TextFrame")
-    oCursor = oObj.Text.createTextCursor()
-    oObj.Text.insertTextContent(oCursor, aFrame, false)
-    oObj = aFrame 
-
-    oCollection = oDoc.TextFrames
-
-    oObj.String = "-Text"
-
-    oCursor = oObj.createTextCursor()
-    oObj.insertString(oCursor, "SwXTextFrame", false)
-
-    oBookmark = oDoc.createInstance("com.sun.star.text.Bookmark")
-    oCursor.gotoEnd(false)
-    oObj.insertTextContent(oCursor, oBookmark, false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextFrame")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/script.xlb
deleted file mode 100644
index 17160aa39ffc..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextFrameText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextFrameText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/sw_SwXTextFrameText.xba b/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/sw_SwXTextFrameText.xba
deleted file mode 100644
index 85b80a35bb0b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextFrameText/sw_SwXTextFrameText.xba
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextFrameText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oCollection As Object
-Global oInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextFrameText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim nHeight As Integer
-    Dim nWidth As Integer
-    Dim oCursor As Object
-    Dim sSize As Object
-
-    nHeight = 4000
-    nWidth = 15000
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    oObj = oDoc.createInstance("com.sun.star.text.TextFrame")
-    sSize = createUNOStruct("com.sun.star.awt.Size")
-    sSize.Height = nHeight
-    sSize.Width = nWidth
-    oObj.Size = sSize
-    oObj.SizeType = 1
-    oObj.Name = cObjectName
-    oObj.HoriOrient = 1
-    oObj.VertOrient = 1
-
-    ' AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, 3 = frame/paragraph 4= at char
-    oObj.AnchorType = 2
-    oDoc.Text.insertTextContent(oCursor, oObj, false)
-
-    oInstance = oDoc.createInstance("com.sun.star.text.Bookmark")
-    oCollection = oDoc.Bookmarks
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/script.xlb
deleted file mode 100644
index d58584f7f521..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextGraphicObject" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextGraphicObject"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/sw_SwXTextGraphicObject.xba b/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/sw_SwXTextGraphicObject.xba
deleted file mode 100644
index 80bc7514fa63..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObject/sw_SwXTextGraphicObject.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextGraphicObject" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.lang.XComponent
-Global oComponentInstance As Object
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextGraphicObject
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oGrphObj As Object
-    Dim aFrame As Object
-    Dim sSize As new com.sun.star.awt.Size
-    
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oGrphObj = oDoc.createInstance("com.sun.star.text.GraphicObject")
-    aFrame = oDoc.createInstance("com.sun.star.text.TextFrame")
-    sSize.Height = 8000
-    sSize.Width = 8000
-    aFrame.Size = sSize
-
-    oDoc.Text.insertTextContent(oDoc.Text.createTextCursor, aFrame, false)
-    aFrame.Text.insertTextContent(aFrame.Text.createTextCursor, oGrphObj, false)
-
-    oGrphObj.setPropertyValue("GraphicURL", Path2URL(cTestDocsDir + "space-metal.jpg"))
-    oGrphObj.setPropertyValue("HoriOrientPosition", 5500)
-    oGrphObj.setPropertyValue("VertOrientPosition", 4200)
-    oGrphObj.setPropertyValue("Width", 4400)
-    oGrphObj.setPropertyValue("Height", 4000)
-
-    oComponentInstance = oDoc.createInstance("com.sun.star.text.GraphicObject")
-    oDoc.Text.insertTextContent(oDoc.Text.createTextCursor, oComponentInstance, false)
-
-    oObj = oGrphObj
-	
-	oXTextContent = oDoc.createInstance("com.sun.star.text.GraphicObject")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-	
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/script.xlb
deleted file mode 100644
index 39f788929114..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextGraphicObjects" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextGraphicObjects"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/sw_SwXTextGraphicObjects.xba b/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/sw_SwXTextGraphicObjects.xba
deleted file mode 100644
index 11ace85e0b12..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextGraphicObjects/sw_SwXTextGraphicObjects.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextGraphicObjects" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextGraphicObjects
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oGrphObj As Object
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oGrphObj = oDoc.createInstance("com.sun.star.text.GraphicObject")
-    oDoc.Text.insertTextContent(oDoc.Text.createTextCursor, oGrphObj, false)
-    oGrphObj.setPropertyValue("GraphicURL", Path2URL(cTestDocsDir &amp; "space-metal.jpg"))
-    oGrphObj.setPropertyValue("HoriOrientPosition", 5500)
-    oGrphObj.setPropertyValue("VertOrientPosition", 4200)
-    oGrphObj.setPropertyValue("Width", 4400)
-    oGrphObj.setPropertyValue("Height", 4000)
-
-    oObj = oDoc.getGraphicObjects()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextPortion/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextPortion/script.xlb
deleted file mode 100644
index 793298c77d64..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextPortion/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextPortion" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextPortion"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextPortion/sw_SwXTextPortion.xba b/qadevOOo/tests/basic/mod/sw/SwXTextPortion/sw_SwXTextPortion.xba
deleted file mode 100644
index fc9afdc91ed7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextPortion/sw_SwXTextPortion.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextPortion" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextPortion
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oEnum As Object
-    Dim oPortionEnum As Object
-    Dim i As Integer
-    Dim j As Integer
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    ' write some strings to document
-    for j = 1 to 3
-        for i = 1 to 3
-            oCursor.gotoEnd(false)
-            oDoc.Text.insertString(oCursor, "Paragraph " &amp; j &amp; "; Line " &amp; i, false)
-            oDoc.Text.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.LINE_BREAK, false)
-        next i
-        oDoc.Text.insertControlCharacter(oCursor, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false)
-    next j
-
-    oEnum = oDoc.Text.createEnumeration()
-    oPortionEnum = oEnum.nextElement().createEnumeration()
-    oObj = oPortionEnum.nextElement()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/script.xlb
deleted file mode 100644
index 591c408f617a..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextPortionEnumeration" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextPortionEnumeration"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/sw_SwXTextPortionEnumeration.xba b/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/sw_SwXTextPortionEnumeration.xba
deleted file mode 100644
index b13b741d6c80..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextPortionEnumeration/sw_SwXTextPortionEnumeration.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextPortionEnumeration" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextPortionEnumeration
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oText = oDoc.Text
-    oCursor = oText.createTextCursor()
-    for i = 1 to 10
-        oText.insertString(oCursor, "Paragraph: " + i, false)
-        oText.insertControlCharacter(oCursor, LINE_BREAK, false)
-        oText.insertString(oCursor, "Line of paragraph: " + i, false)
-        oText.insertControlCharacter(oCursor, PARAGRAPH_BREAK, false)
-    next i
-
-    oObj = oText.createEnumeration().nextElement().createEnumeration()
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextRange/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextRange/script.xlb
deleted file mode 100644
index 923ed071a980..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextRange/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextRange" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextRange"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextRange/sw_SwXTextRange.xba b/qadevOOo/tests/basic/mod/sw/SwXTextRange/sw_SwXTextRange.xba
deleted file mode 100644
index 35eda7bcd453..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextRange/sw_SwXTextRange.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextRange" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextRange
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-    oObj = oCursor.Start
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextRanges/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextRanges/script.xlb
deleted file mode 100644
index 5e9403560fd0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextRanges/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextRanges" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextRanges"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextRanges/sw_SwXTextRanges.xba b/qadevOOo/tests/basic/mod/sw/SwXTextRanges/sw_SwXTextRanges.xba
deleted file mode 100644
index 44b6b334240b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextRanges/sw_SwXTextRanges.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextRanges" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextRanges
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim cText As String
-    Dim oCursor As Object
-    Dim i As Integer
-    Dim oSearch As Object
-    Dim oResult As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    cText = ". Zeile : Test aus " + cObjectName
-    oCursor = oDoc.Text.createTextCursor()
-
-    nGlobalLong = 10
-
-    ' write some strings to document
-    for i = 1 to nGlobalLong
-        oCursor.gotoEnd(false)
-        oDoc.Text.insertString(oCursor, Trim(Str(i)) &amp; cText, false)
-        oDoc.Text.insertControlCharacter(oCursor, 0, false)
-    next i
-
-    oSearch = oDoc.createSearchDescriptor()
-    oSearch.searchString = cObjectName
-    oResult = oDoc.findAll(oSearch)
-
-    oObj = oResult
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSearch/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextSearch/script.xlb
deleted file mode 100644
index 894b946c4865..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSearch/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextSearch" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextSearch"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSearch/sw_SwXTextSearch.xba b/qadevOOo/tests/basic/mod/sw/SwXTextSearch/sw_SwXTextSearch.xba
deleted file mode 100644
index 0dd2e80519b1..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSearch/sw_SwXTextSearch.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextSearch" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextSearch
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oObj = oDoc.createSearchDescriptor()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSection/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextSection/script.xlb
deleted file mode 100644
index 6c89c97005a1..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSection/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextSection" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextSection"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSection/sw_SwXTextSection.xba b/qadevOOo/tests/basic/mod/sw/SwXTextSection/sw_SwXTextSection.xba
deleted file mode 100644
index 1fc5c970e042..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSection/sw_SwXTextSection.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextSection" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextSection
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oInstance As Object, oCursor As Object, oSectionText As Object
-    
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextSection")
-    oInstance.Name = cObjectName + "1"
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    oComponentInstance = oInstance
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextSection")
-    oInstance.Name = cObjectName + "2"
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    oCursor = oDoc.Text.createTextCursorByRange(oInstance.Anchor)
-    oDoc.Text.insertString(oCursor, "TextSection 2", false)
-    oCursor.gotoPreviousWord(false)
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextSection")
-    oInstance.Name = cObjectName + "3"
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    oCursor = oDoc.Text.createTextCursorByRange(oInstance.Anchor)
-    oDoc.Text.insertString(oCursor, "TextSection 3", false)
-    oCursor.gotoPreviousWord(false)
-
-    oObj = oInstance
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextSection")
-    oInstance.Name = cObjectName + "4"
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    oCursor = oDoc.Text.createTextCursorByRange(oInstance.Anchor)
-    oDoc.Text.insertString(oCursor, "TextSection 4", false)
-
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextSection")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSections/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextSections/script.xlb
deleted file mode 100644
index 4dcd74399532..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSections/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextSections" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextSections"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextSections/sw_SwXTextSections.xba b/qadevOOo/tests/basic/mod/sw/SwXTextSections/sw_SwXTextSections.xba
deleted file mode 100644
index f02653aba248..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextSections/sw_SwXTextSections.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextSections" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global nGlobalLong As Long
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextSections
-'*************************************************************************
-On Error Goto ErrHndl
-
-
-    Dim bOK As Boolean
-    bOK = true
-    ' --- create a document if needed
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    nGlobalLong = 4
-
-    for i = 1 to nGlobalLong
-        oInstance = oDoc.createInstance("com.sun.star.text.TextSection")
-
-        oInstance.Name = cObjectName &amp; i
-        ' insert Textsection
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    next i
-
-    oObj = oDoc.TextSections
-
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTable/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextTable/script.xlb
deleted file mode 100644
index 1418e6c0577a..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTable/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextTable" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextTable"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTable/sw_SwXTextTable.xba b/qadevOOo/tests/basic/mod/sw/SwXTextTable/sw_SwXTextTable.xba
deleted file mode 100644
index 71310fadb216..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTable/sw_SwXTextTable.xba
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextTable" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.lang.XComponent
- Global oComponentInstance As Object ' it will be disposed
-
-' Requiered for  com.sun.star.chart.XChartData
- Global oCellToChange As Object
-
-' Requiered for  com.sun.star.container.XNamed
- Global cNameToSet As String ' "fixed" if name is fixed
-
-' Requiered for  com.sun.star.chart.XChartDataArray
-' Requiered for  com.sun.star.text.XTextTable
- Global nTableW As Integer
- Global nTableH As Integer
-
-'Required for sheet.XCellRangeData
-Global newData As Variant
-
-Global oXTextContent as Object
-Global oXTextContentRange as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextTable
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim i As Integer
-    Dim oInstance As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    nTableH = 5
-    nTableW = 7
-
-    for i = 1 to 2
-        oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-        oInstance.initialize(nTableH, nTableW)
-        oInstance.Name = "Table" + i
-        ' insert created Table
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-        if (i = 1) then oComponentInstance = oInstance
-    next i
-
-    oObj = oInstance
-    oCellToChange = oObj.getCellByPosition(3, 4)
-    cNameToSet = "NewTableName"
-
-    'Required for XCellRangeData
-    newData() = Array(_
-                Array(2.5, 5.0, 2.5, 5.0, 3.0, 2.0, 1.0),_
-                Array(4.0, 9.0, 2.5, 5.0, 4.0, 1.0, 2.0),_
-                Array(2.5, 5.0, 2.5, 5.0, 3.0, 2.0, 1.0),_
-                Array(2.5, 5.0, 2.5, 5.0, 7.0, 7.0, 8.0),_
-                Array(4.0, 9.0, 2.5, 5.0, 4.0, 3.0, 2.0))
-				
-	oXTextContent = oDoc.createInstance("com.sun.star.text.TextTable")
-	oXTextContentRange = oDoc.Text.createTextCursor()
-				
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function modifyDescriptor(descr As Variant) As Variant
-On Error Goto ErrHndl
-    Dim i As Integer, oCell As Object
-
-    for i = 0 to nTableW - 1
-        oCell = oObj.getCellByPosition(i, 0)
-        oCell.String = "" + (nTableW - i)
-    next i
-
-    for i = 0 to ubound(descr)
-        if descr(i).Name = "SortAscending" then descr(i).Value = true
-        if descr(i).Name = "SortColumns" then descr(i).Value = true
-    next i
-
-    modifyDescriptor() = descr
-Exit Function
-ErrHndl:
-    Out.Log("Exception in SwXTextTable.modifyDescriptor() :")
-    Test.Exception()
-end Function
-
-Function checkSort() As Boolean
-On Error Goto ErrHndl
-    Dim i As Integer, oCell As Object
-    Dim bOK As Boolean
-
-    bOK = true
-    for i = 0 to nTableW - 1
-        oCell = oObj.getCellByPosition(i, 0)
-        bOK = bOK AND oCell.String = "" + (i + 1)
-    next i
-
-    checkSort() = bOK
-Exit Function
-ErrHndl:
-    Out.Log("Exception in SwXTextTable.checkSort() :")
-    Test.Exception()
-end Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/script.xlb
deleted file mode 100644
index dc9e3530f926..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextTableCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextTableCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/sw_SwXTextTableCursor.xba b/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/sw_SwXTextTableCursor.xba
deleted file mode 100644
index eaf73876b835..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTableCursor/sw_SwXTextTableCursor.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextTableCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextTableCursor
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oTable = oDoc.createInstance("com.sun.star.text.TextTable")
-    oTable.initialize(5, 5)
-    oDoc.Text.insertTextContent(oCursor, oTable, false)
-
-    oObj = oTable.createCursorByCellName("A1")
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/script.xlb
deleted file mode 100644
index 01011c67f255..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextTableRow" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextTableRow"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/sw_SwXTextTableRow.xba b/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/sw_SwXTextTableRow.xba
deleted file mode 100644
index e11495a7495f..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTableRow/sw_SwXTextTableRow.xba
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextTableRow" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextTableRow
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCursor As Object
-    Dim oInstance As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oCursor = oDoc.Text.createTextCursor()
-
-    oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-    oInstance.initialize(5, 5)
-    oInstance.Name = "SwXTextTableRow"
-
-    oDoc.Text.insertTextContent(oCursor, oInstance, false)
-    oObj = oInstance.Rows.getByIndex(0)
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTables/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextTables/script.xlb
deleted file mode 100644
index 1b9a3b2459a4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTables/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextTables" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextTables"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextTables/sw_SwXTextTables.xba b/qadevOOo/tests/basic/mod/sw/SwXTextTables/sw_SwXTextTables.xba
deleted file mode 100644
index 991fdc5b43e4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextTables/sw_SwXTextTables.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextTables" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextTables
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim nRows As Long
-    Dim nCols As Long
-    Dim oCursor As Object
-    Dim i As Integer
-    Dim oInstance As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    nRows = 5
-    nCols = 5
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    for i = 1 to 3
-        oInstance = oDoc.createInstance("com.sun.star.text.TextTable")
-
-        oInstance.initialize(nRows, nCols)
-        nRows = nRows + 1
-        nCols = nCols + 1
-
-        oDoc.Text.insertTextContent(oCursor, oInstance, false)
-        oInstance.Name = "SwXTextTables" &amp; i
-    next i
-
-    oObj = oDoc.TextTables
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextView/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextView/script.xlb
deleted file mode 100644
index 0ced71e88a70..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextView/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextView" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextView"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextView/sw_SwXTextView.xba b/qadevOOo/tests/basic/mod/sw/SwXTextView/sw_SwXTextView.xba
deleted file mode 100644
index d87ff9a535e0..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextView/sw_SwXTextView.xba
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextView" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for XControlAccess
- Global oControlModel As Object
-
-' Requiered for  com.sun.star.view.XSelectionSupplier
- Global SelectableObj1 As Object
- Global SelectableObj2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextView
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCursor = oDoc.Text.createTextCursor()
-
-    oCursor.gotoStart(false)
-
-    oObj = oDoc.CurrentController
-
-    oDoc.Text.String = "This is a string for " &amp; cObjectName
-
-    SelectableObj1 = oDoc.Text.CreateTextCursor()
-    SelectableObj1.goRight(5, true)
-
-    SelectableObj2 = oDoc.Text.CreateTextCursor()
-    SelectableObj2.goRight(8, false)
-    SelectableObj2.goRight(10, true)
-
-
-    addControl(oCursor, 2000, 4000, cObjectName)
-    oControlModel = oDoc.Drawpage.Forms(0).getByName(cObjectName)
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub addControl( oCursor as Object, nPointX as Integer, nPointY as Integer, sName as String )
-
-    Dim oDrawPage As Object
-    Dim oForm, oForms As Object
-    Dim oControl, oControlShape As Object
-    Dim aSz As Variant
-    Dim oText As Object
-
-    oDrawPage = oDoc.DrawPage
-    oControlShape = oDoc.createInstance( "com.sun.star.drawing.ControlShape" )
-    oControl = oDoc.createInstance( "com.sun.star.form.component.CommandButton" )
-    oForm = oDoc.createInstance( "com.sun.star.form.component.Form" )
-    oforms = oDrawPage.Forms
-
-    if oForms.count = 0 then
-        oForms.InsertByIndex( 0, oForm )
-    end if
-
-    aSz = oControlShape.Size
-    aSz.Width = 2900
-    aSz.Height = 1200
-    oControlShape.Size = aSz
-    oControlShape.Control = oControl
-
-    oControlShape.TextRange = oCursor.Start
-    apoint = ocontrolshape.position
-    apoint.x = nPointX
-    aPoint.y = nPointY
-    ocontrolshape.position = aPoint
-    oDrawPage.add( oControlShape )
-    if sName &lt;&gt; "" then
-        oControl.Name = sName
-    end if
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/script.xlb
deleted file mode 100644
index a4c056732da2..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXTextViewCursor" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXTextViewCursor"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/sw_SwXTextViewCursor.xba b/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/sw_SwXTextViewCursor.xba
deleted file mode 100644
index 31e1ead40574..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXTextViewCursor/sw_SwXTextViewCursor.xba
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXTextViewCursor" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Requiered for  com.sun.star.text.XParagraphCursor
-Global oText As Object
-
-' Requiered for  com.sun.star.text.XTextCursor
-Global oCursor As Object 'One more cursor
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXTextViewCursor
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oController As Object
-
-    oDoc = utils.loadTestDocument("XPageCursor.sdw")
-    oController = oDoc.getCurrentController()
-    oObj = oController.getViewCursor()
-    oCursor = oController.getViewCursor()
-    oText = oDoc.Text
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXViewSettings/script.xlb b/qadevOOo/tests/basic/mod/sw/SwXViewSettings/script.xlb
deleted file mode 100644
index 9077adcd6e7e..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXViewSettings/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_SwXViewSettings" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_SwXViewSettings"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/SwXViewSettings/sw_SwXViewSettings.xba b/qadevOOo/tests/basic/mod/sw/SwXViewSettings/sw_SwXViewSettings.xba
deleted file mode 100644
index 85837b39e2e9..000000000000
--- a/qadevOOo/tests/basic/mod/sw/SwXViewSettings/sw_SwXViewSettings.xba
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_SwXViewSettings" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.SwXViewSettings
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oController = oDoc.getCurrentController
-    oObj = oController.getViewSettings
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLContentExporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLContentExporter/script.xlb
deleted file mode 100644
index 8bd9067903eb..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLContentExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLContentExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLContentExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLContentExporter/sw_XMLContentExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLContentExporter/sw_XMLContentExporter.xba
deleted file mode 100644
index 45d95fbb5146..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLContentExporter/sw_XMLContentExporter.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLContentExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-  
-' Required for  com.sun.star.container.XNamed:
-Global cNameToSet As String  
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLContentExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3, Tag4 As Variant
-    Dim expString As String
-    Dim oText As Object
-    Dim oCursor As Object
-    
-    printXML = true
-    expString = "XMLContentExporter"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-content")
-    Tag2 = Array("office:body")
-    Tag3 = Array("office:script")
-    Tag4 = Array("text:p")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag1), _
-                Array("CharsEnclosed", Tag4, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Writer.XMLContentExporter", initArgs())
-
-    oText = oDoc.getText()
-    oCursor = oText.createTextCursor()
-    oText.insertString(oCursor, expString, false)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "swriter: StarOffice XML (text)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-    cNameToSet = "fixed"
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLContentImporter/script.xlb
deleted file mode 100644
index 4fa50c70ecf3..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLContentImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLContentImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba
deleted file mode 100644
index fe477d7238d4..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLContentImporter/sw_XMLContentImporter.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLContentImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sText As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLContentImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Writer.XMLContentImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sText = "XMLContentImporter test."
-    vXMLData = Array( _
-            Array("start", "office:document-content", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text"), _
-            Array("start", "office:body"), _
-            Array("start", "text:p"), _
-            Array("chars", sText), _
-            Array("end", "text:p"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document-content"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim content As String
-    out.log("checking of import...")
-    content = oDoc.getText().getString()
-    res = (sText = content)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLExporter/script.xlb
deleted file mode 100644
index 697892881dbe..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba
deleted file mode 100644
index 9f0c3788f0a7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLExporter/sw_XMLExporter.xba
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5, Tag6, Tag7 As Variant
-    Dim expString As String
-    Dim oText As Object
-    Dim oCursor As Object
-    
-    printXML = true
-    expString = "XMLExporter"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("office:settings")
-    Tag4 = Array("office:script")
-    Tag5 = Array("office:styles")
-    Tag6 = Array("office:body")
-    Tag7 = Array("text:p")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag1), _
-                Array("TagEnclosed", Tag4, Tag1), _
-                Array("TagEnclosed", Tag5, Tag1), _
-                Array("TagEnclosed", Tag6, Tag1), _
-                Array("CharsEnclosed", Tag7, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Writer.XMLExporter", initArgs())
-
-    oText = oDoc.getText()
-    oCursor = oText.createTextCursor()
-    oText.insertString(oCursor, expString, false)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "swriter: StarOffice XML (text)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLImporter/script.xlb
deleted file mode 100644
index 34a3f4ed435d..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLImporter/sw_XMLImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLImporter/sw_XMLImporter.xba
deleted file mode 100644
index 04626fea34b7..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLImporter/sw_XMLImporter.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sText As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Writer.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sText = "XMLImporter test."
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "office:class", "CDATA", "text", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text"), _
-            Array("start", "office:body"), _
-            Array("start", "text:p"), _
-            Array("chars", sText), _
-            Array("end", "text:p"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim content As String
-    out.log("checking of import...")
-    content = oDoc.getText().getString()
-    res = (sText = content)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/script.xlb
deleted file mode 100644
index f53697434793..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLMetaExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLMetaExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/sw_XMLMetaExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/sw_XMLMetaExporter.xba
deleted file mode 100644
index fa9a25de78dc..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLMetaExporter/sw_XMLMetaExporter.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLMetaExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLMetaExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim expString As String
-    Dim oDocInfo As Object
-    
-    printXML = true
-    expString = "NewTitleOfTextDocument"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-meta")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Writer.XMLMetaExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "swriter: StarOffice XML (text)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/script.xlb
deleted file mode 100644
index 2059e3faabaa..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLMetaImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLMetaImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/sw_XMLMetaImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/sw_XMLMetaImporter.xba
deleted file mode 100644
index 784c0d809180..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLMetaImporter/sw_XMLMetaImporter.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLMetaImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sTitle As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLMetaImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Writer.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sTitle = "XMLMetaImporter test"
-    vXMLData = Array( _
-            Array("start", "office:document-meta" , _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:dc", "CDATA", "http://purl.org/dc/elements/1.1/"), _
-            Array("start", "office:meta"), _
-            Array("start", "dc:title"), _
-            Array("chars", sTitle),  _
-            Array("end", "dc:title"), _
-            Array("end", "office:meta"), _
-            Array("end", "office:document-meta"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oDocInfo As Object
-    Dim title As String
-    out.log("checking of import...")
-    oDocInfo = oDoc.getDocumentInfo()
-    title = oDocInfo.getPropertyValue("Title")
-    res = (title = sTitle)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/script.xlb
deleted file mode 100644
index 57e50a9dbc8b..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLSettingsExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLSettingsExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/sw_XMLSettingsExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/sw_XMLSettingsExporter.xba
deleted file mode 100644
index 0a014967bab1..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLSettingsExporter/sw_XMLSettingsExporter.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLSettingsExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLSettingsExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim zoomValue As Long
-    Dim oController As Object
-    Dim oViewSettings As Object
-    
-    printXML = true
-    zoomValue = 50
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-settings")
-    Tag2 = Array("office:settings")
-    Tag3 = Array("config:config-item", "config:name", "ZoomFactor")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("CharsEnclosed", Tag3, ""+zoomValue) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Writer.XMLSettingsExporter", initArgs())
-
-    oController = oDoc.getCurrentController()
-    oViewSettings = oController.getViewSettings()
-    oViewSettings.setPropertyValue("ZoomValue", zoomValue)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "swriter: StarOffice XML (text)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/script.xlb
deleted file mode 100644
index ad0336242426..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLSettingsImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLSettingsImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/sw_XMLSettingsImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/sw_XMLSettingsImporter.xba
deleted file mode 100644
index e1400be9e074..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLSettingsImporter/sw_XMLSettingsImporter.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLSettingsImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sZoom As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLSettingsImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Writer.XMLSettingsImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sZoom = "50"
-    vXMLData = Array( _
-            Array("start", "office:document-settings", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:config", "CDATA", "http://openoffice.org/2001/config", _
-                "xmlns:xlink", "CDATA", "http://www.w3.org/1999/xlink"), _
-            Array("start", "office:settings"), _
-            Array("start", "config:config-item-set", _
-                "config:name", "CDATA", "view-settings"), _
-            Array("start", "config:config-item-map-indexed", _
-                "config:name", "CDATA", "Views"), _
-            Array("start", "config:config-item-map-entry"), _
-            Array("start", "config:config-item", _
-                "config:name", "CDATA", "ZoomFactor", _
-                "config:type", "CDATA", "short"), _
-            Array("chars", sZoom), _
-            Array("end", "config:config-item"), _
-            Array("start", "config:config-item", _
-                "config:name", "CDATA", "ZoomType", _
-                "config:type", "CDATA", "short"), _
-            Array("chars", "0"), _
-            Array("end", "config:config-item"), _
-            Array("end", "config:config-item-map-entry"), _
-            Array("end", "config:config-item-map-indexed"), _
-            Array("end", "config:config-item-set"), _
-            Array("end", "office:settings"), _
-            Array("end", "office:document-settings"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oController, oViewSettings As Object
-    Dim zoom As String
-    out.log("checking of import...")
-    oController = oDoc.getCurrentController()
-    oViewSettings = oController.getViewSettings()    
-    zoom = oViewSettings.getPropertyValue("ZoomValue")
-    out.log("ZoomValue: " + zoom)
-    res = (zoom = sZoom)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/script.xlb
deleted file mode 100644
index c23fb12e8b86..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLStylesExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLStylesExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/sw_XMLStylesExporter.xba b/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/sw_XMLStylesExporter.xba
deleted file mode 100644
index fd44f50117cc..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLStylesExporter/sw_XMLStylesExporter.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLStylesExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs() As Variant
-
-' Required for  com.sun.star.document.XFilter:
-  Global oFilterDescriptor As Variant
-
-' Required for  com.sun.star.document.XExporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLStylesExporter
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-    Dim Tag1, Tag2 As Variant
-    Dim expString As String
-    Dim oFootnoteSettings As Object
-    
-    printXML = true
-    expString = "New Property"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-styles")
-    Tag2 = Array("text:footnotes-configuration", "style:num-prefix", expString)
-    filter = Array(Array("TagExists", Tag1, Tag2))
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Writer.XMLStylesExporter", initArgs())
-
-    oFootnoteSettings = oDoc.getFootnoteSettings()
-    oFootnoteSettings.setPropertyValue("Prefix", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "swriter: StarOffice XML (text)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/script.xlb b/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/script.xlb
deleted file mode 100644
index 586bd5fcdd77..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sw_XMLStylesImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sw_XMLStylesImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/sw_XMLStylesImporter.xba b/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/sw_XMLStylesImporter.xba
deleted file mode 100644
index 050b85faea26..000000000000
--- a/qadevOOo/tests/basic/mod/sw/XMLStylesImporter/sw_XMLStylesImporter.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sw_XMLStylesImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sPrefix As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sw.XMLStylesImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Writer.XMLStylesImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sPrefix = "Test prefix"
-    vXMLData = Array( _
-            Array("start", "office:document-styles", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:style", "CDATA", "http://openoffice.org/2000/style", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text"), _
-            Array("start", "office:styles"), _
-            Array("start", "text:footnotes-configuration", _
-                "style:num-prefix", "CDATA", sPrefix), _
-            Array("end", "text:footnotes-configuration"), _
-            Array("end", "office:styles"), _
-            Array("end", "office:document-styles"))        
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oSettings As Object
-    Dim prefix As String
-    out.log("checking of import...")
-    oSettings = oDoc.getFootnoteSettings()
-    prefix = oSettings.getPropertyValue("Prefix")
-    res = (prefix = sPrefix)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/script.xlb b/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/script.xlb
deleted file mode 100644
index 908a2a4acf68..000000000000
--- a/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="sysdtrans_SystemClipboard" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="sysdtrans_SystemClipboard"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/sysdtrans_SystemClipboard.xba b/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/sysdtrans_SystemClipboard.xba
deleted file mode 100644
index 7b708b134eb1..000000000000
--- a/qadevOOo/tests/basic/mod/sysdtrans/SystemClipboard/sysdtrans_SystemClipboard.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="sysdtrans_SystemClipboard" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-'*************************************************************************
-'Currently the service basichelper.Transferable
-'isnt work (no XTransferable methods could be found)
-
-'*************************************************************************
-
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.datatransfer.clipboard.XClipboard
-Global oOwner As Object
-Global trans1 As Object
-Global trans2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' sysdtrans.SystemClipboard
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oObj = createUNOService("com.sun.star.datatransfer.clipboard.SystemClipboard")
-
-    oComponentInstance = createUNOService("com.sun.star.datatransfer.clipboard.SystemClipboard")
-
-    trans1 = createUNOService("basichelper.Transferable")
-    Out.Log(trans1.dbg_supportedInterfaces())
-    Out.Log(trans1.dbg_methods())
-
-    trans1.initialize(Array("XClipboard test 1"))
-    Out.Log("Supports: " + hasUnoInterfaces(trans1, "com.sun.star.datatransfer.XTransferable"))
-    Out.Log("Supports: " + hasUnoInterfaces(trans1, "com.sun.star.container.XNamed"))
-    Out.Log("Supports: " + hasUnoInterfaces(trans1, "com.sun.star.container.XContainer"))
-    Out.Log(trans1.getName())
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/script.xlb b/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/script.xlb
deleted file mode 100644
index ef33f66ed822..000000000000
--- a/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="syssh_SystemShellExecute" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="syssh_SystemShellExecute"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/syssh_SystemShellExecute.xba b/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/syssh_SystemShellExecute.xba
deleted file mode 100644
index 93fbedd64679..000000000000
--- a/qadevOOo/tests/basic/mod/syssh/SystemShellExecute/syssh_SystemShellExecute.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="syssh_SystemShellExecute" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' syssh.SystemShellExecute
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.system.SystemShellExecute")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/tcv/TypeConverter/script.xlb b/qadevOOo/tests/basic/mod/tcv/TypeConverter/script.xlb
deleted file mode 100644
index 8ea47fcff46c..000000000000
--- a/qadevOOo/tests/basic/mod/tcv/TypeConverter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="tcv_TypeConverter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="tcv_TypeConverter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/tcv/TypeConverter/tcv_TypeConverter.xba b/qadevOOo/tests/basic/mod/tcv/TypeConverter/tcv_TypeConverter.xba
deleted file mode 100644
index a49811e83e21..000000000000
--- a/qadevOOo/tests/basic/mod/tcv/TypeConverter/tcv_TypeConverter.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="tcv_TypeConverter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' tcv.TypeConverter
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.script.Converter")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/script.xlb b/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/script.xlb
deleted file mode 100644
index 6a13aa8c5148..000000000000
--- a/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="tdmgr_TypeDescriptionManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="tdmgr_TypeDescriptionManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/tdmgr_TypeDescriptionManager.xba b/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/tdmgr_TypeDescriptionManager.xba
deleted file mode 100644
index e1c8ffde05f3..000000000000
--- a/qadevOOo/tests/basic/mod/tdmgr/TypeDescriptionManager/tdmgr_TypeDescriptionManager.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="tdmgr_TypeDescriptionManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' tdmgr.TypeDescriptionManager
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = CreateUnoService("com.sun.star.reflection.TypeDescriptionManager")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/script.xlb b/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/script.xlb
deleted file mode 100644
index b787bc81f815..000000000000
--- a/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="text_DefaultNumberingProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="text_DefaultNumberingProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/text_DefaultNumberingProvider.xba b/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/text_DefaultNumberingProvider.xba
deleted file mode 100644
index cc3e542dc3ba..000000000000
--- a/qadevOOo/tests/basic/mod/text/DefaultNumberingProvider/text_DefaultNumberingProvider.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="text_DefaultNumberingProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' text.DefaultNumberingProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.text.DefaultNumberingProvider")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/script.xlb
deleted file mode 100644
index a6b222a89e98..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/toolkit_AccessibleButton.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/toolkit_AccessibleButton.xba
deleted file mode 100644
index cdf6cca0bc2d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleButton/toolkit_AccessibleButton.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    thRunner.initialize(Array("OpenToolkitDialog","slot:5302",oDoc))
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"OK")
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    accText = oObj.getText()
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(oObj) then
-        oObj.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/script.xlb
deleted file mode 100644
index 431bfc1a2fad..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleCheckBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleCheckBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/toolkit_AccessibleCheckBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/toolkit_AccessibleCheckBox.xba
deleted file mode 100644
index 29cd48ec0f33..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleCheckBox/toolkit_AccessibleCheckBox.xba
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleCheckBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleCheckBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oMSF As Object, oWin As Object
-    Dim thRunner As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    thRunner.initialize(Array("OpenToolkitDialog",".uno:InsertTable",oDoc))
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.CHECK_BOX)
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    accText = oObj.getText()
-    readOnly = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/script.xlb
deleted file mode 100644
index 0204ce2c78ba..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/toolkit_AccessibleComboBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/toolkit_AccessibleComboBox.xba
deleted file mode 100644
index 9c4f8cdd33b7..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleComboBox/toolkit_AccessibleComboBox.xba
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim accEdit As Object, oWin As Object
-    Dim xRoot As Object, oMSF As Object
-    Dim tk As Object, thRunner As Object
-    Dim tabControl As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oMSF = getProcessServiceManager()
-    thRunner = oMSF.createInstance("basichelper.ThreadRunner")
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    thRunner.initialize(Array("OpenToolkitDialog",".uno:FontDialog",oDoc))
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    'utils.at_printAccessibleTree(xRoot)
-    tabControl = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB_LIST)
-    tabControl.selectAccessibleChild(0)
-    wait(500)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PANEL,"","AccessibleComboBox")
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Cancel")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/script.xlb
deleted file mode 100644
index bd6ae8ee8aa3..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleDropDownComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleDropDownComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/toolkit_AccessibleDropDownComboBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/toolkit_AccessibleDropDownComboBox.xba
deleted file mode 100644
index 123cc23d9224..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownComboBox/toolkit_AccessibleDropDownComboBox.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleDropDownComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleDropDownComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.COMBO_BOX,"","AccessibleDropDownComboBox")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.doAccessibleAction(0)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/script.xlb
deleted file mode 100644
index 561d9b7bb7e0..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleDropDownListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleDropDownListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/toolkit_AccessibleDropDownListBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/toolkit_AccessibleDropDownListBox.xba
deleted file mode 100644
index 997d57d51aac..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleDropDownListBox/toolkit_AccessibleDropDownListBox.xba
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleDropDownListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleDropDownListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    wait(1000)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.COMBO_BOX,"","AccessibleDropDownListBox")
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.doAccessibleAction(0)
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/script.xlb
deleted file mode 100644
index ee0304901c65..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleEdit" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleEdit"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/toolkit_AccessibleEdit.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/toolkit_AccessibleEdit.xba
deleted file mode 100644
index 6755e723b91a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleEdit/toolkit_AccessibleEdit.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleEdit" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-Global hasChangeableAttrs As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleEdit
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TEXT)
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-
-        ' because of auto adding http:// in edit field when focus lost
-        oObj.setText("AccessibleEdit")
-        wait(500)
-        accButton.grabFocus()
-        wait(500)
-        oObj.grabFocus()
-        accText = oObj.getText()
-
-        hasChangeableAttrs = false
-        readOnly = false
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open Hyperlink dialog...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/script.xlb
deleted file mode 100644
index d996e6c999d9..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleFixedText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleFixedText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/toolkit_AccessibleFixedText.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/toolkit_AccessibleFixedText.xba
deleted file mode 100644
index 045837681cdb..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleFixedText/toolkit_AccessibleFixedText.xba
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleFixedText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-
-Global oText as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleFixedText
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-
-'    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim xText as object
-    oText = createUnoService("com.sun.star.awt.UnoControlFixedText")
-    xText = createUnoService("com.sun.star.awt.UnoControlFixedTextModel")
-    oText.setModel(xText)
-    oText.setText("FixedText")
-    
-    Dim oDialog as object
-    Dim xDialog as Object
-    oDialog = createUnoService("com.sun.star.awt.UnoControlDialog")
-    xDialog = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-    oDialog.setModel(xDialog)
-    oDialog.addControl("Text", oText)
-    oDialog.setVisible(true)
-    oDialog.setPosSize(0, 0, 200, 100, com.sun.star.awt.PosSize.SIZE)
-    
-    
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    oWin = tk.getActiveTopWindow
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.LABEL)
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-    accText = oObj.getText()
-    readOnly = true
- 
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    oText.setEnable(false)
-    oText.setEnable(true)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleList/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleList/script.xlb
deleted file mode 100644
index 090d45a86e1a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleList/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleList" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="toolkit_AccessibleList"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleList/toolkit_AccessibleList.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleList/toolkit_AccessibleList.xba
deleted file mode 100644
index 6cce6f2cb361..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleList/toolkit_AccessibleList.xba
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleList" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::accessibility::XAccessibleEventBroadcaster#optional"
- ' needs the following Global variables:
-
-' "com::sun::star::accessibility::XAccessibleSelection"
- ' needs the following Global variables:
-Global multiSelection As Boolean
-
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.toolkit.AccessibleList
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then
-        multiSelection = false
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow
-        xRoot = utils.at_getAccessibleObject(oWin)
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, _
-                  com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        
-        'Selecting 'New Document' tab
-        Dim oTree as Object
-        oTree = utils.at_getAccessibleObjectForRole(xRoot, _
-                                 com.sun.star.accessibility.AccessibleRole.TREE)
-
-        oTree.selectAccessibleChild(3)
-        wait(500)
-
-        Out.log("# Getting the ListBox")
-        Dim oParent as Object
-        oParent = utils.at_getAccessibleObjectForRole(xRoot, _
-                            com.sun.star.accessibility.AccessibleRole.PANEL,"",_
-                                  "com.sun.star.comp.toolkit.AccessibleListBox")
-
-        Out.log("# Getting the first child")
-
-        oObj = oParent.getAccessibleChild(0)
-        
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open Hyperlink dialog...")
-    End If
-
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-end Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/script.xlb
deleted file mode 100644
index 1d1b4d88e164..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/toolkit_AccessibleListBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/toolkit_AccessibleListBox.xba
deleted file mode 100644
index 8b1ebd72bfd4..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleListBox/toolkit_AccessibleListBox.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps(), xAccSel As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow
-        xRoot = utils.at_getAccessibleObject(oWin)
-        xAccSel = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TREE)
-        xAccSel.selectAccessibleChild(3)
-        wait(3000)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.LIST,"File type","com.sun.star.comp.toolkit.AccessibleListBox")
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open Hyperlink dialog...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(2000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/script.xlb
deleted file mode 100644
index aa75b46d13b7..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleListItem" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleListItem"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/toolkit_AccessibleListItem.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/toolkit_AccessibleListItem.xba
deleted file mode 100644
index dd23f1c85529..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleListItem/toolkit_AccessibleListItem.xba
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleListItem" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global accList As Object
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleListItem
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-    Dim xAccSel As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow
-        xRoot = utils.at_getAccessibleObject(oWin)
-        xAccSel = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TREE)
-        xAccSel.selectAccessibleChild(3)
-        wait(2000)
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.LIST_ITEM)
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        accText = oObj.getText()
-        readOnly = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open Hyperlink dialog...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    'accList.selectAccessibleChild(1)
-    'wait(500)
-    'accList.selectAccessibleChild(0)
-    'wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/script.xlb
deleted file mode 100644
index cd5e59dd69db..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleMenu" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleMenu"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/toolkit_AccessibleMenu.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/toolkit_AccessibleMenu.xba
deleted file mode 100644
index 928878d5338c..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenu/toolkit_AccessibleMenu.xba
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleMenu" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global menu As Object
-Global multiSelection As Boolean
-Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleMenu
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU,"Edit")
-    menu = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU,"File")
-    Out.Log("Implementation name: "+oObj.getImplementationName())
-
-    multiSelection = false
-    accText = oObj.getText()
-    readOnly = true
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    menu.doAccessibleAction(0)
-    wait(500)
-    oObj.doAccessibleAction(0)
-    wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/script.xlb
deleted file mode 100644
index 9c40aa2566f8..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleMenuBar" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleMenuBar"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/toolkit_AccessibleMenuBar.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/toolkit_AccessibleMenuBar.xba
deleted file mode 100644
index 2a01f35872dd..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuBar/toolkit_AccessibleMenuBar.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleMenuBar" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleMenuBar
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU_BAR)
-    multiSelection = false
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/script.xlb
deleted file mode 100644
index ccb73385ce33..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleMenuItem" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleMenuItem"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/toolkit_AccessibleMenuItem.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/toolkit_AccessibleMenuItem.xba
deleted file mode 100644
index f7d8a2592999..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuItem/toolkit_AccessibleMenuItem.xba
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleMenuItem" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleMenuItem
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-	Dim oMenu as Object
-	Dim oMenuCont as Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oMenu = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU)
-	oMenuCont = oMenu.getAccessibleContext()
-    oMenuCont.doAccessibleAction(0)
-    oObj = oMenu.getAccessibleChild(1)
-	
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-    accText = oObj.getText()
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/script.xlb
deleted file mode 100644
index b9a1d9b3fbe9..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleMenuSeparator" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleMenuSeparator"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/toolkit_AccessibleMenuSeparator.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/toolkit_AccessibleMenuSeparator.xba
deleted file mode 100644
index 3686b15884c5..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleMenuSeparator/toolkit_AccessibleMenuSeparator.xba
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleMenuSeparator" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleMenuSeparator
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-	Dim oMenu as Object
-	Dim oMenuCont as Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oMenu = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU)
-	oMenuCont = oMenu.getAccessibleContext()
-    oMenuCont.doAccessibleAction(0)
-    oObj = oMenu.getAccessibleChild(4)
-	
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/script.xlb
deleted file mode 100644
index 14c997ba6b9e..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleRadioButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleRadioButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/toolkit_AccessibleRadioButton.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/toolkit_AccessibleRadioButton.xba
deleted file mode 100644
index 255807510f08..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleRadioButton/toolkit_AccessibleRadioButton.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleRadioButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global accButton As Object
-Global readOnly as Boolean
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleRadioButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps(), ichControl As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:HyperlinkDialog"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow()
-        xRoot = utils.at_getAccessibleObject(oWin)
-        ichControl = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TREE,"IconChoiceControl")
-        ichControl.selectAccessibleChild(0)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.RADIO_BUTTON,"Web")
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        accText = oObj.getText()
-        readOnly = true
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open Hyperlink dialog...")
-    End If
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.grabFocus()
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/script.xlb
deleted file mode 100644
index 92c76fe2720f..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleScrollBar" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleScrollBar"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/toolkit_AccessibleScrollBar.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/toolkit_AccessibleScrollBar.xba
deleted file mode 100644
index 6e0b7a5fac8f..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleScrollBar/toolkit_AccessibleScrollBar.xba
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleScrollBar" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleScrollBar
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.SCROLL_BAR)
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU,"Help")    
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    accButton.doAccessibleAction(0)
-    wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/script.xlb
deleted file mode 100644
index e1da2c9db3e6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleStatusBar" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="toolkit_AccessibleStatusBar"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/toolkit_AccessibleStatusBar.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/toolkit_AccessibleStatusBar.xba
deleted file mode 100644
index 26e026754d66..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBar/toolkit_AccessibleStatusBar.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleStatusBar" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oWin As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.toolkit.AccessibleStatusBar
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    Dim xRoot As Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.STATUS_BAR)
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim newPosSize as Variant
-    newPosSize = oWin.getPosSize()
-    newPosSize.Width = newPosSize.Width - 20
-    newPosSize.Height = newPosSize.Height - 20
-    newPosSize.X = newPosSize.X + 20
-    newPosSize.Y = newPosSize.Y + 20
-    oWin.setPosSize(newPosSize.X, newPosSize.Y, newPosSize.Width, _
-                            newPosSize.Height, com.sun.star.awt.PosSize.POSSIZE)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/script.xlb
deleted file mode 100644
index fbdbad2f7d8d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
- <library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleStatusBarItem" library:readonly="false" library:passwordprotected="false">
-  <library:element library:name="toolkit_AccessibleStatusBarItem"/>
- </library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/toolkit_AccessibleStatusBarItem.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/toolkit_AccessibleStatusBarItem.xba
deleted file mode 100644
index 82c866c4c0bc..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleStatusBarItem/toolkit_AccessibleStatusBarItem.xba
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleStatusBarItem" script:language="StarBasic">
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' "com::sun::star::accessibility::XAccessibleText"
- ' needs the following Global variables:
-   Global accText as String
-   Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' com.sun.star.toolkit.AccessibleStatusBarItem
-'*************************************************************************
-On Error Goto ErrHndl
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    Dim xController As Object
-    xController = oDoc.getCurrentController()
-
-    Dim xRoot As Object
-    Dim oWin as Object
-    oWin = utils.at_getCurrentWindow(oDoc)
-    xRoot = utils.at_getAccessibleObject(oWin)
-    Dim oStatusBar as Object
-    oStatusBar = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.STATUS_BAR)
-    oObj = oStatusBar.getAccessibleChild(0)
-    
-    readOnly = true
-    accText = oObj.getText()
-    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub fireEvent()
-    Dim oText as Object
-    oText = oDoc.getText()
-    
-    Dim oEnum as Object
-    Dim oParagraph as Object
-    oEnum = oText.createEnumeration() ' get all paragraphs
-    while oEnum.hasMoreElements()
-        oParagraph = oEnum.nextElement() ' get the last paragraph
-    wend
-    oParagraph.BreakType = com.sun.star.style.BreakType.PAGE_AFTER 
-    
-    Dim oCursor as Object
-    oCursor = oText.createTextCursor()
-    oCursor.gotoEnd(false) 'Goto to the end of document
-    oText.insertControlCharacter(oCursor, 0, false) ' insert a new paragraph
-    oCursor.setString("AccessibleStatusBarItem") ' insert text 
-end Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/script.xlb
deleted file mode 100644
index 3e7b1abec77a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleTabControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleTabControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/toolkit_AccessibleTabControl.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/toolkit_AccessibleTabControl.xba
deleted file mode 100644
index e629d6599886..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabControl/toolkit_AccessibleTabControl.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleTabControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-Global multiSelection As Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleTabControl
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:InsertField"
-    urlTransformer.parseStrict(url)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow()
-        xRoot = utils.at_getAccessibleObject(oWin)
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB_LIST)
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        multiSelection = false
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open InsertField dialog...")
-    End If
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.selectAccessibleChild(1)
-    wait(500)
-    oObj.selectAccessibleChild(0)
-    wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/script.xlb
deleted file mode 100644
index 680de388231d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleTabPage" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleTabPage"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/toolkit_AccessibleTabPage.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/toolkit_AccessibleTabPage.xba
deleted file mode 100644
index 5b1d43d057f9..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleTabPage/toolkit_AccessibleTabPage.xba
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleTabPage" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-   Global accText as String
-   Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleTabPage
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim xController As Object, oWin As Object
-    Dim xDispatcher As Object, xRoot As Object
-    Dim tk As Object, urlTransformer As Object
-    Dim url As New com.sun.star.util.URL
-    Dim noProps()
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(500)
-
-    xController = oDoc.getCurrentController()
-    urlTransformer = createUNOService("com.sun.star.util.URLTransformer")
-    url.Complete = ".uno:InsertField"
-    urlTransformer.parseStrict(url)
-    wait(500)
-    xDispatcher = xController.queryDispatch(url,"",0)
-
-    if (NOT isNull(xDispatcher)) then 
-        xDispatcher.dispatch(url, noProps())
-        wait(500)
-        oWin = tk.getActiveTopWindow()
-        xRoot = utils.at_getAccessibleObject(oWin)
-        accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PUSH_BUTTON,"Close")
-        oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.PAGE_TAB)
-        Out.Log("Implementation name: "+oObj.getImplementationName())
-        accText = oObj.getText()
-        readOnly = true
-
-    else
-        Out.Log("QueryDispatch FAILED. Cannot open InsertField dialog...")
-    End If
-
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    if NOT isNull(accButton) then
-        accButton.doAccessibleAction(0)
-        wait(1000)
-    End If
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    wait(500)
-    accButton.grabFocus()
-    wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/script.xlb
deleted file mode 100644
index 1961c1b191fa..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleToolBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleToolBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/toolkit_AccessibleToolBox.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/toolkit_AccessibleToolBox.xba
deleted file mode 100644
index d5d9fcccb371..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBox/toolkit_AccessibleToolBox.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleToolBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accButton As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleToolBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.TOOL_BAR)
-    accButton = utils.at_getAccessibleObjectForRole(xRoot, com.sun.star.accessibility.AccessibleRole.MENU,"Help")    
-    Out.Log("Implementation Name: "+oObj.getImplementationName())
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    wait(500)
-    accButton.doAccessibleAction(0)
-    wait(500)
-End Sub
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/script.xlb b/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/script.xlb
deleted file mode 100644
index cea24c1a4c50..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_AccessibleToolBoxItem" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_AccessibleToolBoxItem"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/toolkit_AccessibleToolBoxItem.xba b/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/toolkit_AccessibleToolBoxItem.xba
deleted file mode 100644
index d3306b53de08..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/AccessibleToolBoxItem/toolkit_AccessibleToolBoxItem.xba
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_AccessibleToolBoxItem" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global accText As String
-Global readOnly as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.AccessibleToolBoxItem
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object, xRoot As Object
-    Dim tk As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    tk = createUNOService("com.sun.star.awt.Toolkit")
-    wait(1000)
-    oWin = tk.getActiveTopWindow()
-    xRoot = utils.at_getAccessibleObject(oWin)
-    oObj = utils.at_getAccessibleObjectForRole(xRoot, _
-                 com.sun.star.accessibility.AccessibleRole.TOGGLE_BUTTON,"Bold")
-    accText = oObj.getText()
-    readOnly = true
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    utils.closeObject(oDoc)
-End Sub
-
-Sub fireEvent()
-    oObj.grabFocus()
-    oObj.doAccessibleAction(0)
-    wait(500)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/TabController/script.xlb b/qadevOOo/tests/basic/mod/toolkit/TabController/script.xlb
deleted file mode 100644
index cc590c6b462d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/TabController/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_TabController" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_TabController"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/TabController/toolkit_TabController.xba b/qadevOOo/tests/basic/mod/toolkit/TabController/toolkit_TabController.xba
deleted file mode 100644
index 986b40cd1ed6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/TabController/toolkit_TabController.xba
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_TabController" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oXTabControllerModel As Object
-Global oXTabControllerContainer As Object
-Global bHasNoModel as Boolean
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.TabController
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oModel, oDrawPage, oShape As Object
-    Dim oController, oCtrll As Object
-
-    oObj = createUnoService("com.sun.star.awt.TabController")
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape = toolkittools.createUNOControlShape("CommandButton", "UnoControlButton")
-    toolkittools.addShape(oShape)
-    oDrawPage = oDoc.getDrawPage()
-
-    oModel = oShape.getControl()
-    oController = oDoc.getCurrentController()
-    oCtrll = oController.getControl(oModel)
-    oXTabControllerContainer = oCtrll.getContext()
-    oXTabControllerModel = oDrawPage.getForms().getByIndex(0)
-    bHasNoModel = False
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/script.xlb
deleted file mode 100644
index 529bde7dbe55..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_TabControllerModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_TabControllerModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/toolkit_TabControllerModel.xba b/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/toolkit_TabControllerModel.xba
deleted file mode 100644
index 4f4e503fa9d2..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/TabControllerModel/toolkit_TabControllerModel.xba
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_TabControllerModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global XTabControlModel1 As Object
-Global XTabControlModel2 As Object
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.TabControllerModel
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1, oShape2, oShape3 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oShape1 = ToolkitTools.createControlShape("CommandButton")
-    oShape2 = ToolkitTools.createControlShape("TextField")
-    oShape3 = ToolkitTools.createControlShape("TextField")
-
-    toolkittools.addShape(oShape1)
-    toolkittools.addShape(oShape2)
-    toolkittools.addShape(oShape3)
-
-    XTabControlModel1 = oShape1.getControl()
-    XTabControlModel2 = oShape2.getControl()
-    oPersistInstance = oShape3.getControl()
-
-    oObj = createUnoService("com.sun.star.awt.TabControllerModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/Toolkit/script.xlb b/qadevOOo/tests/basic/mod/toolkit/Toolkit/script.xlb
deleted file mode 100644
index 4cd335890e3a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/Toolkit/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_Toolkit" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_Toolkit"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/Toolkit/toolkit_Toolkit.xba b/qadevOOo/tests/basic/mod/toolkit/Toolkit/toolkit_Toolkit.xba
deleted file mode 100644
index c7a5c1ec9529..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/Toolkit/toolkit_Toolkit.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_Toolkit" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.Toolkit
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oCtrl As Object
-    Dim oFrame As Object
-    Dim oWnd As Object
-    Dim oToolkit As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-
-    oCtrl = oDoc.getCurrentController()
-    oFrame = oCtrl.getFrame()
-    oWnd = oFrame.getComponentWindow()
-    oToolkit = oWnd.getToolkit()
-
-    oObj = oToolkit
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/script.xlb
deleted file mode 100644
index 0711c53b0208..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/toolkit_UnoControlButton.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/toolkit_UnoControlButton.xba
deleted file mode 100644
index 09a50acf78a0..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlButton/toolkit_UnoControlButton.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.awt.XView:
-  Global oGraphics As Object
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.awt.XControl:
-  Global oContext As Object
-  Global oWinpeer As Object
-  Global oToolkit As Object
-  Global oModel As Object
-
-' Required for  com.sun.star.awt.XWindow:
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = ToolkitTools.createUnoControlShape("CommandButton", "UnoControlButton")
-    oShape2 = ToolkitTools.createUnoControlShape("CommandButton", "UnoControlButton")
-    oShape3 = ToolkitTools.createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200, 200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/script.xlb
deleted file mode 100644
index d210fe68754f..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/toolkit_UnoControlButtonModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/toolkit_UnoControlButtonModel.xba
deleted file mode 100644
index 3af179132798..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlButtonModel/toolkit_UnoControlButtonModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/script.xlb
deleted file mode 100644
index 986d920ef299..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlCheckBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlCheckBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/toolkit_UnoControlCheckBox.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/toolkit_UnoControlCheckBox.xba
deleted file mode 100644
index 3fc1a61aadf5..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBox/toolkit_UnoControlCheckBox.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlCheckBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-Global oXWindow as Object
-  Global oCtrlShape as Object
-
-Global bIL_itemStateChanged As Boolean
-Global oEventItemListener As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlCheckBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape1, oShape2, oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin, oKit, oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("CheckBox", "UnoControlCheckBox")
-    oShape2 = createUnoControlShape("CheckBox", "UnoControlCheckBox")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-
-    bIL_itemStateChanged = False
-    out.log("create listener for item events")
-    Dim oIListener As Object
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-    oObj.addItemListener(oIListener)    
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-
-Sub IL_itemStateChanged(rEvent As Object)
-    bIL_itemStateChanged = True
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    oEventItemListener = rEvent
-End Sub
-
-Sub IL_disposing(sEvent As Object)
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/script.xlb
deleted file mode 100644
index 5ebe3bf41882..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlCheckBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlCheckBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/toolkit_UnoControlCheckBoxModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/toolkit_UnoControlCheckBoxModel.xba
deleted file mode 100644
index 749f3c6513f6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCheckBoxModel/toolkit_UnoControlCheckBoxModel.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlCheckBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlCheckBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlCheckBoxModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlCheckBoxModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/script.xlb
deleted file mode 100644
index 427663e3d8a8..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlComboBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlComboBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/toolkit_UnoControlComboBox.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/toolkit_UnoControlComboBox.xba
deleted file mode 100644
index 0edac329fae2..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBox/toolkit_UnoControlComboBox.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlComboBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-
-Global oXWindow as Object
-Global oCtrlShape as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlComboBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("ComboBox", "UnoControlComboBox")
-    oShape2 = createUnoControlShape("ComboBox", "UnoControlComboBox")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/script.xlb
deleted file mode 100644
index 2008e44613c6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlComboBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlComboBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/toolkit_UnoControlComboBoxModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/toolkit_UnoControlComboBoxModel.xba
deleted file mode 100644
index 00b7e4ee7cd9..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlComboBoxModel/toolkit_UnoControlComboBoxModel.xba
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlComboBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlComboBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlComboBoxModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlComboBoxModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/script.xlb
deleted file mode 100644
index 119527ba4551..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlContainer" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlContainer"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/toolkit_UnoControlContainer.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/toolkit_UnoControlContainer.xba
deleted file mode 100644
index 332ba4bedf03..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainer/toolkit_UnoControlContainer.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlContainer" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-
-Global oXWindow as Object
-Global oCtrlShape as Object
-
-Global oXControl1 as Object
-Global oXControl2 as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlContainer
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oCurrCtrl2 As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createControlShape("CommandButton")
-    oShape2 = createUnoControlShape("CommandButton", "UnoControlButton")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oObj = createUnoService("com.sun.star.awt.UnoControlContainer")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlContainer")
-
-    oCurrCtrl = oDoc.getCurrentController()
-    oXControl1 = oCurrCtrl.getControl(oShape1.getControl())
-    oXControl2 = oCurrCtrl.getControl(oShape2.getControl())
-
-    oModel = oShape1.getControl()
-    oObj.setModel(oModel)
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/script.xlb
deleted file mode 100644
index 438ed8669057..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlContainerModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlContainerModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/toolkit_UnoControlContainerModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/toolkit_UnoControlContainerModel.xba
deleted file mode 100644
index b868a147c0a6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlContainerModel/toolkit_UnoControlContainerModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlContainerModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlContainerModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlContainerModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlContainerModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/script.xlb
deleted file mode 100644
index c54c2fa36c54..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlCurrencyField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlCurrencyField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/toolkit_UnoControlCurrencyField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/toolkit_UnoControlCurrencyField.xba
deleted file mode 100644
index 234d300050ea..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyField/toolkit_UnoControlCurrencyField.xba
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlCurrencyField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlCurrencyField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("CurrencyField", "UnoControlCurrencyField")
-    oShape2 = createUnoControlShape("CurrencyField", "UnoControlCurrencyField")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200, 200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/script.xlb
deleted file mode 100644
index 8448f3cd59e8..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlCurrencyFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlCurrencyFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/toolkit_UnoControlCurrencyFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/toolkit_UnoControlCurrencyFieldModel.xba
deleted file mode 100644
index 68afb6cc714d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlCurrencyFieldModel/toolkit_UnoControlCurrencyFieldModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlCurrencyFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlCurrencyFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlCurrencyFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlCurrencyFieldModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/script.xlb
deleted file mode 100644
index 46178921b46d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlDateField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlDateField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/toolkit_UnoControlDateField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/toolkit_UnoControlDateField.xba
deleted file mode 100644
index 308a949f7a68..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateField/toolkit_UnoControlDateField.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlDateField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlDateField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("DateField", "UnoControlDateField")
-    oShape2 = createUnoControlShape("DateField", "UnoControlDateField")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/script.xlb
deleted file mode 100644
index 6f5adb3fc56e..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlDateFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlDateFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/toolkit_UnoControlDateFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/toolkit_UnoControlDateFieldModel.xba
deleted file mode 100644
index b6f8ec986368..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDateFieldModel/toolkit_UnoControlDateFieldModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlDateFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlDateFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlDateFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlDateFieldModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/script.xlb
deleted file mode 100644
index b8391fefcd5f..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlDialog" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlDialog"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/toolkit_UnoControlDialog.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/toolkit_UnoControlDialog.xba
deleted file mode 100644
index 355a359c9e04..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialog/toolkit_UnoControlDialog.xba
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlDialog" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-Global oXControl1 as Object
-Global oXControl2 as Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlDialog
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-    Dim oDlgModel As Object
-    Dim oButModel As Object
-    Dim oDlgControl As Object
-    Dim oComponentInstance As Object
-    Dim oComponentModel As Object
-    Dim oXWindowModel As Object
-
-    oDlgModel = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-    oDlgControl = createUnoService("com.sun.star.awt.UnoControlDialog")
-    oDlgControl.setModel(oDlgModel)
-
-    oComponentModel = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlDialog")
-    oComponentInstance.setModel(oComponentModel)
-
-    oXWindowModel = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-    oXWindow = createUnoService("com.sun.star.awt.UnoControlDialog")
-    oXWindow.setModel(oXWindowModel)
-
-    oButModel = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-    oXControl1 = createUnoService("com.sun.star.awt.UnoControlButton")
-    oXControl1.setModel(oButModel)
-    oButModel = createUnoService("com.sun.star.awt.UnoControlButtonModel")
-    oXControl2 = createUnoService("com.sun.star.awt.UnoControlButton")
-    oXControl2.setModel(oButModel)
-
-    oDlgControl.setVisible(true)
-    oDlgControl.setPosSize(0, 0, 200, 100, com.sun.star.awt.PosSize.SIZE)
-    oContext = oDlgModel
-    oModel = oDlgModel
-    oWinpeer = oDlgControl.getPeer()
-    oToolkit = oWinpeer.getToolkit()
-    oDevice = oToolKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oDlgControl
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    oXWindow.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/script.xlb
deleted file mode 100644
index f69b248965ff..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlDialogModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlDialogModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/toolkit_UnoControlDialogModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/toolkit_UnoControlDialogModel.xba
deleted file mode 100644
index ce69c0d9f05f..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlDialogModel/toolkit_UnoControlDialogModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlDialogModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlDialogModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlDialogModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/script.xlb
deleted file mode 100644
index 128160b10445..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlEdit" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlEdit"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/toolkit_UnoControlEdit.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/toolkit_UnoControlEdit.xba
deleted file mode 100644
index 3c618b535f46..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlEdit/toolkit_UnoControlEdit.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlEdit" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlEdit
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("TextField", "UnoControlEdit")
-    oShape2 = createUnoControlShape("TextField", "UnoControlEdit")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/script.xlb
deleted file mode 100644
index 326335148b23..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlEditModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlEditModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/toolkit_UnoControlEditModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/toolkit_UnoControlEditModel.xba
deleted file mode 100644
index b0845c0bff7b..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlEditModel/toolkit_UnoControlEditModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlEditModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlEditModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlEditModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlEditModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/script.xlb
deleted file mode 100644
index ae32f6ea9950..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFileControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFileControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/toolkit_UnoControlFileControl.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/toolkit_UnoControlFileControl.xba
deleted file mode 100644
index 0b79bc6f512d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControl/toolkit_UnoControlFileControl.xba
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFileControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFileControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("FileControl", "UnoControlFileControl")
-    oShape2 = createUnoControlShape("FileControl", "UnoControlFileControl")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/script.xlb
deleted file mode 100644
index 56de55222b68..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFileControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFileControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/toolkit_UnoControlFileControlModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/toolkit_UnoControlFileControlModel.xba
deleted file mode 100644
index e1c380e17ac2..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFileControlModel/toolkit_UnoControlFileControlModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFileControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFileControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlFileControlModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlFileControlModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/script.xlb
deleted file mode 100644
index dd2e8444701a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFixedLineModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFixedLineModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/toolkit_UnoControlFixedLineModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/toolkit_UnoControlFixedLineModel.xba
deleted file mode 100644
index 7381254bf6f3..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedLineModel/toolkit_UnoControlFixedLineModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFixedLineModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFixedLineModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlFixedLineModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlFixedLineModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/script.xlb
deleted file mode 100644
index 29c3cec5fc5a..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFixedText" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFixedText"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/toolkit_UnoControlFixedText.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/toolkit_UnoControlFixedText.xba
deleted file mode 100644
index fb38ddf4ac05..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedText/toolkit_UnoControlFixedText.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFixedText" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFixedText
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("FixedText", "UnoControlFixedText")
-    oShape2 = createUnoControlShape("FixedText", "UnoControlFixedText")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/script.xlb
deleted file mode 100644
index f1ce26a05892..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFixedTextModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFixedTextModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/toolkit_UnoControlFixedTextModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/toolkit_UnoControlFixedTextModel.xba
deleted file mode 100644
index b53f02dc7328..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFixedTextModel/toolkit_UnoControlFixedTextModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFixedTextModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFixedTextModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlFixedTextModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlFixedTextModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/script.xlb
deleted file mode 100644
index 726226fcf6ea..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFormattedField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFormattedField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/toolkit_UnoControlFormattedField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/toolkit_UnoControlFormattedField.xba
deleted file mode 100644
index 72ca1af457bb..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedField/toolkit_UnoControlFormattedField.xba
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFormattedField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics as Object
-Global oContext as Object
-Global oWinpeer as Object
-Global oToolkit as Object
-Global oModel as Object
-  Global oXWindow as Object
-  Global oCtrlShape as Object
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFormattedField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("DatabaseFormattedField", "UnoControlFormattedField")
-    oShape2 = createUnoControlShape("DatabaseFormattedField", "UnoControlFormattedField")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/script.xlb
deleted file mode 100644
index 73bb0e286271..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlFormattedFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlFormattedFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/toolkit_UnoControlFormattedFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/toolkit_UnoControlFormattedFieldModel.xba
deleted file mode 100644
index 62896a07eb7d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlFormattedFieldModel/toolkit_UnoControlFormattedFieldModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlFormattedFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlFormattedFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlFormattedFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlFormattedFieldModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/script.xlb
deleted file mode 100644
index 0454145693ee..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlGroupBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlGroupBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/toolkit_UnoControlGroupBox.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/toolkit_UnoControlGroupBox.xba
deleted file mode 100644
index 421861498abb..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBox/toolkit_UnoControlGroupBox.xba
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlGroupBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlGroupBox
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim bOK As Boolean
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    bOK = true
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("GroupBox", "UnoControlGroupBox")
-    oShape2 = createUnoControlShape("GroupBox", "UnoControlGroupBox")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/script.xlb
deleted file mode 100644
index 73bb067d5088..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlGroupBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlGroupBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/toolkit_UnoControlGroupBoxModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/toolkit_UnoControlGroupBoxModel.xba
deleted file mode 100644
index a3c92925e56d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlGroupBoxModel/toolkit_UnoControlGroupBoxModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlGroupBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlGroupBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlGroupBoxModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlGroupBoxModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/script.xlb
deleted file mode 100644
index 63245cf93214..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlImageControl" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlImageControl"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/toolkit_UnoControlImageControl.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/toolkit_UnoControlImageControl.xba
deleted file mode 100644
index 2e1bab326619..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControl/toolkit_UnoControlImageControl.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlImageControl" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlImageControl
-'*************************************************************************
-On Error Goto ErrHndl
-
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("DatabaseImageControl", "UnoControlImageControl")
-    oShape2 = createUnoControlShape("DatabaseImageControl", "UnoControlImageControl")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/script.xlb
deleted file mode 100644
index 223db88b87f9..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlImageControlModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlImageControlModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/toolkit_UnoControlImageControlModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/toolkit_UnoControlImageControlModel.xba
deleted file mode 100644
index a4dd93c1dc37..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlImageControlModel/toolkit_UnoControlImageControlModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlImageControlModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlImageControlModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlImageControlModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlImageControlModel")
-Exit Sub    
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/script.xlb
deleted file mode 100644
index c448b854cf6d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlListBox" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlListBox"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/toolkit_UnoControlListBox.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/toolkit_UnoControlListBox.xba
deleted file mode 100644
index cc4e392e4538..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBox/toolkit_UnoControlListBox.xba
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlListBox" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Global bIL_itemStateChanged As Boolean
-Global oEventItemListener As Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlListBox
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-    Dim oIListener As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    
-    oShape1 = createUnoControlShape("ListBox", "UnoControlListBox")
-    oShape2 = createUnoControlShape("ListBox", "UnoControlListBox")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-
-    oIListener = createUnoListener("IL_", "com.sun.star.awt.XItemListener")
-    oObj.addItemListener(oIListener)    
-
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-
-Sub IL_itemStateChanged(rEvent As Object)
-    bIL_itemStateChanged = True
-    Out.Log("CallBack for ItemListener itemStateChanged was called.")
-    oEventItemListener = rEvent
-End Sub
-
-Sub IL_disposing
-End Sub
-
-
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/script.xlb
deleted file mode 100644
index 9dfa0ec136f6..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlListBoxModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlListBoxModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/toolkit_UnoControlListBoxModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/toolkit_UnoControlListBoxModel.xba
deleted file mode 100644
index c7357ea35cb5..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlListBoxModel/toolkit_UnoControlListBoxModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlListBoxModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlListBoxModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlListBoxModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlListBoxModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/script.xlb
deleted file mode 100644
index 9ae20caef36b..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlNumericField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlNumericField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/toolkit_UnoControlNumericField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/toolkit_UnoControlNumericField.xba
deleted file mode 100644
index fe1a5bbd8d42..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericField/toolkit_UnoControlNumericField.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlNumericField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlNumericField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("NumericField", "UnoControlNumericField")
-    oShape2 = createUnoControlShape("NumericField", "UnoControlNumericField")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/script.xlb
deleted file mode 100644
index 69cefe22c6c2..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlNumericFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlNumericFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/toolkit_UnoControlNumericFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/toolkit_UnoControlNumericFieldModel.xba
deleted file mode 100644
index d51bd158bb81..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlNumericFieldModel/toolkit_UnoControlNumericFieldModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlNumericFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlNumericFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlNumericFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlNumericFieldModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/script.xlb
deleted file mode 100644
index 9c3d25c7388c..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlPatternField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlPatternField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/toolkit_UnoControlPatternField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/toolkit_UnoControlPatternField.xba
deleted file mode 100644
index dd388abb226d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternField/toolkit_UnoControlPatternField.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlPatternField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlPatternField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = createUnoControlShape("PatternField", "UnoControlPatternField")
-    oShape2 = createUnoControlShape("PatternField", "UnoControlPatternField")
-    oShape3 = createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/script.xlb
deleted file mode 100644
index 6ad1924c4bc8..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlPatternFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlPatternFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/toolkit_UnoControlPatternFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/toolkit_UnoControlPatternFieldModel.xba
deleted file mode 100644
index 79100440d9b0..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlPatternFieldModel/toolkit_UnoControlPatternFieldModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlPatternFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlPatternFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlPatternFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlPatternFieldModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/script.xlb
deleted file mode 100644
index 075c3a895184..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlProgressBarModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlProgressBarModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/toolkit_UnoControlProgressBarModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/toolkit_UnoControlProgressBarModel.xba
deleted file mode 100644
index b7c29f52e8d1..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlProgressBarModel/toolkit_UnoControlProgressBarModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlProgressBarModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlProgressBarModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlProgressBarModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlProgressBarModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/script.xlb
deleted file mode 100644
index 217d9be6abba..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlRadioButton" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlRadioButton"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/toolkit_UnoControlRadioButton.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/toolkit_UnoControlRadioButton.xba
deleted file mode 100644
index 2add360c7e3b..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButton/toolkit_UnoControlRadioButton.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlRadioButton" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlRadioButton
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = ToolkitTools.createUnoControlShape("RadioButton", "UnoControlRadioButton")
-    oShape2 = ToolkitTools.createUnoControlShape("RadioButton", "UnoControlRadioButton")
-    oShape3 = ToolkitTools.createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow =  oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/script.xlb
deleted file mode 100644
index 92945cdf6628..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlRadioButtonModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlRadioButtonModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/toolkit_UnoControlRadioButtonModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/toolkit_UnoControlRadioButtonModel.xba
deleted file mode 100644
index 2496fe4ea242..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlRadioButtonModel/toolkit_UnoControlRadioButtonModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlRadioButtonModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlRadioButtonModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlRadioButtonModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlRadioButtonModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/script.xlb
deleted file mode 100644
index 4f21af164b08..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlScrollBarModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlScrollBarModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/toolkit_UnoControlScrollBarModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/toolkit_UnoControlScrollBarModel.xba
deleted file mode 100644
index 5499593310f7..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlScrollBarModel/toolkit_UnoControlScrollBarModel.xba
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlScrollBarModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlScrollBarModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlScrollBarModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlScrollBarModel")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/script.xlb
deleted file mode 100644
index f690e03f5ac1..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlTimeField" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlTimeField"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/toolkit_UnoControlTimeField.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/toolkit_UnoControlTimeField.xba
deleted file mode 100644
index 328b09ab7b44..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeField/toolkit_UnoControlTimeField.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlTimeField" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oGraphics As Object
-Global oContext As Object
-Global oWinpeer As Object
-Global oToolkit As Object
-Global oModel As Object
-  Global oXWindow As Object
-  Global oCtrlShape as Object
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlTimeField
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oShape1 As Object
-    Dim oShape2 As Object
-    Dim oShape3 As Object
-    Dim oCurrCtrl As Object
-    Dim oWin As Object
-    Dim oKit As Object
-    Dim oDevice As Object
-    Dim oDoc2 As Object
-
-    oDoc = utils.createDocument("swriter", cObjectName)
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-
-    oShape1 = ToolkitTools.createUnoControlShape("TimeField", "UnoControlTimeField")
-    oShape2 = ToolkitTools.createUnoControlShape("TimeField", "UnoControlTimeField")
-    oShape3 = ToolkitTools.createControlShape("TextField")
-
-    ToolkitTools.addShape(oShape1)
-    ToolkitTools.addShape(oShape2)
-    ToolkitTools.addShape(oShape3)
-
-    oModel = oShape1.getControl()
-    oCurrCtrl = oDoc.getCurrentController()
-    oWin = oCurrCtrl.getControl(oModel).getPeer()
-    oKit = oWin.getToolkit()
-    oDevice = oKit.createScreenCompatibleDevice(200,200)
-    oGraphics = oDevice.createGraphics()
-
-    oObj = oCurrCtrl.getControl(oModel)
-    oComponentInstance = oDoc.getCurrentcontroller.getControl(oShape2.getControl())
-    oContext = oDoc
-    oWinpeer = oWin
-    oToolkit = oKit
-    oXWindow = oDoc2.getCurrentController().getFrame().getComponentWindow()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Sub DisposeObj()
-    'Re-open this document to close it successfully
-    Dim oDoc2 As Object
-    oDoc2 = utils.createDocument("swriter", cObjectName &amp; "1")
-    oDoc2.Dispose()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/script.xlb b/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/script.xlb
deleted file mode 100644
index 992d18f57bc7..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="toolkit_UnoControlTimeFieldModel" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="toolkit_UnoControlTimeFieldModel"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/toolkit_UnoControlTimeFieldModel.xba b/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/toolkit_UnoControlTimeFieldModel.xba
deleted file mode 100644
index c12c377b5f9d..000000000000
--- a/qadevOOo/tests/basic/mod/toolkit/UnoControlTimeFieldModel/toolkit_UnoControlTimeFieldModel.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="toolkit_UnoControlTimeFieldModel" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-Global oComponentInstance As Object
-Global oPersistInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' toolkit.UnoControlTimeFieldModel
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.awt.UnoControlTimeFieldModel")
-    oComponentInstance = createUnoService("com.sun.star.awt.UnoControlTimeFieldModel")
-    oPersistInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/script.xlb b/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/script.xlb
deleted file mode 100644
index 7b7cc3abe186..000000000000
--- a/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="typeconverter_uno_TypeConverter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="typeconverter_uno_TypeConverter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/typeconverter_uno_TypeConverter.xba b/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/typeconverter_uno_TypeConverter.xba
deleted file mode 100644
index bbb309a6647f..000000000000
--- a/qadevOOo/tests/basic/mod/typeconverter.uno/TypeConverter/typeconverter_uno_TypeConverter.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="typeconverter_uno_TypeConverter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' tcv.TypeConverter
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService("com.sun.star.script.Converter")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/script.xlb b/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/script.xlb
deleted file mode 100644
index ad83f2fd6592..000000000000
--- a/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="typemgr_uno_TypeDescriptionManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="typemgr_uno_TypeDescriptionManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/typemgr_uno_TypeDescriptionManager.xba b/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/typemgr_uno_TypeDescriptionManager.xba
deleted file mode 100644
index e213fde2a5ae..000000000000
--- a/qadevOOo/tests/basic/mod/typemgr.uno/TypeDescriptionManager/typemgr_uno_TypeDescriptionManager.xba
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="typemgr_uno_TypeDescriptionManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for lang.XComponent
-Global oComponentInstance As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' tdmgr.TypeDescriptionManager
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = CreateUnoService("com.sun.star.reflection.TypeDescriptionManager")
-    oComponentInstance = oObj
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/script.xlb b/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/script.xlb
deleted file mode 100644
index f1bc606ae987..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_UcbContentProviderProxyFactory" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_UcbContentProviderProxyFactory"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/ucb_UcbContentProviderProxyFactory.xba b/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/ucb_UcbContentProviderProxyFactory.xba
deleted file mode 100644
index 1b8225a3b166..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbContentProviderProxyFactory/ucb_UcbContentProviderProxyFactory.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_UcbContentProviderProxyFactory" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucb.UcbContentProviderProxyFactory
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/script.xlb b/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/script.xlb
deleted file mode 100644
index 7c213d17307c..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_UcbPropertiesManager" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_UcbPropertiesManager"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/ucb_UcbPropertiesManager.xba b/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/ucb_UcbPropertiesManager.xba
deleted file mode 100644
index ad6dfa7c33b4..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbPropertiesManager/ucb_UcbPropertiesManager.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_UcbPropertiesManager" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucb.UcbPropertiesManager
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService( "com.sun.star.comp.ucb.UcbPropertiesManager" )
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbStore/script.xlb b/qadevOOo/tests/basic/mod/ucb/UcbStore/script.xlb
deleted file mode 100644
index cfc0410e18d6..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbStore/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_UcbStore" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_UcbStore"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucb/UcbStore/ucb_UcbStore.xba b/qadevOOo/tests/basic/mod/ucb/UcbStore/ucb_UcbStore.xba
deleted file mode 100644
index 039874294172..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UcbStore/ucb_UcbStore.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_UcbStore" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucb.UcbStore
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService( "com.sun.star.comp.ucb.UcbStore" )
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/script.xlb b/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/script.xlb
deleted file mode 100644
index c2ee0fa7c320..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucb_UniversalContentBroker" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucb_UniversalContentBroker"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/ucb_UniversalContentBroker.xba b/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/ucb_UniversalContentBroker.xba
deleted file mode 100644
index ee40b7d3b4e3..000000000000
--- a/qadevOOo/tests/basic/mod/ucb/UniversalContentBroker/ucb_UniversalContentBroker.xba
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucb_UniversalContentBroker" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-' Required for  com.sun.star.ucb.XContentIdentifierFactory
-  Global sContentID As String
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XInitialization:
-  Global aInitArgs(1) As String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucb.UniversalContentBroker
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-
-    oComponentInstance = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-
-    ContentID1 = oObj.createContentIdentifier("ftp://localhost/c/temp/")
-    ContentID2 = oObj.createContentIdentifier("vnd.sun.star.webdav://localhost/c/temp/")
-    sContentID = "http://localhost/c/temp/"
-
-    ' If the instance is created with two arguments of type string,
-    ' these two strings are used to configure the newly instantiated broker;
-
-    aInitArgs(0) = "Local"
-    aInitArgs(1) = "Office"
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/script.xlb b/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/script.xlb
deleted file mode 100644
index bae6a4e2691b..000000000000
--- a/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucpdav_WebDAVContentProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucpdav_WebDAVContentProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/ucpdav_WebDAVContentProvider.xba b/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/ucpdav_WebDAVContentProvider.xba
deleted file mode 100644
index c7b4b646d667..000000000000
--- a/qadevOOo/tests/basic/mod/ucpdav/WebDAVContentProvider/ucpdav_WebDAVContentProvider.xba
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucpdav_WebDAVContentProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucpdav.WebDAVContentProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oUCB As Object
-
-    oObj = createUNOService("com.sun.star.ucb.WebDAVContentProvider")
-    oUCB = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-    ContentID1 = oUCB.createContentIdentifier("http://dav.anotherfoo.com/Documents/report.sdw")
-    ContentID2 = oUCB.createContentIdentifier("http://dav.foo.com/Documents/report.sdw")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-' Revision 1.2  2002/02/01 12:17:44  cvsan
-' CHG: ContentID changed.
-'
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucpfile/FileProvider/script.xlb b/qadevOOo/tests/basic/mod/ucpfile/FileProvider/script.xlb
deleted file mode 100644
index 077235fda068..000000000000
--- a/qadevOOo/tests/basic/mod/ucpfile/FileProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucpfile_FileProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucpfile_FileProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucpfile/FileProvider/ucpfile_FileProvider.xba b/qadevOOo/tests/basic/mod/ucpfile/FileProvider/ucpfile_FileProvider.xba
deleted file mode 100644
index f65662060ca8..000000000000
--- a/qadevOOo/tests/basic/mod/ucpfile/FileProvider/ucpfile_FileProvider.xba
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucpfile_FileProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' Required for  com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-' Required for  com.sun.star.ucb.XContentIdentifierFactory:
-  Global sContentID As String
-
-' Required for  com.sun.star.ucb.XFileIdentifierConverter:
-  Global cSystemPath as String
-  Global cBaseURL as String
-  Global cURLPath as String
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucpfile.FileProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUnoService( "com.sun.star.comp.ucb.FileProvider" )
-
-    ContentID1 = oObj.createContentIdentifier(utils.Path2URL(cTestDocsDir))
-    ContentID2 = oObj.createContentIdentifier("vnd.sun.star.webdav://localhost/c/temp/")
-    sContentID = "http://localhost/c/temp/"
-
-    cBaseURL = utils.Path2URL(cTestDocsDir)
-    cSystemPath = utils.URL2Path(cBaseURL)
-    cURLPath = utils.Path2URL(cTestDocsDir + "crazy-blue.jpg")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/script.xlb b/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/script.xlb
deleted file mode 100644
index 6c41cf7ee3bc..000000000000
--- a/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucphier_HierarchyContentProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucphier_HierarchyContentProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/ucphier_HierarchyContentProvider.xba b/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/ucphier_HierarchyContentProvider.xba
deleted file mode 100644
index a25534238de7..000000000000
--- a/qadevOOo/tests/basic/mod/ucphier/HierarchyContentProvider/ucphier_HierarchyContentProvider.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucphier_HierarchyContentProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucphier.HierarchyContentProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oUCB As Object
-
-    oObj = createUNOService("com.sun.star.ucb.HierarchyContentProvider")
-    oUCB = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-    ContentID1 = oUCB.createContentIdentifier("vnd.sun.star.hier://MyHierarchyDataSource/")
-    ContentID2 = oUCB.createContentIdentifier("vnd.sun.star.hier://Bookmarks/Sun%20Microssystems%20Home%20Page")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/script.xlb b/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/script.xlb
deleted file mode 100644
index c37575c24006..000000000000
--- a/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucphier_HierarchyDataSource" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucphier_HierarchyDataSource"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/ucphier_HierarchyDataSource.xba b/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/ucphier_HierarchyDataSource.xba
deleted file mode 100644
index f744c44d7c87..000000000000
--- a/qadevOOo/tests/basic/mod/ucphier/HierarchyDataSource/ucphier_HierarchyDataSource.xba
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucphier_HierarchyDataSource" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.lang.XComponent:
-  Global oComponentInstance As Object ' it will be disposed
-
-' Required for  com.sun.star.lang.XMultiServiceFactory:
-  Global cServiceName As String ' ex. "com.sun.star.drawing.RectangleShape"
-  Global bCreateInstanceWithoutArguments As Boolean
-  Global aArguments() As Variant
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucphier.HierarchyDataSource
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.ucb.DefaultHierarchyDataSource")
-
-    oComponentInstance = createUNOService("com.sun.star.ucb.DefaultHierarchyDataSource")
-
-    cServiceName = "com.sun.star.ucb.HierarchyDataReadWriteAccess"
-    bCreateInstanceWithoutArguments = true
-    Dim args(0) As New com.sun.star.beans.PropertyValue
-    args(0).Name = "nodepath" : args(0).Value = ""
-    aArguments() = args()
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/script.xlb b/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/script.xlb
deleted file mode 100644
index 8753e0986081..000000000000
--- a/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="ucppkg_PackageContentProvider" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="ucppkg_PackageContentProvider"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/ucppkg_PackageContentProvider.xba b/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/ucppkg_PackageContentProvider.xba
deleted file mode 100644
index 055925a14a12..000000000000
--- a/qadevOOo/tests/basic/mod/ucppkg/PackageContentProvider/ucppkg_PackageContentProvider.xba
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="ucppkg_PackageContentProvider" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for  com.sun.star.ucb.XContentProvider:
-  Global ContentID1 As Object
-  Global ContentID2 As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' ucppkg.PackageContentProvider
-'*************************************************************************
-On Error Goto ErrHndl
-    Dim oUCB As Object
-
-    oObj = createUNOService("com.sun.star.ucb.PackageContentProvider")
-    oUCB = createUNOService("com.sun.star.comp.ucb.UniversalContentBroker")
-    ContentID1 = oUCB.createContentIdentifier("vnd.sun.star.pkg://MyPackageSource")
-    ContentID2 = oUCB.createContentIdentifier("vnd.sun.star.pkg://localhost/")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/script.xlb b/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/script.xlb
deleted file mode 100644
index 3c7b78b8a1fa..000000000000
--- a/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="uui_UUIInteractionHandler" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="uui_UUIInteractionHandler"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/uui_UUIInteractionHandler.xba b/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/uui_UUIInteractionHandler.xba
deleted file mode 100644
index 85807a63ba45..000000000000
--- a/qadevOOo/tests/basic/mod/uui/UUIInteractionHandler/uui_UUIInteractionHandler.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="uui_UUIInteractionHandler" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' uui.UUIInteractionHandler
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.uui.InteractionHandler")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/script.xlb b/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/script.xlb
deleted file mode 100644
index 6105d6f84d95..000000000000
--- a/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="uuresolver_uno_UnoUrlResolver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="uuresolver_uno_UnoUrlResolver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/uuresolver_uno_UnoUrlResolver.xba b/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/uuresolver_uno_UnoUrlResolver.xba
deleted file mode 100644
index 74beac615c75..000000000000
--- a/qadevOOo/tests/basic/mod/uuresolver.uno/UnoUrlResolver/uuresolver_uno_UnoUrlResolver.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="uuresolver_uno_UnoUrlResolver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' uuresolver.UnoUrlResolver
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.bridge.UnoUrlResolver")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/script.xlb b/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/script.xlb
deleted file mode 100644
index ab7bd568b014..000000000000
--- a/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="uuresolver_UnoUrlResolver" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="uuresolver_UnoUrlResolver"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/uuresolver_UnoUrlResolver.xba b/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/uuresolver_UnoUrlResolver.xba
deleted file mode 100644
index 7db41d3ee3d3..000000000000
--- a/qadevOOo/tests/basic/mod/uuresolver/UnoUrlResolver/uuresolver_UnoUrlResolver.xba
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="uuresolver_UnoUrlResolver" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' uuresolver.UnoUrlResolver
-'*************************************************************************
-On Error Goto ErrHndl
-    oObj = createUNOService("com.sun.star.bridge.UnoUrlResolver")
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/script.xlb
deleted file mode 100644
index ae6a259d82c9..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLContentExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLContentExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/xmloff_Chart_XMLContentExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/xmloff_Chart_XMLContentExporter.xba
deleted file mode 100644
index c8a21a08aa86..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentExporter/xmloff_Chart_XMLContentExporter.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLContentExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLContentExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oChartTitle As Variant
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim printXML As Boolean
-    Dim expString As String
-
-    printXML = true
-    expString = "a - b"
-    expString = "NewTitleOfDiagram"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-content")
-    Tag2 = Array("office:body")
-    Tag3 = Array("chart:title")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Chart.XMLContentExporter", initArgs())
-
-    oChartTitle = oDoc.getTitle()
-    oChartTitle.setPropertyValue("String", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "schart: StarOffice XML (Chart)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/script.xlb
deleted file mode 100644
index 0443584ec192..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLContentImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLContentImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/xmloff_Chart_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/xmloff_Chart_XMLContentImporter.xba
deleted file mode 100644
index 4a854600f820..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLContentImporter/xmloff_Chart_XMLContentImporter.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLContentImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sValue As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLContentImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Chart.XMLContentImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sValue = "XMLContentImporter_test"
-    vXMLData = Array( _
-            Array("start", "office:document-content", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text", _
-                "xmlns:chart", "CDATA", "http://openoffice.org/2000/chart", _
-                "xmlns:table", "CDATA", "http://openoffice.org/2000/table", _
-                "xmlns:svg", "CDATA", "http://openoffice.org/2000/svg", _
-                "office:class", "CDATA", "chart", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:body"), _
-            Array("start", "chart:chart"), _
-            Array("start", "chart:title"), _
-            Array("start", "text:p"), _
-            Array("chars", sValue), _
-            Array("end", "text:p"), _
-            Array("end", "chart:title"), _
-            Array("end", "chart:chart"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document-content"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oTitle As Object    
-    Dim title As String
-    out.log("checking of import...")
-    oTitle = oDoc.getTitle()
-    title = oTitle.getPropertyValue("String")
-    res = (title = sValue)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/script.xlb
deleted file mode 100644
index f45b86cbbf74..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/xmloff_Chart_XMLExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/xmloff_Chart_XMLExporter.xba
deleted file mode 100644
index d43b51b06c35..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLExporter/xmloff_Chart_XMLExporter.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim docInfo As Variant
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3, Tag4 As Variant
-    Dim printXML As Boolean
-    Dim expString As String
-
-    printXML = true
-    expString = "NewTitleOfChartDocument"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("office:body")
-    Tag4 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("CharsEnclosed", Tag4, expString), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag1) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Chart.XMLExporter", initArgs())
-
-    docInfo = oDoc.getDocumentInfo()
-    docInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "schart: StarOffice XML (Chart)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/script.xlb
deleted file mode 100644
index a7cc190ecb02..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/xmloff_Chart_XMLImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/xmloff_Chart_XMLImporter.xba
deleted file mode 100644
index 4df7ddd9642b..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLImporter/xmloff_Chart_XMLImporter.xba
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sValue As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Chart.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sValue = "XMLContentImporter_test"
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text", _
-                "xmlns:chart", "CDATA", "http://openoffice.org/2000/chart", _
-                "xmlns:table", "CDATA", "http://openoffice.org/2000/table", _
-                "xmlns:svg", "CDATA", "http://openoffice.org/2000/svg", _
-                "office:class", "CDATA", "chart", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:body"), _
-            Array("start", "chart:chart"), _
-            Array("start", "chart:title"), _
-            Array("start", "text:p"), _
-            Array("chars", sValue), _
-            Array("end", "text:p"), _
-            Array("end", "chart:title"), _
-            Array("end", "chart:chart"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document-content"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oTitle As Object    
-    Dim title As String
-    out.log("checking of import...")
-    oTitle = oDoc.getTitle()
-    title = oTitle.getPropertyValue("String")
-    res = (title = sValue)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/script.xlb
deleted file mode 100644
index ba88f29b9a7e..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLStylesExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLStylesExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/xmloff_Chart_XMLStylesExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/xmloff_Chart_XMLStylesExporter.xba
deleted file mode 100644
index b544f6aa2250..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesExporter/xmloff_Chart_XMLStylesExporter.xba
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLStylesExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLStylesExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim filter As Variant
-    Dim printXML As Boolean
-
-    printXML = true
-    oMSF = getProcessServiceManager()
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    filter = Array( _
-                Array("TagExists", Array("office:document-styles")) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Chart.XMLStylesExporter", initArgs())
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "schart: StarOffice XML (Chart)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter()
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/script.xlb
deleted file mode 100644
index d2c3fe8f2d7e..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Chart_XMLStylesImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Chart_XMLStylesImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/xmloff_Chart_XMLStylesImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/xmloff_Chart_XMLStylesImporter.xba
deleted file mode 100644
index 92dbd9fba8fa..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Chart/XMLStylesImporter/xmloff_Chart_XMLStylesImporter.xba
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Chart_XMLStylesImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Chart.XMLStylesImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.loadTestDocument("emptyChart.sds", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Chart.XMLStylesImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    vXMLData = Array( _
-            Array("start", "office:document-styles", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:text", "CDATA", "http://openoffice.org/2000/text", _
-                "xmlns:chart", "CDATA", "http://openoffice.org/2000/chart", _
-                "xmlns:style", "CDATA", "http://openoffice.org/2000/style", _
-                "xmlns:svg", "CDATA", "http://openoffice.org/2000/svg", _
-                "office:class", "CDATA", "chart", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:styles"), _
-            Array("end", "office:styles"), _
-            Array("end", "office:document-styles"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    out.log("checking of import...")
-    out.log("No ways to check styles import were not found.")
-    res = True
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/script.xlb
deleted file mode 100644
index bf64ff5788c9..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLContentExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLContentExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/xmloff_Draw_XMLContentExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/xmloff_Draw_XMLContentExporter.xba
deleted file mode 100644
index 268c2ea34ca7..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentExporter/xmloff_Draw_XMLContentExporter.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLContentExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLContentExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDrawPages As Variant
-    Dim printXML As Boolean
-    Dim expString1 As String
-    Dim expString2 As String
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5 As Variant
-
-    printXML = true
-    expString1 = "NewSlide1"
-    expString2 = "NewSlide2"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-content")
-    Tag2 = Array("office:body")
-    Tag3 = Array("draw:page","draw:name","NewSlide1")
-    Tag4 = Array("draw:page","draw:name","NewSlide2")
-    Tag5 = Array("draw:page")
-    filter = Array( _
-                Array("TagExists", Tag1, Tag2, Tag3, Tag4), _
-                Array("TagEnclosed", Tag5, Tag2) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Draw.XMLContentExporter", initArgs())
-
-    oDrawPages = oDoc.getDrawPages()
-    oDrawPages.insertNewByIndex(1)
-    oDrawPages.getByIndex(0).setName(expString1)
-    oDrawPages.getByIndex(1).setName(expString2)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "sdraw: StarOffice XML (Draw)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/script.xlb
deleted file mode 100644
index 87b4c637710b..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLContentImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLContentImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/xmloff_Draw_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/xmloff_Draw_XMLContentImporter.xba
deleted file mode 100644
index beb1cb9e159d..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLContentImporter/xmloff_Draw_XMLContentImporter.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLContentImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sName1, sName2 As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLContentImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLContentImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sName1 = "NewSlide1"
-    sName2 = "NewSlide2"
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:draw", "CDATA", "http://openoffice.org/2000/drawing", _
-                "office:class", "CDATA", "drawing", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:body"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sName1, _
-                "draw:master-page-name", "CDATA", "Default"), _
-            Array("end", "draw:page"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sName2, _
-                "draw:master-page-name", "CDATA", "Default"), _
-            Array("end","draw:page"), _
-            Array("end", "draw:page"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim i As Integer
-    Dim res, res1, res2 As Boolean
-    Dim oPages, oPage As Object    
-    Dim pageName As String
-    out.log("checking of import...")
-    res1 = False
-    res2 = False
-    oPages = oDoc.getDrawPages()
-    out.log("Draw pages:")
-    For i = 0 to ( oPages.getCount() - 1 )
-        oPage = oPages.getByIndex(i)
-        pageName = oPage.getName()
-        out.log(pageName)
-        If pageName = sName1 then
-            res1 = True
-        EndIf
-        If pageName = sName2 then
-            res2 = True
-        EndIf
-    Next i
-    res = res1 and res2
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/script.xlb
deleted file mode 100644
index 80ede1c7381b..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/xmloff_Draw_XMLExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/xmloff_Draw_XMLExporter.xba
deleted file mode 100644
index a05ce5775cc6..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLExporter/xmloff_Draw_XMLExporter.xba
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDocInfo As Variant
-    Dim printXML As Boolean
-    Dim filter As Variant
-    Dim expString As String
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5 As Variant
-
-    printXML = true
-    expString = "NewTitleOfDrawDocument"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1, Tag2, Tag3), _
-                Array("TagEnclosed", Tag3, Tag2), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-             
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Draw.XMLExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "sdraw: StarOffice XML (Draw)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/script.xlb
deleted file mode 100644
index 32a461e579e6..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/xmloff_Draw_XMLImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/xmloff_Draw_XMLImporter.xba
deleted file mode 100644
index c51248716507..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLImporter/xmloff_Draw_XMLImporter.xba
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sName1, sName2 As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sName1 = "NewSlide1"
-    sName2 = "NewSlide2"
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:draw", "CDATA", "http://openoffice.org/2000/drawing", _
-                "office:class", "CDATA", "drawing", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:body"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sName1, _
-                "draw:master-page-name", "CDATA", "Default"), _
-            Array("end", "draw:page"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sName2, _
-                "draw:master-page-name", "CDATA", "Default"), _
-            Array("end","draw:page"), _
-            Array("end", "draw:page"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim i As Integer
-    Dim res, res1, res2 As Boolean
-    Dim oPages, oPage As Object    
-    Dim pageName As String
-    out.log("checking of import...")
-    res1 = False
-    res2 = False
-    oPages = oDoc.getDrawPages()
-    out.log("Draw pages:")
-    For i = 0 to ( oPages.getCount() - 1 )
-        oPage = oPages.getByIndex(i)
-        pageName = oPage.getName()
-        out.log(pageName)
-        If pageName = sName1 then
-            res1 = True
-        EndIf
-        If pageName = sName2 then
-            res2 = True
-        EndIf
-    Next i
-    res = res1 and res2
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/script.xlb
deleted file mode 100644
index 96e8b72ced2c..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLMetaExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLMetaExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/xmloff_Draw_XMLMetaExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/xmloff_Draw_XMLMetaExporter.xba
deleted file mode 100644
index 5f753854404b..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaExporter/xmloff_Draw_XMLMetaExporter.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLMetaExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLMetaExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDocInfo As Variant
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim printXML As Boolean
-    Dim expString As String
-
-    printXML = true
-    expString = "NewTitleOfDrawDocument"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-meta")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Draw.XMLMetaExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "sdraw: StarOffice XML (Draw)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/script.xlb
deleted file mode 100644
index a6badc66cb20..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLMetaImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLMetaImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/xmloff_Draw_XMLMetaImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/xmloff_Draw_XMLMetaImporter.xba
deleted file mode 100644
index 01cd7d4e03bd..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLMetaImporter/xmloff_Draw_XMLMetaImporter.xba
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLMetaImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sTitle As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLMetaImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLMetaImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sTitle = "XMLMetaImporter_Title"
-    vXMLData = Array( _
-        Array("start", "office:document-meta", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:meta", "CDATA", "http://openoffice.org/2000/meta", _
-                "xmlns:dc", "CDATA", "http://purl.org/dc/elements/1.1/"), _
-        Array("start", "office:meta"), _
-        Array("start", "dc:title"), _
-        Array("chars", sTitle), _
-        Array("end", "dc:title"), _
-        Array("end", "office:meta"), _
-        Array("end", "office:document-meta"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oDocInfo As Object
-    Dim title As String
-    out.log("checking of import...")
-    oDocInfo = oDoc.getDocumentInfo()
-    title = oDocInfo.getPropertyValue("Title")
-    out.log("Title: " + title)
-    res = (title = sTitle)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/script.xlb
deleted file mode 100644
index 8377839ac00c..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLSettingsExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLSettingsExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/xmloff_Draw_XMLSettingsExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/xmloff_Draw_XMLSettingsExporter.xba
deleted file mode 100644
index d8ccb9fa0b4f..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsExporter/xmloff_Draw_XMLSettingsExporter.xba
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLSettingsExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLSettingsExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oController As Object
-    Dim oProp, oPropToSet As Boolean
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5 As Variant
-    Dim printXML As Boolean
-
-    printXML = true
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    oController = oDoc.getCurrentController()
-    oProp = oController.getPropertyValue("IsLayerMode")
-    if (oProp = false) then
-        oPropToSet = true
-    else
-        oPropToSet = false
-    endif
-
-    Tag1 = Array("office:document-settings")
-    Tag2 = Array("office:settings")
-    Tag3 = Array("config:config-item-set")
-    Tag4 = Array("config:config-item-map-indexed")
-    Tag5 = Array("config:config-item", "config:name", "IsLayerMode")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2), _
-                Array("TagEnclosed", Tag4, Tag3), _
-                Array("CharsEnclosed", Tag5, LCase(oPropToSet)) _
-             )
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Draw.XMLSettingsExporter", initArgs())
-
-    oController.setPropertyValue("IsLayerMode", oPropToSet)
-    
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "sdraw: StarOffice XML (Draw)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/script.xlb
deleted file mode 100644
index 86c163212d91..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLSettingsImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLSettingsImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/xmloff_Draw_XMLSettingsImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/xmloff_Draw_XMLSettingsImporter.xba
deleted file mode 100644
index 684ecd815318..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLSettingsImporter/xmloff_Draw_XMLSettingsImporter.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLSettingsImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLSettingsImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLSettingsImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-        
-    vXMLData = Array( _
-            Array("start", "office:document-settings", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:config", "CDATA", "http://openoffice.org/2001/config"), _
-            Array("start", "office:settings"), _
-            Array("start", "config:config-item-set", _
-                "config:name", "CDATA", "view-settings"), _
-            Array("start", "config:config-item-map-indexed", _
-                "config:name", "CDATA", "Views"), _
-            Array("start", "config:config-item-map-entry"), _
-            Array("start", "config:config-item", _
-                "config:name", "CDATA", "IsLayerMode", _
-                "config:type", "CDATA", "boolean"), _
-            Array("chars", "true"), _
-            Array("end", "config:config-item"), _
-            Array("end", "config:config-item-map-entry"), _
-            Array("end", "config:config-item-map-indexed"), _
-            Array("end", "config:config-item-set"), _
-            Array("end", "office:settings"), _
-            Array("end", "office:document-settings"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oController As Object
-    oController = oDoc.getCurrentController()
-    res = oController.getPropertyValue("IsLayerMode")
-    out.log("Value after import: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/script.xlb
deleted file mode 100644
index 7e90b5d6abd4..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLStylesExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLStylesExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/xmloff_Draw_XMLStylesExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/xmloff_Draw_XMLStylesExporter.xba
deleted file mode 100644
index cf46fdafd941..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesExporter/xmloff_Draw_XMLStylesExporter.xba
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLStylesExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-Dim counter As Integer
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLStylesExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0), oMSF, oStyleFamilies, oFamily, oStyle As Object
-    Dim oSFNames As Variant
-    Dim oFamilyName As String
-    Dim printXML As Boolean
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim expString As String
-    Dim filter As Variant
-
-    printXML = true
-    expString = "NewStyle"
-    counter = counter +1
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-styles")
-    Tag2 = Array("office:styles")
-    Tag3 = Array("style:style", "style:name", expString)
-    filter = Array( _
-                Array("TagExists", Tag1, Tag2, Tag3), _
-                Array("TagEnclosed", Tag3, Tag2) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Draw.XMLStylesExporter", initArgs())
-
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oSFNames = oStyleFamilies.getElementNames()
-    oFamilyName = oSFNames(0)
-    oFamily = oStyleFamilies.getByName(oFamilyName)
-    oStyle = oDoc.createInstance("com.sun.star.style.Style")
-    oFamily.insertByName(expString, oStyle)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "sdraw: StarOffice XML (Draw)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/script.xlb
deleted file mode 100644
index 1f6b8de5ef0c..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Draw_XMLStylesImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Draw_XMLStylesImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/xmloff_Draw_XMLStylesImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/xmloff_Draw_XMLStylesImporter.xba
deleted file mode 100644
index 4d8793134d31..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Draw/XMLStylesImporter/xmloff_Draw_XMLStylesImporter.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Draw_XMLStylesImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sStyleName, sFamilyName As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Draw.XMLStylesImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createDocument("sdraw", cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLStylesImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sStyleName = "New style for test XMLStylesImporter"
-    sFamilyName = "graphics"
-    vXMLData = Array( _
-        Array("start", "office:document-styles", _
-            "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-            "xmlns:style", "CDATA", "http://openoffice.org/2000/style"), _
-        Array("start", "office:styles"), _
-        Array("start", "style:style", _
-            "style:name", "CDATA", sStyleName, _
-            "style:family", "CDATA", sFamilyName), _
-        Array("end", "style:style"), _
-        Array("end", "office:styles"), _
-        Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oStyleFamilies, oFamily As Object
-    out.log("checking of import...")
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oFamily = oStyleFamilies.getByName(sFamilyName)
-    res = oFamily.hasByName(sStyleName)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/script.xlb
deleted file mode 100644
index 21db72258f7f..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLContentExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLContentExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/xmloff_Impress_XMLContentExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/xmloff_Impress_XMLContentExporter.xba
deleted file mode 100644
index ecae9c11962c..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentExporter/xmloff_Impress_XMLContentExporter.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLContentExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLContentExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDrawPages As Object
-    Dim oDrawPage As Object
-    Dim printXML As Boolean
-    Dim filter As Variant
-    Dim expString As String
-    Dim Tag1, Tag2, Tag3 As Variant
-    
-    printXML = true
-    expString = "NewNameOfDrawPage"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createImpressDocument(cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-content")
-    Tag2 = Array("office:body")
-    Tag3 = Array("draw:page", "draw:name", expString)
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Impress.XMLContentExporter", initArgs())
-
-    oDrawPages = oDoc.getDrawPages()
-    oDrawPage = oDrawPages.getByIndex(0)
-    oDrawPage.setName(expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "simpress: StarOffice XML (Impress)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/script.xlb
deleted file mode 100644
index 3e9ff2fc3259..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLContentImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLContentImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/xmloff_Impress_XMLContentImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/xmloff_Impress_XMLContentImporter.xba
deleted file mode 100644
index 4a2ed5d7f7b7..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLContentImporter/xmloff_Impress_XMLContentImporter.xba
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLContentImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sPageName As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLContentImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Draw.XMLContentImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sPageName = "XMLImporterPage"
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:presentation", "CDATA", "http://openoffice.org/2000/presentation", _
-                "xmlns:svg", "CDATA", "http://openoffice.org/2000/svg", _
-                "xmlns:draw", "CDATA", "http://openoffice.org/2000/drawing", _
-                "office:class", "CDATA", "presentation", _
-                "office:version", "CDATA", "1.0"), _
-            Array("start", "office:body"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sPageName, _
-                "draw:master-page-name", "CDATA", "Default"), _
-            Array("start", "presentation:notes"), _
-            Array("start", "draw:page-thumbnail", _
-                "draw:style-name", "CDATA", "gr1", _
-                "draw:layer", "CDATA", "layout", _
-                "svg:width", "CDATA", "12.768cm", _
-                "svg:height", "CDATA", "9.576cm", _
-                "svg:x", "CDATA", "4.411cm", _
-                "svg:y", "CDATA", "2.794cm", _
-                "presentation:class", "CDATA", "page", _
-                "draw:page-number", "CDATA", "1"), _
-            Array("end", "draw:page-thumbnail"), _
-            Array("start", "draw:text-box", _
-                "presentation:style-name", "CDATA", "Default-notes", _
-                "draw:layer", "CDATA", "layout", _
-                "svg:width", "CDATA", "15.021cm", _
-                "svg:height", "CDATA", "10.63cm", _
-                "svg:x", "CDATA", "3.292cm", _
-                "svg:y", "CDATA", "13.299cm", _
-                "presentation:class", "CDATA", "notes", _
-                "presentation:placeholder", "CDATA", "true"), _
-            Array("end", "draw:text-box"), _
-            Array("end", "presentation:notes"), _
-            Array("end", "draw:page"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim i As Integer
-    Dim res As Boolean
-    Dim oPages, oPage As Object
-    Dim pageName As String
-    res = False
-    out.log("checking of import...")
-    oPages = oDoc.getDrawPages()
-    out.log("Draw pages:")
-    For i = 0 to oPages.getCount() - 1
-        oPage = oPages.getByIndex(i)
-        pageName = oPage.getName()
-        out.log(pageName)
-        If pageName = sPageName then
-            res = True
-        EndIf
-    Next i
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/script.xlb
deleted file mode 100644
index c2bc67de1188..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/xmloff_Impress_XMLExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/xmloff_Impress_XMLExporter.xba
deleted file mode 100644
index 7d7f74a9a5c5..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLExporter/xmloff_Impress_XMLExporter.xba
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDrawPages, oDrawPage As Object
-    Dim printXML As Boolean
-    Dim filter As Variant
-    Dim expString As String
-    Dim Tag1, Tag2, Tag3 As Variant
-
-    printXML = true
-    expString = "NewNameOfDrawPageInserted"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createImpressDocument(cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document")
-    Tag2 = Array("office:body")
-    Tag3 = Array("draw:page", "draw:name", expString)
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Impress.XMLExporter", initArgs())
-
-    oDrawPages = oDoc.getDrawPages()
-    oDrawPages.insertNewByIndex(0)
-    oDrawPage = oDrawPages.getByIndex(0)
-    oDrawPage.setName(expString)
- 
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "simpress: StarOffice XML (Impress)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/script.xlb
deleted file mode 100644
index 156d8a1320c4..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/xmloff_Impress_XMLImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/xmloff_Impress_XMLImporter.xba
deleted file mode 100644
index f2b748ae0932..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLImporter/xmloff_Impress_XMLImporter.xba
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sName As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Impress.XMLImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sName = "XMLImporter"
-    vXMLData = Array( _
-            Array("start", "office:document", _
-                "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-                "xmlns:draw", "CDATA", "http://openoffice.org/2000/drawing"), _
-            Array("start", "office:body"), _
-            Array("start", "draw:page", _
-                "draw:name", "CDATA", sName), _
-            Array("end", "draw:page"), _
-            Array("end", "office:body"), _
-            Array("end", "office:document"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oPages As Object
-    out.log("checking of import...")
-    oPages = oDoc.getDrawPages()
-    res = oPages.hasByName(sName)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/script.xlb
deleted file mode 100644
index 626859cbd89f..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLMetaExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLMetaExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/xmloff_Impress_XMLMetaExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/xmloff_Impress_XMLMetaExporter.xba
deleted file mode 100644
index 35b08c5b9ae6..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaExporter/xmloff_Impress_XMLMetaExporter.xba
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLMetaExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLMetaExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oDocInfo As Object
-    Dim printXML As Boolean
-    Dim expString As String
-    Dim Tag1, Tag2, Tag3 As Variant
-    Dim filter As Variant
-
-    printXML = true
-    expString = "NewTitleOfDrawDocument"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createImpressDocument(cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-meta")
-    Tag2 = Array("office:meta")
-    Tag3 = Array("dc:title")
-    filter = Array( _
-                Array("TagExists", Tag1), _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2), _
-                Array("CharsEnclosed", Tag3, expString) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Impress.XMLMetaExporter", initArgs())
-
-    oDocInfo = oDoc.getDocumentInfo()
-    oDocInfo.setPropertyValue("Title", expString)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "simpress: StarOffice XML (Impress)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/script.xlb
deleted file mode 100644
index d14b4ba77dec..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLMetaImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLMetaImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/xmloff_Impress_XMLMetaImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/xmloff_Impress_XMLMetaImporter.xba
deleted file mode 100644
index 02cc5904d961..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLMetaImporter/xmloff_Impress_XMLMetaImporter.xba
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLMetaImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sTitle As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLMetaImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Impress.XMLMetaImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sTitle = "XMLMetaImporter_Title"
-    vXMLData = Array( _
-        Array("start", "office:document-meta", _
-            "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-            "xmlns:dc", "CDATA", "http://purl.org/dc/elements/1.1/"), _
-        Array("start", "office:meta"), _
-        Array("start", "dc:title"), _
-        Array("chars", sTitle), _
-        Array("end", "dc:title"), _
-        Array("end", "office:meta"), _
-        Array("end", "office:document-meta"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oDocInfo As Object
-    Dim title As String
-    out.log("checking of import...")
-    oDocInfo = oDoc.getDocumentInfo()
-    title = oDocInfo.getPropertyValue("Title")
-    out.log("Title: " + title)
-    res = (title = sTitle)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/script.xlb
deleted file mode 100644
index 68a37fac28ca..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLSettingsExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLSettingsExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/xmloff_Impress_XMLSettingsExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/xmloff_Impress_XMLSettingsExporter.xba
deleted file mode 100644
index e379102d46f3..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsExporter/xmloff_Impress_XMLSettingsExporter.xba
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLSettingsExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLSettingsExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0) As Object
-    Dim oMSF As Object
-    Dim oController As Object
-    Dim oProp, oPropToSet As Boolean
-    Dim printXML As Boolean
-    Dim filter As Variant
-    Dim Tag1, Tag2, Tag3, Tag4, Tag5, Tag6, Tag7 As Variant
-
-    printXML = true
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createImpressDocument(cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    oController = oDoc.getCurrentController()
-    oProp = oController.getPropertyValue("IsLayerMode")
-    if (oProp = false) then
-        oPropToSet = true
-    else
-        oPropToSet = false
-    endif
-
-    Tag1 = Array("office:settings")
-    Tag2 = Array("office:document-settings")
-    Tag3 = Array("config:config-item-set")
-    Tag4 = Array("config:config-item-map-indexed")
-    Tag5 = Array("config:config-item-map-entry")
-    Tag6 = Array("config:config-item")
-    Tag7 = Array("config:config-item","config:name","IsLayerMode")
-    filter = Array( _
-                Array("TagEnclosed", Tag1, Tag2), _
-                Array("TagEnclosed", Tag3, Tag2), _
-                Array("TagEnclosed", Tag4, Tag3), _
-                Array("TagEnclosed", Tag5, Tag4), _
-                Array("TagEnclosed", Tag6, Tag5), _
-                Array("CharsEnclosed", Tag7, LCase(oPropToSet)) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Impress.XMLSettingsExporter", initArgs())
-
-    oController.setPropertyValue("IsLayerMode", oPropToSet)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "simpress: StarOffice XML (Impress)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/script.xlb
deleted file mode 100644
index 9e2d4d8544c2..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLSettingsImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLSettingsImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/xmloff_Impress_XMLSettingsImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/xmloff_Impress_XMLSettingsImporter.xba
deleted file mode 100644
index 63478a532853..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLSettingsImporter/xmloff_Impress_XMLSettingsImporter.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLSettingsImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLSettingsImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Impress.XMLSettingsImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    vXMLData = Array( _
-        Array("start", "office:document-settings", _
-            "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-            "xmlns:xlink", "CDATA", "http://www.w3.org/1999/xlink", _
-            "xmlns:presentation", "CDATA", "http://openoffice.org/2000/presentation", _
-            "xmlns:config", "CDATA", "http://openoffice.org/2001/config", _
-            "office:version", "CDATA", "1.0"), _
-        Array("start", "office:settings"), _
-        Array("start", "config:config-item-map-indexed", _
-            "config:name", "CDATA", "Views"), _
-        Array("start", "config:config-item-map-entry"), _
-        Array("start","config:config-item", _
-            "config:name", "CDATA", "IsLayerMode"), _
-        Array("chars", "true"), _
-        Array("end", "config:config-item"), _
-        Array("end", "config:config-item-map-entry"), _
-        Array("end", "config:config-item-map-indexed"), _
-        Array("end", "office:settings"), _
-        Array("end", "office:document-settings"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oController As Object
-    out.log("checking of import...")
-    oController = oDoc.getCurrentController()
-    res = oController.getPropertyValue("IsLayerMode")
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/script.xlb
deleted file mode 100644
index 7125cbfe7aa1..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLStylesExporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLStylesExporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/xmloff_Impress_XMLStylesExporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/xmloff_Impress_XMLStylesExporter.xba
deleted file mode 100644
index 37c940dbc2cd..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesExporter/xmloff_Impress_XMLStylesExporter.xba
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLStylesExporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-'Required for com.sun.star.document.XFilter
-Global oFilterDescriptor As Variant
-
-'Required for com.sun.star.lang.XInitialization
-Global aInitArgs() As Variant
-
-'Required for com.sun.star.document.XExporter
-Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLStylesExporter
-'*************************************************************************
-On error goto ErrHndl
-    Dim initArgs(0), oMSF, oStyleFamilies, oFamily, oStyle As Object
-    Dim oSFNames As Variant
-    Dim oFamilyName As String
-    Dim printXML As Boolean
-    Dim filter As Variant
-    Dim expString As String
-    Dim Tag1, Tag2, Tag3 As Variant
-    
-    printXML = true
-    expString = "NewStyle"
-    oMSF = getProcessServiceManager()
-    oDoc = utils.createImpressDocument(cObjectName)
-    oDocHandler = oMSF.createInstanceWithArguments("basichelper.DocumentHandler", Array(printXML))
-
-    Tag1 = Array("office:document-styles")
-    Tag2 = Array("office:styles")
-    Tag3 = Array("style:style", "style:name", expString)
-    filter = Array( _
-                Array("TagEnclosed", Tag2, Tag1), _
-                Array("TagEnclosed", Tag3, Tag2) _
-             )
-
-    oDocHandler.initialize(filter)
-
-    initArgs(0) = oDocHandler
-    aInitArgs = initArgs()
-    oObj = oMSF.createInstanceWithArguments("com.sun.star.comp.Impress.XMLStylesExporter", initArgs())
-
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oSFNames = oStyleFamilies.getElementNames()
-    oFamilyName = oSFNames(0)
-    oFamily = oStyleFamilies.getByName(oFamilyName)
-    oStyle = oDoc.createInstance("com.sun.star.style.Style")
-    oFamily.insertByName(expString, oStyle)
-
-    oObj.setSourceDocument(oDoc)
-
-    Dim aFilterDescr(0) As New com.sun.star.beans.PropertyValue
-    aFilterDescr(0).Name = "FilterName"
-    aFilterDescr(0).Value = "simpress: StarOffice XML (Impress)"
-    oFilterDescriptor = aFilterDescr()
-
-    oSrcDocument = oDoc
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Global oDocHandler As Object
-
-Function checkFilter() As Boolean
-    checkFilter = oDocHandler.getByName("XMLIsCorrect")
-    Out.Log(oDocHandler.getByName("XMLCode"))
-End Function
-</script:module>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/script.xlb b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/script.xlb
deleted file mode 100644
index ca13dec7f9c1..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
-<library:library xmlns:library="http://openoffice.org/2000/library" library:name="xmloff_Impress_XMLStylesImporter" library:readonly="false" library:passwordprotected="false">
-"<library:element library:name="xmloff_Impress_XMLStylesImporter"/>
-"</library:library>
diff --git a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/xmloff_Impress_XMLStylesImporter.xba b/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/xmloff_Impress_XMLStylesImporter.xba
deleted file mode 100644
index 9b64c3997631..000000000000
--- a/qadevOOo/tests/basic/mod/xmloff/Impress/XMLStylesImporter/xmloff_Impress_XMLStylesImporter.xba
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="xmloff_Impress_XMLStylesImporter" script:language="StarBasic">
-
-
-'*************************************************************************
-'
-' 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.
-'
-'*************************************************************************
-'*************************************************************************
-
-
-
-' Be sure that all variables are dimensioned:
-option explicit
-
-
-' REQUIRED VARIABLES for interface/service tests:
-
-' Required for com.sun.star.xml.sax.XDocumentHandler
-  Global vXMLData As Variant
-
-' Required for procedure CheckImport
-  Global sStyleName As String
-
-' Required for  com.sun.star.document.XImporter:
-  Global oSrcDocument As Object
-
-
-Sub CreateObj()
-
-'*************************************************************************
-' COMPONENT: 
-' xmloff.Impress.XMLStylesImporter
-'*************************************************************************
-On Error Goto ErrHndl
-    oDoc = utils.createImpressDocument(cObjectName)
-    oObj = createUnoService("com.sun.star.comp.Impress.XMLStylesImporter")
-
-    oSrcDocument = oDoc
-    oObj.setTargetDocument(oDoc)
-
-    sStyleName = "New style for test XMLStylesImporter"
-    vXMLData = Array( _
-        Array("start", "office:document-styles", _
-            "xmlns:office", "CDATA", "http://openoffice.org/2000/office", _
-            "xmlns:style", "CDATA", "http://openoffice.org/2000/style", _
-            "xmlns:fo", "CDATA", "http://www.w3.org/1999/XSL/Format", _
-            "xmlns:table", "CDATA", "http://openoffice.org/2000/table"), _
-        Array("start", "office:styles"), _
-        Array("start", "style:style", _
-            "style:name", "CDATA", sStyleName, _
-            "style:family", "CDATA", "graphics", _
-            "style:parent-style-name", "CDATA", "standard"), _
-        Array("end", "style:style"), _
-        Array("end", "office:styles"), _
-        Array("end", "office:document-styles"))
-Exit Sub
-ErrHndl:
-    Test.Exception()
-End Sub
-
-Function CheckImport() As Boolean
-    Dim res As Boolean
-    Dim oStyleFamilies, oFamily As Object
-    out.log("checking of import...")
-    oStyleFamilies = oDoc.getStyleFamilies()
-    oFamily = oStyleFamilies.getByName("graphics")
-    res = oFamily.hasByName(sStyleName)
-    out.log("checking result: " + res)
-    CheckImport() = res
-End Function
-</script:module>