java: remove unused parameters

Change-Id: I47c618117e079bb2ef90d92c449c8166ea957fa5

91 files changed, 112 insertions, 163 deletions

diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/runner/convwatch/PixelCounter.java
index ef0223a7c1e5..b7723fd779a1 100644
--- a/qadevOOo/runner/convwatch/PixelCounter.java
+++ b/qadevOOo/runner/convwatch/PixelCounter.java
@@ -91,15 +91,10 @@ class graphics_stuff
                 return 0;
         }
 
-    public static void handlesinglepixel(int x, int y, int pixel)
-        {
-        }
-
     public static void countPixel(ImageHelper img, int _x, int _y, int _w, int _h, CountPixel _aPixelCounter)
         {
             for (int y = 0; y < _h; y++) {
                 for (int x = 0; x < _w; x++) {
-                    // handlesinglepixel(x+i, y+j, pixels[j * w + i]);
                     _aPixelCounter.count(img.getPixel(x,y));
                 }
             }
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index ef1e7513db73..2e92a5711868 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -259,7 +259,7 @@ public class APIDescGetter extends DescGetter
     }
 
     protected static DescEntry[] getSubEntries(BufferedReader cvsFile,
-            DescEntry parent, boolean debug)
+            DescEntry parent)
     {
         String line = "";
         String old_ifc_name = "";
@@ -621,7 +621,7 @@ public class APIDescGetter extends DescGetter
                     theEntry.entryName + "'");
         }
 
-        DescEntry[] subEntries = getSubEntries(csvFile, theEntry, debug);
+        DescEntry[] subEntries = getSubEntries(csvFile, theEntry);
 
         theEntry.SubEntryCount = subEntries.length;
         theEntry.SubEntries = subEntries;
@@ -708,7 +708,7 @@ public class APIDescGetter extends DescGetter
             return setErrorDescription(aEntry, "couldn't find file '" + aUrl + "'");
         }
 
-        DescEntry[] subEntries = getSubEntries(csvFile, aEntry, debug);
+        DescEntry[] subEntries = getSubEntries(csvFile, aEntry);
 
         aEntry.SubEntryCount = subEntries.length;
         aEntry.SubEntries = subEntries;
@@ -759,7 +759,7 @@ public class APIDescGetter extends DescGetter
                 System.out.println("## reading from File " + descPath);
             }
 
-            scenario = getScenarioFromDirectory(descPath, job, debug);
+            scenario = getScenarioFromDirectory(descPath, job);
         }
         else
         {
@@ -768,14 +768,13 @@ public class APIDescGetter extends DescGetter
                 System.out.println("## reading from jar");
             }
 
-            scenario = getScenarioFromClassPath(job, debug);
+            scenario = getScenarioFromClassPath(job);
         }
 
         return scenario;
     }
 
-    protected String[] getScenarioFromDirectory(String descPath, String job,
-            boolean debug)
+    protected String[] getScenarioFromDirectory(String descPath, String job)
     {
         String[] modules = null;
         ArrayList<String> componentList = new ArrayList<String>();
@@ -829,7 +828,7 @@ public class APIDescGetter extends DescGetter
 
     }
 
-    protected String[] getScenarioFromClassPath(String job, boolean debug)
+    protected String[] getScenarioFromClassPath(String job)
     {
         String subdir = "/";
 
diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/runner/helper/PropertyHandlerImpl.java
index 873edc4782ed..7fd2fb011e36 100644
--- a/qadevOOo/runner/helper/PropertyHandlerImpl.java
+++ b/qadevOOo/runner/helper/PropertyHandlerImpl.java
@@ -18,7 +18,6 @@
 package helper;
 
 import com.sun.star.inspection.LineDescriptor;
-import com.sun.star.inspection.XPropertyControlFactory;
 import com.sun.star.inspection.XPropertyHandler;
 
 /**
@@ -236,10 +235,4 @@ public class PropertyHandlerImpl implements XPropertyHandler{
         return false;
     }
 
-    /**
-     * This method currently does nothing
-     */
-    public void describePropertyLine(String string, LineDescriptor[] lineDescriptor, XPropertyControlFactory xPropertyControlFactory) {
-    }
-
 }
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java
index 531946d88eb9..a0c93f34896c 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -447,7 +447,7 @@ public class MultiPropertyTest extends MultiMethodTest
          * The method produces new value of the property from the oldValue.
          * It returns the result of ValueChanger.changePValue method.
          * Subclasses can override the method to return their own value,
