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