java: remove some casting in lib.TestParameters#getMSF

where the return value is always cast to XMultiServiceFactory,
so just do the cast in the method and avoid noise at the call sites.

Change-Id: I3a2e06ac6edb3c6021eda6442032db57aaa22e13

60 files changed, 112 insertions, 116 deletions

diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index 63eb4c57828e..c607342936cd 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -1134,7 +1134,7 @@ public class _XAccessibleText extends MultiMethodTest {
             String cbText = null;
 
             try {
-                cbText = util.SysUtils.getSysClipboardText((XMultiServiceFactory)tParam.getMSF());
+                cbText = util.SysUtils.getSysClipboardText(tParam.getMSF());
             } catch (com.sun.star.uno.Exception e) {
                 log.println("Couldn't access system clipboard :");
                 e.printStackTrace(log);
@@ -1150,7 +1150,7 @@ public class _XAccessibleText extends MultiMethodTest {
                 res &= locRes;
 
                 try {
-                    cbText = util.SysUtils.getSysClipboardText((XMultiServiceFactory)tParam.getMSF());
+                    cbText = util.SysUtils.getSysClipboardText(tParam.getMSF());
                 } catch (com.sun.star.uno.Exception e) {
                     log.println("Couldn't access system clipboard :");
                     e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
index 1358e7c3d0a6..af25feb0d61b 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
@@ -167,7 +167,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
             protected Object getNewValue(String p, Object v) {
                 Object newValue = null;
                 try {
-                    newValue = ((XMultiServiceFactory)tParam.getMSF()).createInstance(
+                    newValue = tParam.getMSF().createInstance(
                                     "com.sun.star.util.NumberFormatsSupplier");
                 } catch (com.sun.star.uno.Exception e) {}
                 return newValue;
diff --git a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
index 3186ec53100f..993384e5aa0d 100644
--- a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
+++ b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
@@ -49,7 +49,7 @@ public class _XMessageBoxFactory extends MultiMethodTest {
             com.sun.star.awt.MessageBoxType.ERRORBOX, 1, "The Title",
             "The Message");
         final UITools tools = new UITools(
-            (XMultiServiceFactory) tParam.getMSF(),
+            tParam.getMSF(),
             UnoRuntime.queryInterface(XWindow.class, mb));
         final boolean[] done = new boolean[] { false };
         final boolean[] good = new boolean[] { false };
diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
index 106b67b7c750..4063b0cb080a 100644
--- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
+++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
@@ -38,7 +38,7 @@ public class _XScrollBar extends MultiMethodTest {
     com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener();
 
     public void _addAdjustmentListener() {
-        util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(),
+        util.FormTools.switchDesignOf(tParam.getMSF(),
                                  (XTextDocument) tEnv.getObjRelation("Document"));
         shortWait();
         oObj.addAdjustmentListener(listener);
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
index 2bec1d15c68f..ecae658fe56b 100644
--- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
+++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
@@ -37,7 +37,7 @@ public class _XSpinValue extends MultiMethodTest {
     com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener();
 
     public void _addAdjustmentListener() {
-        util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(),
+        util.FormTools.switchDesignOf(tParam.getMSF(),
                                  (XTextDocument) tEnv.getObjRelation("Document"));
         shortWait();
         oObj.addAdjustmentListener(listener);
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
index af2f9b251aac..d104be99410d 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
@@ -97,7 +97,7 @@ public class _XTopWindow extends MultiMethodTest {
 
 
     protected void before() {
-        aTextDoc = util.WriterTools.createTextDoc((XMultiServiceFactory)tParam.getMSF());
+        aTextDoc = util.WriterTools.createTextDoc(tParam.getMSF());
     }
 
     /**
@@ -164,7 +164,7 @@ public class _XTopWindow extends MultiMethodTest {
 
         try {
             menu = UnoRuntime.queryInterface(XMenuBar.class,
-                ((XMultiServiceFactory)tParam.getMSF()).
+                tParam.getMSF().
                 createInstance("com.sun.star.awt.MenuBar")) ;
         } catch (com.sun.star.uno.Exception e) {
             log.println("Can't instanciate MenuBar service") ;
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 697eeafb5bef..885c699b671c 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -464,7 +464,7 @@ public class _XUserInputInterception extends MultiMethodTest {
                 util.DesktopTools.bringWindowToFront(xModel);
 
                 XWindow xWindow = AccessibilityTools.getCurrentWindow(
-                                          (XMultiServiceFactory) tParam.getMSF(),
+                                          tParam.getMSF(),
                                           xModel);
 
                 XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
index ebd98f3f5e20..f27dd3ba7f61 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
@@ -146,13 +146,13 @@ public class _XBridgeFactory extends MultiMethodTest {
         // first creating a connection
         try {
             XInterface x = (XInterface)
-                ((XMultiServiceFactory)tParam.getMSF()).createInstance
+                tParam.getMSF().createInstance
                 ("com.sun.star.connection.Connector") ;
 
             XConnector xCntr = UnoRuntime.queryInterface
                 (XConnector.class, x) ;
 
-            x = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            x = (XInterface) tParam.getMSF().createInstance
                 ("com.sun.star.connection.Acceptor") ;
 
             XAcceptor xAccptr = UnoRuntime.queryInterface(
diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
index bc7656dc87f4..22e191fe01a5 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
@@ -148,7 +148,7 @@ public class _XUnoUrlResolver extends MultiMethodTest {
         connectStr += curPort;
 
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
 
             // get the bridge factory
             XBridgeFactory xBrdgFctr = UnoRuntime.queryInterface(XBridgeFactory.class,
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
index 9ecb306b4bb4..c55c4579a918 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
@@ -96,7 +96,7 @@ public class _XBackend extends MultiMethodTest {
 
         try {
             XStringSubstitution sts = createStringSubstitution(
-                                              (XMultiServiceFactory) tParam.getMSF());
+                                              tParam.getMSF());
             String ent = sts.getSubstituteVariableValue("$(inst)") +
                          "/share/registry";
             XUpdateHandler aHandler = oObj.getUpdateHandler(
@@ -128,7 +128,7 @@ public class _XBackend extends MultiMethodTest {
 
         try {
             XStringSubstitution sts = createStringSubstitution(
-                                              (XMultiServiceFactory) tParam.getMSF());
+                                              tParam.getMSF());
             String ent = sts.getSubstituteVariableValue("$(inst)") +
                          "/share/registry";
             XLayer[] Layers = oObj.listLayers(
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
index 45deb0a4a19d..44271e10cb4d 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
@@ -93,19 +93,19 @@ public class _XLayerHandler extends MultiMethodTest {
             oObj.endNode();
             oObj.endLayer();
 
-            Object LayerParser = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+            Object LayerParser = tParam.getMSF().createInstance(
                                          "com.sun.star.comp.configuration.backend.xml.LayerParser");
 
             XActiveDataSink xSink = UnoRuntime.queryInterface(
                                             XActiveDataSink.class, LayerParser);
-            Object fileacc = ((XMultiServiceFactory) tParam.getMSF()).createInstance(
+            Object fileacc = tParam.getMSF().createInstance(
                                      "com.sun.star.comp.ucb.SimpleFileAccess");
             XSimpleFileAccess simpleAccess = UnoRuntime.queryInterface(
                                                      XSimpleFileAccess.class,
                                                      fileacc);
 
             String filename = util.utils.getOfficeTemp(
-                                      (XMultiServiceFactory) tParam.getMSF()) +
+                                      tParam.getMSF()) +
                               "LayerWriter.xcu";
             log.println("Going to parse: " + filename);
 
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
index b4fb0be0bd9a..ec849a0e432f 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
@@ -181,7 +181,7 @@ public class _XMultiLayerStratum extends MultiMethodTest {
 
         try {
             String ent = util.utils.getOfficeURL(
-                                 (XMultiServiceFactory) tParam.getMSF()) +
+                                 tParam.getMSF()) +
                          "/../share/registry";
             String UpdateLayerID = oObj.getUpdateLayerId(
                                            "org.openoffice.Office.Linguistic", ent);
@@ -224,7 +224,7 @@ public class _XMultiLayerStratum extends MultiMethodTest {
 
         try {
             String ent = util.utils.getOfficeURL(
-                                 (XMultiServiceFactory) tParam.getMSF()) +
+                                 tParam.getMSF()) +
                          "/../share/registry";
             String[] LayerIDs = oObj.listLayerIds("org.openoffice.Office.Jobs",
                                                   ent);
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
index b0bc8f5b3368..873270a65cc0 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
@@ -240,7 +240,7 @@ public class _XSchema extends MultiMethodTest {
         XSimpleFileAccess simpleAccess = null;
         XInputStream xStream = null;
         try {
-            Object fileacc = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.comp.ucb.SimpleFileAccess");
+            Object fileacc = tParam.getMSF().createInstance("com.sun.star.comp.ucb.SimpleFileAccess");
             simpleAccess = UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc);
             log.println("Going to parse: "+filename);
             xStream = simpleAccess.openFileRead(filename);
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index 2d7b9045c28a..357c56be0a59 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -124,14 +124,13 @@ public class _XAcceptor extends MultiMethodTest {
 
         // creating services requierd
         try {
-            Object oConnector = ((XMultiServiceFactory)tParam.getMSF()).
+            Object oConnector = (tParam.getMSF()).
                 createInstance("com.sun.star.connection.Connector") ;
 
             xConnector = UnoRuntime.queryInterface
                 (XConnector.class, oConnector) ;
 
-            XInterface acceptor = (XInterface) ((XMultiServiceFactory)
-                tParam.getMSF()).createInstance
+            XInterface acceptor = (XInterface) tParam.getMSF().createInstance
                 ("com.sun.star.connection.Acceptor") ;
 
             dupAcceptor = UnoRuntime.queryInterface
diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java
index dca84f120954..e7447e8403fa 100644
--- a/qadevOOo/tests/java/ifc/connection/_XConnector.java
+++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java
@@ -114,8 +114,7 @@ public class _XConnector extends MultiMethodTest {
 
         // create the acceptor
         try {
-            x = (XInterface) (
-                (XMultiServiceFactory)tParam.getMSF()).createInstance
+            x = (XInterface) tParam.getMSF().createInstance
                 ("com.sun.star.connection.Acceptor") ;
         } catch (com.sun.star.uno.Exception e) {
             e.printStackTrace(log) ;
diff --git a/qadevOOo/tests/java/ifc/container/_XSet.java b/qadevOOo/tests/java/ifc/container/_XSet.java
index 886468f20d30..743a894f5d04 100644
--- a/qadevOOo/tests/java/ifc/container/_XSet.java
+++ b/qadevOOo/tests/java/ifc/container/_XSet.java
@@ -54,7 +54,7 @@ public class _XSet extends MultiMethodTest {
     public void _insert() {
         boolean res = true ;
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             element = xMSF.createInstance(
                             "com.sun.star.reflection.TypeDescriptionProvider");
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
index ff042e7d754e..8153be576818 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
@@ -71,7 +71,7 @@ public class _XDispatchProvider extends MultiMethodTest {
         url.Complete = dispatchUrl;
         try {
             XURLTransformer xParser=UnoRuntime.queryInterface(XURLTransformer.class,
-                ((XMultiServiceFactory)tParam.getMSF()).createInstance
+                tParam.getMSF().createInstance
                     ("com.sun.star.util.URLTransformer"));
             // Because it's an in/out parameter we must use an array of
             // URL objects.
@@ -105,7 +105,7 @@ public class _XDispatchProvider extends MultiMethodTest {
         try {
             log.println("Parsing URL");
             XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class,
-                ((XMultiServiceFactory)tParam.getMSF()).createInstance
+                tParam.getMSF().createInstance
                     ("com.sun.star.util.URLTransformer"));
             // Because it's an in/out parameter we must use an array of
             // URL objects.
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
index b166288a4bb4..beff5a6f906e 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
@@ -74,7 +74,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
         oObj.startRecording(xFrame);
 
         log.println("dispatch calles via API must be recorded");
-        dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText");
+        dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText");
 
         PropertyValue prop = new PropertyValue();
         prop.Name = "Text";
@@ -124,7 +124,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
         oObj.startRecording(xFrame);
 
         // positve test
-        dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText");
+        dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText");
 
         PropertyValue prop = new PropertyValue();
         prop.Name = "Text";
@@ -155,7 +155,7 @@ public class _XDispatchRecorder extends MultiMethodTest {
 
         oObj.startRecording(xFrame);
 
-        dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText");
+        dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText");
 
         PropertyValue prop = new PropertyValue();
         prop.Name = "Text";
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
index 7a868c9dd15c..4c529b7c968d 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
@@ -74,13 +74,13 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
      * service created for obtaining document's frame.
      */
     protected void before() {
-        SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF());
+        SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
 
         try {
             log.println( "creating a text document" );
             xTextDoc = SOF.createTextDoc(null);
 
-            Object inst = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object inst = tParam.getMSF().createInstance
                 ("com.sun.star.frame.Desktop");
             desktop = UnoRuntime.queryInterface
                 (XDesktop.class, inst);
@@ -163,7 +163,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
         boolean res = true;
         if (recorder == null) {
             try {
-                Object inst = ((XMultiServiceFactory) tParam.getMSF()).createInstance
+                Object inst = tParam.getMSF().createInstance
                     ("com.sun.star.comp.framework.DispatchRecorder");
                 recorder = UnoRuntime.queryInterface
                     (XDispatchRecorder.class, inst);
@@ -182,7 +182,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest {
 
         XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, fr);
 
-        URL dispURL = utils.parseURL((XMultiServiceFactory) tParam.getMSF(), ".uno:InsertText");
+        URL dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText");
 
         XDispatch xDisp = xDispProv.queryDispatch(dispURL,"",0);
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index 17f3d4022437..751b773c13a8 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -94,13 +94,13 @@ public class _XFrameLoader extends MultiMethodTest {
         frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ;
 
         if (frame == null) {
-            SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() );
+            SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
 
             try {
                 log.println( "creating a textdocument" );
                 frameSup = SOF.createTextDoc( null );
 
-                Object oDsk = ((XMultiServiceFactory)tParam.getMSF())
+                Object oDsk = tParam.getMSF()
                         .createInstance("com.sun.star.frame.Desktop") ;
                 XDesktop dsk = UnoRuntime.queryInterface(XDesktop.class, oDsk) ;
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XStorable.java b/qadevOOo/tests/java/ifc/frame/_XStorable.java
index 635826d4eec2..b3bf9f317c23 100644
--- a/qadevOOo/tests/java/ifc/frame/_XStorable.java
+++ b/qadevOOo/tests/java/ifc/frame/_XStorable.java
@@ -130,7 +130,7 @@ public class _XStorable extends MultiMethodTest {
     public void _storeAsURL() {
         // getting an url to store
         String url = utils.getOfficeTemp(
-                                (XMultiServiceFactory)tParam.getMSF());
+                                tParam.getMSF());
 
         if (url != null) {
             url += "xstorable.store.as.test";
@@ -158,7 +158,7 @@ public class _XStorable extends MultiMethodTest {
     public void _storeToURL() {
         // getting an url to store
         String url = utils.getOfficeTemp(
-                                (XMultiServiceFactory)tParam.getMSF());
+                                tParam.getMSF());
 
         if (url != null) {
             url += "xstorable.store.as.test";
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index db8b06a5321e..8760149b2744 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -80,7 +80,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
         }
 
         SOfficeFactory SOF = SOfficeFactory.getFactory(
-                             (XMultiServiceFactory)tParam.getMSF() );
+                             tParam.getMSF() );
 
         XURLTransformer xURLTrans = null;
 
@@ -90,15 +90,13 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
                 log.println( "creating a textdocument" );
                 frameSup = SOF.createTextDoc( null );
 
-                Object oDsk = (
-                    (XMultiServiceFactory)tParam.getMSF()).createInstance
+                Object oDsk = tParam.getMSF().createInstance
                     ("com.sun.star.frame.Desktop") ;
                 XDesktop dsk = UnoRuntime.queryInterface
                     (XDesktop.class, oDsk) ;
                 frame = dsk.getCurrentFrame() ;
 
-                Object o = (
-                    (XMultiServiceFactory)tParam.getMSF()).createInstance
+                Object o = tParam.getMSF().createInstance
                     ("com.sun.star.util.URLTransformer") ;
                 xURLTrans = UnoRuntime.queryInterface
                     (XURLTransformer.class, o) ;
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 4bb7acff0f39..9991ca8c7ed8 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -74,7 +74,7 @@ public class _XCalendar extends MultiMethodTest {
         try {
             locData = UnoRuntime.queryInterface(
                 XLocaleData.class,
-                    ((XMultiServiceFactory)tParam.getMSF()).createInstance(
+                    tParam.getMSF().createInstance(
                     "com.sun.star.i18n.LocaleData"));
         } catch (com.sun.star.uno.Exception e) {
 
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
index 7f89b7d93a9b..2b4a6d00b97a 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
@@ -45,7 +45,7 @@ public class _XExtendedCalendar extends MultiMethodTest {
         try {
             locData = UnoRuntime.queryInterface(
                 XLocaleData.class,
-                    ((XMultiServiceFactory)tParam.getMSF()).createInstance(
+                    tParam.getMSF().createInstance(
                     "com.sun.star.i18n.LocaleData"));
         } catch (com.sun.star.uno.Exception e) {
 
diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
index b6118c1082fc..85aaad60b8e4 100644
--- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java
+++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
@@ -116,7 +116,7 @@ public class _XPersistObject extends MultiMethodTest {
                 XPropertySetInfo objpsi = objps.getPropertySetInfo();
                 Property[] objprops = objpsi.getProperties();
 
-                Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname);
+                Object oCopy = tParam.getMSF().createInstance(sname);
 
                 XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy);
 
@@ -156,7 +156,7 @@ public class _XPersistObject extends MultiMethodTest {
                     bResult &= locRes;
                 }
             } else {
-                Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname);
+                Object oCopy = tParam.getMSF().createInstance(sname);
                 XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy);
 
                 persCopy.read(iStream);
@@ -199,17 +199,17 @@ public class _XPersistObject extends MultiMethodTest {
     */
     protected void initPipe() {
         try {
-            Object aPipe = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object aPipe = tParam.getMSF().createInstance
                 ("com.sun.star.io.Pipe");
-            Object istream = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object istream = tParam.getMSF().createInstance
                 ("com.sun.star.io.ObjectInputStream");
-            Object ostream = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object ostream = tParam.getMSF().createInstance
                 ("com.sun.star.io.ObjectOutputStream");
 
             // Now the objects that aren't described anywhere
-            Object mistream = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object mistream = tParam.getMSF().createInstance
                 ("com.sun.star.io.MarkableInputStream");
-            Object mostream = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object mostream = tParam.getMSF().createInstance
                 ("com.sun.star.io.MarkableOutputStream");
 
             XActiveDataSink xdSi = UnoRuntime.queryInterface(XActiveDataSink.class, istream);
diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
index ae6de212538e..396e6bb23957 100644
--- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
+++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
@@ -82,11 +82,11 @@ public class _XImplementationLoader extends MultiMethodTest {
         XRegistryKey key ;
         XSimpleRegistry xReg = null ;
 
-        String tmpDir = util.utils.getOfficeTempDir((XMultiServiceFactory)tParam.getMSF());
+        String tmpDir = util.utils.getOfficeTempDir(tParam.getMSF());
 
         try {
             xReg = RegistryTools.createRegistryService
-                ((XMultiServiceFactory)tParam.getMSF()) ;
+                (tParam.getMSF()) ;
 
             xReg.open(tmpDir + "XImpLoader_tmp.rdb", false, true) ;
 
diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
index 306c25883fe6..ce69886839ab 100644
--- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
+++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
@@ -72,7 +72,7 @@ public class _XIdlReflection extends MultiMethodTest{
         Object obj = null;
 
         try {
-            obj = ((XMultiServiceFactory)tParam.getMSF()).
+            obj = tParam.getMSF().
                                     createInstance("com.sun.star.io.Pipe") ;
         } catch (com.sun.star.uno.Exception e) {
             log.println("Can't create object");
diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
index b0e76a11585d..e3d035c55cc9 100644
--- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
+++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
@@ -71,10 +71,10 @@ public class _XImplementationRegistration extends MultiMethodTest {
         String name = null;
 
         try {
-            name = utils.getOfficeTempDir((XMultiServiceFactory)tParam.getMSF()) +
+            name = utils.getOfficeTempDir(tParam.getMSF()) +
                 "XImplementationRegistration_tmp.rdb";
             reg = RegistryTools.openRegistry
-                (name, (XMultiServiceFactory)tParam.getMSF()) ;
+                (name, tParam.getMSF()) ;
 
             oObj.registerImplementation(loader, url, reg) ;
 
diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
index f7a6607460ec..79a6edfeff74 100644
--- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
+++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
@@ -234,7 +234,7 @@ public class _XSimpleRegistry extends MultiMethodTest {
         XSimpleRegistry reg = null;
 
         try {
-            reg = RegistryTools.createRegistryService((XMultiServiceFactory) tParam.getMSF());
+            reg = RegistryTools.createRegistryService(tParam.getMSF());
         } catch (com.sun.star.uno.Exception e) {
             log.print("Can't create registry service: ");
             e.printStackTrace(log);
diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
index ce389b1c2156..63daab6f2619 100644
--- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
+++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
@@ -272,7 +272,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
         requiredMethod("insertEntry()");
 
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             attachedObject = xMSF.createInstance
                 ( "com.sun.star.uno.NamingService" );
         } catch( com.sun.star.uno.Exception e ) {
diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java
index adc2843eeeb5..0cff3d08117b 100644
--- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java
+++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java
@@ -63,7 +63,7 @@ public class _XInvocationAdapterFactory extends MultiMethodTest {
         XInvocation xInv = null ;
         XMultiServiceFactory xMSF = null;
         try {
-            xMSF = (XMultiServiceFactory)tParam.getMSF();
+            xMSF = tParam.getMSF();
             Object[] args = {xMSF.createInstance
                 ("com.sun.star.io.Pipe")};
 
diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java
index 2ed17685667b..636c6578f2e4 100644
--- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java
+++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java
@@ -63,7 +63,7 @@ public class _XInvocationAdapterFactory2 extends MultiMethodTest {
         XInvocation xInv = null ;
         XMultiServiceFactory xMSF = null;
         try {
-            xMSF = (XMultiServiceFactory)tParam.getMSF();
+            xMSF = tParam.getMSF();
             Object[] args = {xMSF.createInstance
                 ("com.sun.star.io.Pipe")};
 
diff --git a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java
index 8506da931cf3..7f38d055159e 100644
--- a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java
+++ b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java
@@ -52,7 +52,7 @@ public class _XTypeConverter extends MultiMethodTest {
     * @see com.sun.star.container.XSet
     */
     public void _convertTo() {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ;
+        XMultiServiceFactory xMSF = tParam.getMSF() ;
         Object value = null ;
 
         try {
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
index 9f975420d9b7..0fb9da0c4c4a 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
@@ -400,7 +400,7 @@ public class _XParameters extends MultiMethodTest {
         if (idx < 0) log.println("Type not found in relation: not tested");
         else {
             try {
-                Object oStream = ((XMultiServiceFactory)tParam.getMSF()).
+                Object oStream = tParam.getMSF().
                         createInstance("com.sun.star.io.DataInputStream") ;
                 XInputStream xStream = UnoRuntime.queryInterface
                     (XInputStream.class, oStream);
@@ -430,7 +430,7 @@ public class _XParameters extends MultiMethodTest {
         if (idx < 0) log.println("Type not found in relation: not tested");
         else {
             try {
-                Object oStream = ((XMultiServiceFactory)tParam.getMSF())
+                Object oStream = tParam.getMSF()
                         .createInstance("com.sun.star.io.TextInputStream") ;
                 XInputStream xStream = UnoRuntime.queryInterface
                     (XInputStream.class, oStream);
@@ -460,7 +460,7 @@ public class _XParameters extends MultiMethodTest {
         if (idx < 0) log.println("Type not found in relation: not tested");
         else {
             try {
-                Object obj = ((XMultiServiceFactory)tParam.getMSF()).
+                Object obj = tParam.getMSF().
                                 createInstance("com.sun.star.io.Pipe") ;
 
                 oObj.setObject(idx, obj) ;
@@ -488,7 +488,7 @@ public class _XParameters extends MultiMethodTest {
         if (idx < 0) log.println("Type not found in relation: not tested");
         else {
             try {
-                Object obj = ((XMultiServiceFactory)tParam.getMSF()).
+                Object obj = tParam.getMSF().
                     createInstance("com.sun.star.io.Pipe") ;
 
                 oObj.setObjectWithInfo(idx, obj, DataType.OBJECT, 0) ;
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
index 53cd93d9fa5b..3c5b9db25d24 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
@@ -536,7 +536,7 @@ public class _XRowUpdate extends MultiMethodTest {
         }
 
         try {
-            Object oStream = ((XMultiServiceFactory)tParam.getMSF()).
+            Object oStream = tParam.getMSF().
                 createInstance("com.sun.star.io.DataInputStream") ;
             XInputStream newVal = UnoRuntime.queryInterface
                 (XInputStream.class, oStream);
@@ -573,7 +573,7 @@ public class _XRowUpdate extends MultiMethodTest {
         }
 
         try {
-            Object oStream = ((XMultiServiceFactory)tParam.getMSF()).
+            Object oStream = tParam.getMSF().
                 createInstance("com.sun.star.io.TextInputStream") ;
             XInputStream newVal = UnoRuntime.queryInterface
                 (XInputStream.class, oStream);
@@ -610,7 +610,7 @@ public class _XRowUpdate extends MultiMethodTest {
         }
 
         try {
-            Object newVal = ((XMultiServiceFactory)tParam.getMSF()).
+            Object newVal = tParam.getMSF().
                 createInstance("com.sun.star.io.Pipe") ;
 
             oObj.updateObject(idx, newVal) ;
@@ -645,7 +645,7 @@ public class _XRowUpdate extends MultiMethodTest {
         }
 
         try {
-            Object newVal = ((XMultiServiceFactory)tParam.getMSF()).
+            Object newVal = tParam.getMSF().
                                 createInstance("com.sun.star.io.Pipe") ;
 
             oObj.updateNumericObject(idx, newVal, 0) ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
index 91a16504cbaa..5afd917ca7fe 100644
--- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
+++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
@@ -59,7 +59,7 @@ public class _FunctionDescription extends MultiMethodTest {
         }
 
         try {
-            XMultiServiceFactory oDocMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory oDocMSF = tParam.getMSF();
 
             XInterface FA = (XInterface)oDocMSF.
                 createInstance("com.sun.star.sheet.FunctionArgument");
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
index 7e72330e4ea3..0996351fc09c 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
@@ -105,7 +105,7 @@ public class _XDocumentAuditing extends MultiMethodTest {
         props[0].Name = "AutoRefreshArrows";
         props[0].Value = Boolean.FALSE;
         XModel xModel = UnoRuntime.queryInterface(XModel.class, oObj);
-        dispatch(xModel.getCurrentController().getFrame(), (XMultiServiceFactory)tParam.getMSF(), ".uno:AutoRefreshArrows", props);
+        dispatch(xModel.getCurrentController().getFrame(), tParam.getMSF(), ".uno:AutoRefreshArrows", props);
 
         // prepare the sheets
         try {
@@ -133,7 +133,7 @@ public class _XDocumentAuditing extends MultiMethodTest {
         props[0].Name = "AutoRefreshArrows";
         props[0].Value = Boolean.TRUE;
         XModel xModel = UnoRuntime.queryInterface(XModel.class, oObj);
-        dispatch(xModel.getCurrentController().getFrame(), (XMultiServiceFactory)tParam.getMSF(), ".uno:AutoRefreshArrows", props);
+        dispatch(xModel.getCurrentController().getFrame(), tParam.getMSF(), ".uno:AutoRefreshArrows", props);
     }
 
     private static boolean maxDelta(int x, int y, int max) {
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index 47e5b73e5495..3ff61e47e96a 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -77,7 +77,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest {
         log.println("try to open contex menu...");
         AccessibilityTools at = new AccessibilityTools();
 
-        XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), docModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), 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 6fd2c3983dc7..ce6ea4c13215 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -173,7 +173,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((XMultiServiceFactory)tParam.getMSF(), xModel);
+        XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), xModel);
         XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
         XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE  );
@@ -185,7 +185,7 @@ public class _XRangeSelection extends MultiMethodTest {
         Object toolkit = null;
 
         try {
-            toolkit = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.awt.Toolkit");
+            toolkit = tParam.getMSF().createInstance("com.sun.star.awt.Toolkit");
         } catch (com.sun.star.uno.Exception e) {
             log.println("Couldn't get toolkit");
             e.printStackTrace(log);
@@ -231,7 +231,7 @@ public class _XRangeSelection extends MultiMethodTest {
      * @return A point representing the closer button.
      */
     private Point getCloser(Point center) {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+        XMultiServiceFactory xMSF = tParam.getMSF();
         Object aToolkit = null;
         try {
             aToolkit = xMSF.createInstance("com.sun.star.awt.Toolkit");
diff --git a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
index b343b30d9e02..362ca903c880 100644
--- a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
+++ b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java
@@ -47,8 +47,8 @@ public class _XSystemShellExecute extends MultiMethodTest {
     */
     public void _execute() {
         String cClassPath = System.getProperty("DOCPTH");
-        String cResFile = utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF())+"SystemShellExecute.txt";
-        String cResURL = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF())+"SystemShellExecute.txt";
+        String cResFile = utils.getOfficeTempDirSys(tParam.getMSF())+"SystemShellExecute.txt";
+        String cResURL = utils.getOfficeTemp(tParam.getMSF())+"SystemShellExecute.txt";
         String cArgs = "-classpath " + cClassPath +
                        " SystemShellExecute " + cResFile;
 
@@ -72,7 +72,7 @@ public class _XSystemShellExecute extends MultiMethodTest {
 
         XSimpleFileAccess xFileAccess = null;
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
             Object fa = xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
             xFileAccess = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa);
         } catch (com.sun.star.uno.Exception e) {
diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
index 1188e1fba908..65b518b066f1 100644
--- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
+++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java
@@ -54,7 +54,7 @@ public class _XAutoFormattable extends MultiMethodTest {
     */
     public void _autoFormat() {
         boolean bResult = true;
-        XMultiServiceFactory oMSF = (XMultiServiceFactory) tParam.getMSF();
+        XMultiServiceFactory oMSF = tParam.getMSF();
         String name = "Default";
 
         try {
diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java
index 98b2ec3cac0e..68d61fe3b142 100644
--- a/qadevOOo/tests/java/ifc/text/_MailMerge.java
+++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java
@@ -33,9 +33,9 @@ public class _MailMerge extends MultiPropertyTest {
      */
     protected PropertyTester URLTester = new PropertyTester() {
         protected Object getNewValue(String propName, Object oldValue) {
-            if (oldValue.equals(util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF())))
+            if (oldValue.equals(util.utils.getOfficeTemp(tParam.getMSF())))
                 return util.utils.getFullTestURL(""); else
-                return util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+                return util.utils.getOfficeTemp(tParam.getMSF());
         }
     } ;
 
diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
index d2560e672d1e..42f08e8af37a 100644
--- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
+++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java
@@ -112,7 +112,7 @@ public class _XPagePrintable extends MultiMethodTest {
         boolean res = true;
 
         try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+            XMultiServiceFactory xMSF = tParam.getMSF();
 
             String printFile = utils.getOfficeTemp(xMSF) + "XPagePrintable.prt";
             log.println("Printing to : "+ printFile);
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
index afa05d30bf7c..5697ace74dd3 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
@@ -126,7 +126,7 @@ public class _XCachedDynamicResultSetStubFactory extends MultiMethodTest {
         XCachedDynamicResultSetFactory setFac = null ;
 
         try {
-            Object fac = ((XMultiServiceFactory)tParam.getMSF()).createInstance
+            Object fac = tParam.getMSF().createInstance
                 ("com.sun.star.ucb.CachedDynamicResultSetFactory") ;
 
             setFac = UnoRuntime.queryInterface
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
index 64878978b837..43cbb80d8440 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
@@ -184,7 +184,7 @@ public class _XCommandProcessor extends MultiMethodTest {
             String commandName = "globalTransfer";
 
             String srcURL = util.utils.getFullTestURL("SwXTextEmbeddedObject.sdw") ;
-            String tmpURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String tmpURL = util.utils.getOfficeTemp(tParam.getMSF()) ;
             log.println("Copying '" + srcURL + "' to '" + tmpURL) ;
 
             GlobalTransferCommandArgument arg = new
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
index 033c8dd6860a..e12325d9a569 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
@@ -49,7 +49,7 @@ public class _XContentIdentifierFactory extends MultiMethodTest {
      */
     public void _createContentIdentifier() {
         // creating a content identifier string - tmp url
-        String tmpDir = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        String tmpDir = utils.getOfficeTemp(tParam.getMSF());
 
         String contentId = utils.getFullURL(tmpDir);
 
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index faaa82435302..b1a10fe72dfd 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -93,7 +93,7 @@ public class _XContentProviderManager extends MultiMethodTest {
      * @see #contentProvider
      */
     public void before() {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+        XMultiServiceFactory xMSF = tParam.getMSF();
 
         log.println("creating testing content providers");
         try {
diff --git a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
index 6aa025e1cfe0..ec99008f5ef6 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
@@ -103,7 +103,7 @@ public class _XDataContainer extends MultiMethodTest {
     * Has <b>OK</b> status if no runtime exseptions occurred.
     */
     public void _setDataURL() {
-        dataURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+        dataURL = util.utils.getOfficeTemp(tParam.getMSF()) ;
         oObj.setDataURL(dataURL) ;
         tRes.tested("setDataURL()", true) ;
     }
diff --git a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
index 97a6e8a75709..8aa2effcd76a 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
@@ -48,7 +48,7 @@ public class _XFileIdentifierConverter extends MultiMethodTest {
      * same location). <p>
      */
     public void _getFileProviderLocality() {
-        String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        String baseURL = util.utils.getOfficeTemp(tParam.getMSF());
         log.println("Using: "+baseURL);
         int loc = oObj.getFileProviderLocality(baseURL);
         log.println("Getting: "+loc);
@@ -62,9 +62,9 @@ public class _XFileIdentifierConverter extends MultiMethodTest {
      * representation of the URL passed. <p>
      */
     public void _getSystemPathFromFileURL() {
-        String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        String baseURL = util.utils.getOfficeTemp(tParam.getMSF());
         log.println("Using (Base): "+baseURL);
-        String sysURL = util.utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF());
+        String sysURL = util.utils.getOfficeTempDirSys(tParam.getMSF());
         log.println("Using (System): "+sysURL);
         String get = oObj.getSystemPathFromFileURL(baseURL);
         log.println("Getting: "+get);
@@ -79,9 +79,9 @@ public class _XFileIdentifierConverter extends MultiMethodTest {
      * of the system dependent path passed. <p>
      */
     public void _getFileURLFromSystemPath() {
-        String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        String baseURL = util.utils.getOfficeTemp(tParam.getMSF());
         log.println("Using (Base): "+baseURL);
-        String sysURL = util.utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF());
+        String sysURL = util.utils.getOfficeTempDirSys(tParam.getMSF());
         log.println("Using (System): "+sysURL);
         String get = oObj.getFileURLFromSystemPath(sysURL,sysURL);
         log.println("Getting: "+get);
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
index 7a70b4b1a55d..5d746c9ed271 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
@@ -61,7 +61,7 @@ public class _XRemoteContentProviderAcceptor extends MultiMethodTest {
         boolean res = false;
 
         String[] template = new String[]{"file"};
-        res = oObj.addRemoteContentProvider("ContentID",(XMultiServiceFactory)tParam.getMSF(),
+        res = oObj.addRemoteContentProvider("ContentID",tParam.getMSF(),
             template,aDoneListener);
 
         tRes.tested("addRemoteContentProvider()",res);
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
index f21779ba5411..5c7c435a9c7d 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
@@ -58,7 +58,7 @@ public class _XRemoteContentProviderActivator extends MultiMethodTest {
         XRemoteContentProviderAcceptor xRCPA = (XRemoteContentProviderAcceptor)
                                                     tEnv.getObjRelation("RCPA");
         String[] template = new String[]{"file"};
-        xRCPA.addRemoteContentProvider("ContentID",(XMultiServiceFactory)tParam.getMSF(),template,null);
+        xRCPA.addRemoteContentProvider("ContentID",tParam.getMSF(),template,null);
         XContentProviderManager CPM = oObj.activateRemoteContentProviders();
         res = (CPM != null);
         xRCPA.removeRemoteContentProvider("ContentID");
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
index 21049cebec98..06c9fc37b947 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
@@ -65,7 +65,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
         try {
             String copiedFile = "";
             String dirname = util.utils.getFullTestURL("XSimpleFileAccess");
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String filename = dirname+"XSimpleFileAccess.txt";
             copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt";
 
@@ -95,7 +95,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
         try {
             String copiedFile = "";
             String dirname = util.utils.getFullTestURL("XSimpleFileAccess");
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String filename = dirname+"XSimpleFileAccess.txt";
             copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt";
 
@@ -127,7 +127,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
         try {
             String copiedFile = "";
             String dirname = util.utils.getFullTestURL("XSimpleFileAccess");
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String filename = dirname+"XSimpleFileAccess.txt";
             copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt";
 
@@ -185,7 +185,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
             String filename = dirname+"XSimpleFileAccess.txt";
             boolean result = true;
 
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String readonlyCopy = dirnameTo + "XSimpleFileAccess_copy.txt" ;
 
             if (oObj.exists(readonlyCopy))
@@ -231,7 +231,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
             String dirname = util.utils.getFullTestURL("XSimpleFileAccess");
             String filename = dirname+"XSimpleFileAccess.txt";
 
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String readonlyCopy = dirnameTo + "XSimpleFileAccess_copy.txt" ;
 
             if (oObj.exists(readonlyCopy))
@@ -261,7 +261,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
      */
     public void _createFolder() {
         try {
-            String tmpdirname = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String tmpdirname = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String newFolder = tmpdirname+"SimpleSubFolder";
 
             if (oObj.exists(newFolder))
@@ -455,7 +455,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
     */
     public void _openFileWrite() {
         try {
-            String tmpdirname = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String tmpdirname = util.utils.getOfficeTemp(tParam.getMSF()) ;
 
             String copiedFile = tmpdirname+"XSimpleFileAccess_openWrite.txt";
 
@@ -486,7 +486,7 @@ public class _XSimpleFileAccess extends MultiMethodTest {
     */
     public void _openFileReadWrite() {
         try {
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String copiedFile = dirnameTo + "XSimpleFileAccess2.txt" ;
 
             if (oObj.exists(copiedFile))
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
index a10dbb0592dd..6c2795880dbb 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
@@ -42,7 +42,7 @@ public class _XSimpleFileAccess2 extends MultiMethodTest {
     public void _writeFile() {
         boolean result = true;
         try {
-            String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+            String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ;
             String fileURL = dirnameTo + "XSimpleFileAccess_new.txt";
             String dirname = util.utils.getFullTestURL("XSimpleFileAccess");
             String filename = dirname+"XSimpleFileAccess.txt";
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
index 98812ec76e29..730f2053154c 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
@@ -69,7 +69,7 @@ public class _XSortedDynamicResultSetFactory extends MultiMethodTest {
     public void _createSortedDynamicResultSet() {
         boolean result = true ;
 
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
+        XMultiServiceFactory xMSF = tParam.getMSF();
         XDynamicResultSet dynResSet = null ;
         try {
             Object oUCB = xMSF.createInstanceWithArguments
diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
index c065f059a583..631f8cee1381 100644
--- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
+++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java
@@ -60,7 +60,7 @@ public class _XContextMenuInterception extends MultiMethodTest {
         xCI = UnoRuntime.queryInterface(
                 XContextMenuInterceptor.class, new ContextMenuInterceptor());
 
-        xMSF = (XMultiServiceFactory)tParam.getMSF();
+        xMSF = tParam.getMSF();
 
         //ensure that the first model is focused
 
diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
index 3cb5616d6675..dc20472b0a61 100644
--- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
+++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java
@@ -48,7 +48,7 @@ public class _XUIConfigurationManager extends MultiMethodTest {
      * extract the multi service factory.
      */
     protected void before() {
-        mxMSF = (XMultiServiceFactory)tParam.getMSF();
+        mxMSF = tParam.getMSF();
         sShortCutManagerServiceName = (String)tEnv.getObjRelation("XConfigurationManager.ShortCutManager");
 
     }
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
index 45f336446270..2ea17f389353 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
@@ -107,7 +107,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
         XExecutableDialog exD = UnoRuntime.queryInterface(
                 XExecutableDialog.class, tEnv.getTestObject());
 
-        dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        dir1 = util.utils.getOfficeTemp(tParam.getMSF());
         dir2 = util.utils.getFullTestURL("");
         eThread = new ExecThread(exD);
     }
@@ -270,7 +270,7 @@ public class _XFilePickerNotifier extends MultiMethodTest {
         XExecutableDialog exD = UnoRuntime.queryInterface(
                 XExecutableDialog.class, tEnv.getTestObject());
 
-        dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+        dir1 = util.utils.getOfficeTemp(tParam.getMSF());
         dir2 = util.utils.getFullTestURL("");
         eThread = new ExecThread(exD);
 
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
index c5c50cde6b09..d0e910e23aeb 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
@@ -44,7 +44,7 @@ public class _XFolderPicker extends MultiMethodTest {
     */
     public void _setDisplayDirectory() {
         boolean result = true ;
-        dir = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ;
+        dir = util.utils.getOfficeTemp(tParam.getMSF()) ;
 
         log.println("Trying to set dir '" + dir + "'") ;
         try {
diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java
index 57bd23b77d38..3ceff08a4267 100644
--- a/qadevOOo/tests/java/ifc/util/_PathSettings.java
+++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java
@@ -71,7 +71,7 @@ public class _PathSettings extends MultiPropertyTest {
                 if (path.length() > 0 && !path.endsWith(";")) {
                     path += ";";
                 }
-                path += utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF());
+                path += utils.getOfficeTemp(tParam.getMSF());
                 return path;
             }
         });
diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java
index cb7baa91741a..795b010677cc 100644
--- a/qadevOOo/tests/java/ifc/view/_XPrintable.java
+++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java
@@ -123,13 +123,13 @@ public class _XPrintable extends MultiMethodTest {
         boolean result = true ;
 
         final String file = "XPrintable.prt" ;
-        final String fileName = utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF())+file ;
-        final String fileURL = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) + file ;
+        final String fileName = utils.getOfficeTempDirSys(tParam.getMSF())+file ;
+        final String fileURL = utils.getOfficeTemp(tParam.getMSF()) + file ;
 
         XSimpleFileAccess fAcc = null ;
         try {
             Object oFAcc =
-                ((XMultiServiceFactory)tParam.getMSF()).createInstance
+                tParam.getMSF().createInstance
                 ("com.sun.star.ucb.SimpleFileAccess") ;
             fAcc = UnoRuntime.queryInterface
                 (XSimpleFileAccess.class, oFAcc) ;