-         * when the changePValue beahviour is not enough, for example,
+         * when the changePValue behavior is not enough, for example,
          * when oldValue is null.
          */
         protected Object getNewValue(String propName, Object oldValue)
@@ -459,7 +459,7 @@ public class MultiPropertyTest extends MultiMethodTest
         /**
          * The method compares obj1 and obj2. It calls
          * MultiPropertyTest.compare, but subclasses can override to change
-         * the behaviour, since normally compare calls Object.equals method
+         * the behavior, since normally compare calls Object.equals method
          * which is not appropriate in some cases(e.g., structs with equals
          * not overridden).
          */
@@ -471,7 +471,7 @@ public class MultiPropertyTest extends MultiMethodTest
         /**
          * The method returns a String representation of the obj. It calls
          * MultipropertyTest.toString(Object), but subclasses can override
-         * to change the behaviour.
+         * to change the behavior.
          */
         protected String toString(Object obj)
         {
diff --git a/qadevOOo/runner/org/openoffice/RunnerService.java b/qadevOOo/runner/org/openoffice/RunnerService.java
index 521dff7a30bc..d398f209cba4 100644
--- a/qadevOOo/runner/org/openoffice/RunnerService.java
+++ b/qadevOOo/runner/org/openoffice/RunnerService.java
@@ -59,7 +59,7 @@ public class RunnerService implements XJob, XServiceInfo,
      * ct'tor
      * Construct an own office provider for tests
      */
-    public RunnerService(XMultiServiceFactory xMSF) {
+    public RunnerService() {
     }
 
     public Object execute(NamedValue[] args) {
diff --git a/qadevOOo/runner/stats/FatDataBaseOutProducer.java b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
index baa6bb4a4e7a..48fe2062af11 100644
--- a/qadevOOo/runner/stats/FatDataBaseOutProducer.java
+++ b/qadevOOo/runner/stats/FatDataBaseOutProducer.java
@@ -90,11 +90,6 @@ public class FatDataBaseOutProducer extends DataBaseOutProducer {
         return true;
     }
 
-    // check the database afterwards
-    protected boolean checkDataBase(LogWriter log) {
-        return true;
-    }
-
     protected boolean insertEntry(LogWriter log) {
 
         executeSQLCommand("SELECT id AS \"entry.id\", name AS \"entry.name\" FROM entry WHERE name = \"$EntryLongName\";", true);
diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index e13bfcf58c68..a2f0015d1125 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -43,17 +43,15 @@ public class AccessibilityTools {
         return UnoRuntime.queryInterface(XAccessible.class, xObject);
     }
 
-    public static XWindow getCurrentContainerWindow(XMultiServiceFactory msf,
-        XModel xModel) {
-        return getWindow(msf, xModel, true);
+    public static XWindow getCurrentContainerWindow(XModel xModel) {
+        return getWindow(xModel, true);
     }
 
-    public static XWindow getCurrentWindow(XMultiServiceFactory msf,
-        XModel xModel) {
-        return getWindow(msf, xModel, false);
+    public static XWindow getCurrentWindow(XModel xModel) {
+        return getWindow(xModel, false);
     }
 
-    private static XWindow getWindow(XMultiServiceFactory msf, XModel xModel,
+    private static XWindow getWindow(XModel xModel,
         boolean containerWindow) {
         XWindow xWindow = null;
 
diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java
index 97fb2c53fab2..9d48c946ac97 100644
--- a/qadevOOo/runner/util/BasicMacroTools.java
+++ b/qadevOOo/runner/util/BasicMacroTools.java
@@ -49,7 +49,7 @@ public class BasicMacroTools {
                            XComponent xDoc) throws java.lang.Exception {
         try {
             mMSF = msf;
-            mDispProv = makeDispatchProvider(mMSF, xModel);
+            mDispProv = makeDispatchProvider(xModel);
             mParser = makeParser(mMSF);
 
             Object DocLibCont = null;
@@ -82,7 +82,7 @@ public class BasicMacroTools {
                     throws java.lang.Exception {
         try {
             mMSF = msf;
-            mDispProv = makeDispatchProvider(mMSF, xModel);
+            mDispProv = makeDispatchProvider(xModel);
             mParser = makeParser(mMSF);
 
             Object ASLC = null;
@@ -107,8 +107,7 @@ public class BasicMacroTools {
         }
     }
 
-    private static XDispatchProvider makeDispatchProvider(XMultiServiceFactory mMSF,
-                                                          XModel aModel)
+    private static XDispatchProvider makeDispatchProvider(XModel aModel)
                                                    throws java.lang.Exception {
         XController xController = aModel.getCurrentController();
         XFrame xFrame = xController.getFrame();
diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java
index 72ca975c540e..dec23a20f8ae 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -215,12 +215,9 @@ public class SOfficeFactory {
      *
      * @see XChartDocument
      */
-    public XChartDocument createChartDoc(String frameName)
+    public XChartDocument createChartDoc()
         throws com.sun.star.uno.Exception {
 
-//        XComponent oDoc = loadDocument(
-//                            util.utils.getFullTestURL("emptyChart.sds"));
-
         XComponent oDoc = loadDocument("private:factory/schart");
 
         if (oDoc != null) {
diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java
index db99c090b7ab..0df280360c83 100644
--- a/qadevOOo/runner/util/UITools.java
+++ b/qadevOOo/runner/util/UITools.java
@@ -53,14 +53,14 @@ public class UITools {
     public UITools(XMultiServiceFactory msf, XModel xModel)
     {
         mMSF = msf;
-        mXRoot = makeRoot(mMSF, xModel);
+        mXRoot = makeRoot(xModel);
     }
 
     public UITools(XMultiServiceFactory msf, XTextDocument xTextDoc)
     {
         mMSF = msf;
         XModel xModel = UnoRuntime.queryInterface(XModel.class, xTextDoc);
-        mXRoot = makeRoot(mMSF, xModel);
+        mXRoot = makeRoot(xModel);
     }
 
     public UITools(XMultiServiceFactory msf, XWindow xWindow)
@@ -69,9 +69,9 @@ public class UITools {
         mXRoot = makeRoot(xWindow);
     }
 
-    private static XAccessible makeRoot(XMultiServiceFactory msf, XModel aModel)
+    private static XAccessible makeRoot(XModel aModel)
     {
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(msf, aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         return AccessibilityTools.getAccessibleObject(xWindow);
     }
 
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/Job.java b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
index 01a5b717846a..950eee89cfbc 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/Job.java
+++ b/qadevOOo/testdocs/qadevlibs/source/test/Job.java
@@ -85,8 +85,7 @@ public class Job {
 
     }
 
-    public static XSingleServiceFactory __getServiceFactory(String implName,
-                                XMultiServiceFactory multiFactory,
+    public static XSingleServiceFactory __getServiceFactory(XMultiServiceFactory multiFactory,
                                 XRegistryKey regKey) {
     XSingleServiceFactory xSingleServiceFactory = null;
     xSingleServiceFactory = FactoryHelper.getServiceFactory(_Implementation.class,
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 1209ac99af94..9b3a2b54a709 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -459,7 +459,6 @@ public class _XUserInputInterception extends MultiMethodTest {
                 util.DesktopTools.bringWindowToFront(xModel);
 
                 XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                          tParam.getMSF(),
                                           xModel);
 
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
index bd295d1dc9ff..dd19cf8f52a4 100644
--- a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
@@ -34,7 +34,6 @@ public class _XHierarchicalPropertySet extends MultiMethodTest {
         boolean res = true;
 
         if (hpsi != null) {
-            res = checkHPSI(hpsi);
         } else {
             log.println(
                     "The component doesn't provide HierarchicalPropertySetInfo");
@@ -119,13 +118,6 @@ public class _XHierarchicalPropertySet extends MultiMethodTest {
         tRes.tested("setHierarchicalPropertyValue()", res);
     }
 
-    protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) {
-        log.println("Checking the resulting HierarchicalPropertySetInfo");
-        log.println("### NOT yet implemented");
-
-        return true;
-    }
-
     protected boolean checkType(String name, String type, Object value) {
         boolean result = true;
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
index f915f6175c4c..9bcc3436e1c1 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
@@ -34,7 +34,6 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest {
         boolean res = true;
 
         if (hpsi != null) {
-            res = checkHPSI(hpsi);
         } else {
             log.println(
                     "The component doesn't provide HierarchicalPropertySetInfo");
@@ -113,13 +112,6 @@ public class _XMultiHierarchicalPropertySet extends MultiMethodTest {
         tRes.tested("setHierarchicalPropertyValues()", res);
     }
 
-    protected boolean checkHPSI(XHierarchicalPropertySetInfo hpsi) {
-        log.println("Checking the resulting HierarchicalPropertySetInfo");
-        log.println("### NOT yet implemented");
-
-        return true;
-    }
-
     protected boolean checkType(String[] name, String[] type, Object[] value) {
         boolean result = true;
 
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index dbfd307fc195..9c5bb63e46df 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -76,7 +76,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest {
         log.println("try to open contex menu...");
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), docModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(docModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
index 3f81fd01de8d..5fb682a45365 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -157,7 +157,7 @@ public class _XRangeSelection extends MultiMethodTest {
         XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc);
         System.out.println("Name: " + xModel.getCurrentController().getFrame().getName());
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), xModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE  );
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
index a12dc1b1681e..abf5b541efbc 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
@@ -46,7 +46,6 @@ public class _XRemoteContentProviderAcceptor extends MultiMethodTest {
         public void doneWithRemoteContentProviders
                 (XRemoteContentProviderAcceptor xRCPA) {
         }
-        public void disposing (com.sun.star.lang.EventObject obj) {}
 
     }
 
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index fbce478c2d90..e9b41cb1819c 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -156,7 +156,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
         log.println("try to open contex menu...");
         new AccessibilityTools();
 
-        xWindow = AccessibilityTools.getCurrentWindow(xMSF, xModel);
+        xWindow = AccessibilityTools.getCurrentWindow(xModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
index 5269f3320a56..3eed73afe2ee 100644
--- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
@@ -75,10 +75,10 @@ public class NestedRegistry extends TestCase {
     /**
     * Creates a temporary copy of file, which is deleted when VM exits.
     * @param src Source file path.
-    * @param dst Destination file path.
+     * @param dst Destination file path.
     * @throws java.io.IOException If any problems occur during copiing.
     */
-    protected void copyFile(String src, String dst, PrintWriter log)
+    protected void copyFile(String src, String dst)
             throws java.io.IOException {
         File srcF = new File(src) ;
         File dstF = new File(dst) ;
@@ -139,8 +139,8 @@ public class NestedRegistry extends TestCase {
         log.println("creating copies of the registry for XSimpleRegistry");
         try {
             String source = utils.getFullTestDocName("XSimpleRegistry.rdb");
-            copyFile(source, openF, log) ;
-            copyFile(source, mergeF, log) ;
+            copyFile(source, openF) ;
+            copyFile(source, mergeF) ;
         } catch (java.io.IOException e) {
             log.println("Exception occurred while copying files");
             e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java
index 27b1558e6331..b01d3239d91d 100644
--- a/qadevOOo/tests/java/mod/_remotebridge/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/various.java
@@ -135,8 +135,7 @@ public class various extends TestCase {
         * Creates object which can call <code>accept</code> method
         * of the Acceptor object specified.
         */
-        public AcceptorThread(XAcceptor acc, XInstanceProvider xInstProv,
-                XBridgeFactory xBrdgFctr) {
+        public AcceptorThread(XAcceptor acc) {
             this.acc = acc ;
         }
 
@@ -212,7 +211,7 @@ public class various extends TestCase {
             // create own implementation of XInstanceProvider
             XInstanceProvider xInstProv = new MyInstanceProvider(xMSF);
             // create waiting acceptor thread
-            accThread = new AcceptorThread(xAcctr, xInstProv, xBrdgFctr);
+            accThread = new AcceptorThread(xAcctr);
             accThread.start();
             // let the thread sleep
             try {
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index 1b33a5013c08..1c70b16ae621 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -144,7 +144,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase {
             try {
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(
                     AccessibilityTools.getCurrentWindow(
-                        Param.getMSF(), xModel));
+                        xModel));
                 if (xRoot != null) {
                     AccessibilityTools.getAccessibleObjectForRole(
                         xRoot, AccessibleRole.TABLE_CELL, true);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 014c1514ca1b..6e60de59a3c8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -103,7 +103,7 @@ public class ScAccessibleCell extends TestCase {
 
         XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc);
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
index 7e4592aabf26..fa684178317f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
@@ -86,7 +86,7 @@ public class ScAccessibleDocument extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, "");
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index e35d766591cb..ee42b5fefe55 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -155,7 +155,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index ce3f885bab82..059ff1cc7680 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -143,7 +143,7 @@ public class ScAccessiblePageHeader extends TestCase {
                 throw new RuntimeException(e);
             }
             try {
-                XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+                XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
                 if (xRoot != null) {
                     oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index 767c6e6d2ff5..86bee325185d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -137,7 +137,7 @@ public class ScAccessiblePageHeaderArea extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         try {
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index d2494e629775..20863da2ac60 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -167,7 +167,7 @@ public class ScAccessiblePreviewCell extends TestCase {
             try {
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(
                     AccessibilityTools.getCurrentWindow(
-                        Param.getMSF(), xModel));
+                        xModel));
                 if (xRoot != null) {
                     oObj = AccessibilityTools.getAccessibleObjectForRole(
                         xRoot, AccessibleRole.TABLE_CELL, true);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index fcc75f674cff..c70381d33f06 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -248,7 +248,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase {
             try {
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(
                     AccessibilityTools.getCurrentWindow(
-                        Param.getMSF(), xModel));
+                        xModel));
                 if (xRoot != null) {
                     oObj = AccessibilityTools.getAccessibleObjectForRole(
                         xRoot, AccessibleRole.TABLE, "A");
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index f923cd4ae4a0..d7809c99914f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -171,7 +171,7 @@ public class ScAccessiblePreviewTable extends TestCase {
             try {
                 xRoot = AccessibilityTools.getAccessibleObject(
                     AccessibilityTools.getCurrentContainerWindow(
-                        Param.getMSF(), xModel));
+                        xModel));
                 if (xRoot != null) {
                     oObj = AccessibilityTools.getAccessibleObjectForRole(
                         xRoot, AccessibleRole.TABLE);
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
index ac371a92788f..3d6456b70c99 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
@@ -108,7 +108,7 @@ public class ScAccessibleSpreadsheet extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), xModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(xModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE  );
diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java
index 899316452179..785ec8f1c15e 100644
--- a/qadevOOo/tests/java/mod/_sch/AccArea.java
+++ b/qadevOOo/tests/java/mod/_sch/AccArea.java
@@ -49,7 +49,7 @@ public class AccArea extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccArea extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java
index 97cd53f7b6ca..4dc8907a996c 100644
--- a/qadevOOo/tests/java/mod/_sch/AccAxis.java
+++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java
@@ -49,7 +49,7 @@ public class AccAxis extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccAxis extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
index 6d67300fe2c8..733c60d958c7 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
@@ -49,7 +49,7 @@ public class AccDataPoint extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccDataPoint extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
index 0d3012fec7f8..4a6fbad30243 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
@@ -49,7 +49,7 @@ public class AccDataSeries extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccDataSeries extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
index 711f41a090c8..03c23b1f37d3 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
@@ -49,7 +49,7 @@ public class AccDiagram extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccDiagram extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java
index 79f874b1899a..e678189fb123 100644
--- a/qadevOOo/tests/java/mod/_sch/AccFloor.java
+++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java
@@ -50,7 +50,7 @@ public class AccFloor extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -85,7 +85,7 @@ public class AccFloor extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java
index 74d93d649590..6007c92c1681 100644
--- a/qadevOOo/tests/java/mod/_sch/AccGrid.java
+++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java
@@ -49,7 +49,7 @@ public class AccGrid extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccGrid extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java
index 5ca79a582cda..539f27b08ecc 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegend.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java
@@ -49,7 +49,7 @@ public class AccLegend extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccLegend extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
index 1fd5649bcc07..ae2f8b55ec15 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
@@ -49,7 +49,7 @@ public class AccLegendEntry extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccLegendEntry extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
index a3fb6af8db2f..bca4797461ed 100644
--- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
+++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
@@ -50,7 +50,7 @@ public class AccStatisticsObject extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
             log.println("Display MeanValue");
             XPropertySet diagProps = UnoRuntime.queryInterface(XPropertySet.class, xChartDoc.getDiagram());
             diagProps.setPropertyValue("MeanValue",new Boolean(true));
@@ -66,7 +66,7 @@ public class AccStatisticsObject extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java
index 36e434ff8638..526f0188cf5e 100644
--- a/qadevOOo/tests/java/mod/_sch/AccTitle.java
+++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java
@@ -49,7 +49,7 @@ public class AccTitle extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -62,7 +62,7 @@ public class AccTitle extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole(
diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java
index 366b4086f6f4..890d69d92c4f 100644
--- a/qadevOOo/tests/java/mod/_sch/AccWall.java
+++ b/qadevOOo/tests/java/mod/_sch/AccWall.java
@@ -50,7 +50,7 @@ public class AccWall extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
@@ -85,7 +85,7 @@ public class AccWall extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
index 66e1ea2cd016..0c40cbe520af 100644
--- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
@@ -50,7 +50,7 @@ public class AccessibleDocumentView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT);
@@ -108,7 +108,7 @@ public class AccessibleDocumentView extends TestCase {
         SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF());
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
index 9badd24576eb..4e5efac69a74 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
@@ -63,7 +63,7 @@ public class ChXChartAxis extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java
index 938dd81ae982..f3341bd9b709 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java
@@ -51,7 +51,7 @@ public class ChXChartData extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
index a8d7359cefc0..f79ca800f572 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
@@ -54,7 +54,7 @@ public class ChXChartDataArray extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
index dc517a1542e8..4730be8e9e02 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
@@ -113,9 +113,9 @@ public class ChXChartDocument extends TestCase {
 
         try {
             log.println("creating a chartdocument");
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
             log.println("Waiting before opening second document");
-            doc2 = SOF.createChartDoc(null);
+            doc2 = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java
index 2eaf909325c3..9a04e9a1a82c 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java
@@ -62,7 +62,7 @@ public class ChXChartView extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java
index 2cd6045e2548..aa9a78e5ddb1 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java
@@ -58,7 +58,7 @@ public class ChartGrid extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java
index 048e4b3d8086..5f20dac3681e 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartLine.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java
@@ -57,7 +57,7 @@ public class ChartLine extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java
index 200a82ac0b10..1556800e6f02 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java
@@ -69,7 +69,7 @@ public class ChartTitle extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch (com.sun.star.uno.Exception e) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
index 650db26bf639..14dc7631a6af 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
@@ -100,7 +100,7 @@ public class AccessibleDrawDocumentView extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow (
-                            Param.getMSF(),aModel);
+                            aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         //com.sun.star.accessibility.AccessibleRole
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
index 0529cd2e20c7..ae830123c16a 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
@@ -66,7 +66,7 @@ public class AccessibleOutlineView extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow (
-                        Param.getMSF(),aModel);
+                        aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT);
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
index 4f00e4f4a861..da7c9ff8c2dc 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
@@ -73,7 +73,7 @@ public class AccessibleSlideView extends TestCase {
         shortWait();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow (
-                                Param.getMSF(),aModel);
+                                aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 02d68a7a2b49..f58c9b30f10b 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -109,7 +109,7 @@ public class SmEditAccessible extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
index 73a335c93cba..0ad4873e237f 100644
--- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
@@ -111,7 +111,7 @@ public class SmGraphicAccessible extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
index a0f585e51937..b32b949967bd 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
@@ -80,7 +80,7 @@ public class AccessibleControlShape extends TestCase {
 
         new AccessibilityTools();
         utils.shortWait(5000);
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE);
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
index 8dd456f282ba..6650bb477424 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
@@ -64,7 +64,7 @@ public class AccessibleEditableTextPara extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
index 5c55daa5317e..ca795805ed12 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
@@ -86,7 +86,7 @@ public class AccessibleGraphicShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
index 3ed89c4dceb9..7868b126bd8f 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
@@ -107,7 +107,7 @@ public class AccessibleOLEShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
index 33f15a334e71..7cb5db9ee976 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
@@ -81,7 +81,7 @@ public class AccessiblePageShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
index 5bf17e1098bc..e14278352131 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java
@@ -106,7 +106,7 @@ public class AccessiblePresentationGraphicShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
 //        oObj = at.getAccessibleObjectForRole
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
index 86ae386ac39d..e38d0be52eb1 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java
@@ -114,7 +114,7 @@ public class AccessiblePresentationOLEShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
         AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
index ff062703ae85..21af46fff40c 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java
@@ -101,7 +101,7 @@ public class AccessiblePresentationShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
index b6be757523ab..1c4a9e848f48 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
@@ -85,7 +85,7 @@ public class AccessibleShape extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow (aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
index 4a45f3f2b1e8..5e0ef45823fd 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
@@ -117,7 +117,7 @@ public class SwAccessibleDocumentPageView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT );
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
index d4f3a54372aa..6a44cb9c86a4 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
@@ -98,7 +98,7 @@ public class SwAccessibleDocumentView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
index 5ab4ba0640f6..3b0eb2bf3d58 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java
@@ -115,7 +115,7 @@ public class SwAccessibleEndnoteView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
index b1626264686a..ae1928810164 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
@@ -128,7 +128,7 @@ public class SwAccessibleFooterView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
index c84d3e34b6c1..6009a8e8eaef 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java
@@ -116,7 +116,7 @@ public class SwAccessibleFootnoteView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
index 1789a086229f..6c2edb6a70fa 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
@@ -118,7 +118,7 @@ public class SwAccessibleHeaderView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
index d473fd9f848e..88587d79873c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
@@ -172,7 +172,7 @@ public class SwAccessiblePageView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
index 69bbddac572f..1761527d2681 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
@@ -70,7 +70,7 @@ public class SwAccessibleParagraphView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
index ffd2d9239ed8..80c908a8371d 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
@@ -84,7 +84,7 @@ public class SwAccessibleTableCellView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
index c6a8d23739f0..34152dbb400d 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
@@ -85,7 +85,7 @@ public class SwAccessibleTableView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
index 51bd95517687..611d2edfa9be 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
@@ -69,7 +69,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
index 0a131e411ecf..cfb3f000c213 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
@@ -102,7 +102,7 @@ public class SwAccessibleTextFrameView extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME);
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
index b3af45ec1ed4..8802056e7d80 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
@@ -91,7 +91,7 @@ public class SwAccessibleTextGraphicObject extends TestCase {
 
         new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(aModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
index c06cf952d2d3..dd0efb327a79 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
@@ -76,7 +76,6 @@ public class AccessibleDropDownComboBox extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(
-                                  Param.getMSF(),
                                   xTextDoc);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
index a1ca56fa4dd3..4f3e88021f0b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
@@ -77,7 +77,6 @@ public class AccessibleDropDownListBox extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                  Param.getMSF(),
                                   xTextDoc);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
index 32c784b3a71d..cf2b424c76d7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
@@ -142,7 +142,6 @@ public class AccessiblePopupMenu extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                  tParam.getMSF(),
                                   aModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
index 45b0d67e3762..a493590b19a4 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
@@ -142,7 +142,6 @@ public class AccessibleScrollBar extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                  tParam.getMSF(),
                                   aModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
index 5f980638b387..80d8ae461340 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
@@ -144,7 +144,6 @@ public class AccessibleStatusBarItem extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(
-                                  tParam.getMSF(),
                                   aModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
index acb3bab3bc27..22e32670870c 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
@@ -151,7 +151,6 @@ public class AccessibleToolBoxItem extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(
-                                  tParam.getMSF(),
                                   aModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
index 64d7e34a0fa3..d755471254ca 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
@@ -157,7 +157,6 @@ public class AccessibleWindow extends TestCase {
         new AccessibilityTools();
 
         XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                  tParam.getMSF(),
                                   aModel);
 
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
index c04e7dc39fbd..643374cae18e 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java
@@ -73,7 +73,7 @@ public class XMLContentExporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java
index 4365ed9525df..9830a6699a76 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java
@@ -71,7 +71,7 @@ public class XMLContentImporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
index c24c9a5edb3f..b93689caee55 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java
@@ -73,7 +73,7 @@ public class XMLExporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java
index f18cd3bad74a..1e370a0b0c9f 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java
@@ -71,7 +71,7 @@ public class XMLImporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
index 4a61f37d3415..76718a42b959 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java
@@ -72,7 +72,7 @@ public class XMLStylesExporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );
diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java
index 99e6907e3296..c4c22c9184c3 100644
--- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java
+++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java
@@ -69,7 +69,7 @@ public class XMLStylesImporter extends TestCase {
 
         try {
             log.println( "creating a chartdocument" );
-            xChartDoc = SOF.createChartDoc(null);
+            xChartDoc = SOF.createChartDoc();
         } catch ( Exception e ) {
             // Some exception occurs.FAILED
             e.printStackTrace( log );