java: remove some unused import statements

Change-Id: Id6342be66221c81b05aee9af519c800e51a286b3

398 files changed, 0 insertions, 401 deletions

diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java
index 773e77de22d7..ee5f4f06b481 100644
--- a/qadevOOo/runner/helper/StreamSimulator.java
+++ b/qadevOOo/runner/helper/StreamSimulator.java
@@ -21,7 +21,6 @@ package helper;
 import com.sun.star.uno.UnoRuntime;
 
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index c607342936cd..da2ddc37f8ab 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -28,7 +28,6 @@ import com.sun.star.accessibility.XAccessibleText;
 import com.sun.star.awt.Point;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
index af25feb0d61b..61471d9c7bc0 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
@@ -21,8 +21,6 @@ package ifc.awt;
 import lib.MultiPropertyTest;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
-
 /**
 * Testing <code>com.sun.star.awt.UnoControlFormattedFieldModel</code>
 * service properties :
diff --git a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
index 993384e5aa0d..6bdd3e9e4439 100644
--- a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
+++ b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XMessageBoxFactory;
 import com.sun.star.awt.XRequestCallback;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.Any;
 import com.sun.star.uno.UnoRuntime;
 import lib.MultiMethodTest;
diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
index 4063b0cb080a..d061aae384ad 100644
--- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
+++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java
@@ -22,7 +22,6 @@ import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.awt.Point;
 import com.sun.star.awt.ScrollBarOrientation;
 import com.sun.star.awt.XScrollBar;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
index ecae658fe56b..e889fe4242bf 100644
--- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
+++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java
@@ -23,7 +23,6 @@ import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.awt.Point;
 import com.sun.star.awt.ScrollBarOrientation;
 import com.sun.star.awt.XSpinValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import java.awt.Robot;
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
index d104be99410d..3c9cf9e5ba2b 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XMenuBar;
 import com.sun.star.awt.XTopWindow;
 import com.sun.star.awt.XTopWindowListener;
 import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
index 885c699b671c..a42313880e2c 100644
--- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
+++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
@@ -32,7 +32,6 @@ import com.sun.star.awt.XUserInputInterception;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import java.awt.Robot;
 import java.awt.event.InputEvent;
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
index f27dd3ba7f61..4f983612c216 100644
--- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
+++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
@@ -26,7 +26,6 @@ import com.sun.star.bridge.XBridgeFactory;
 import com.sun.star.connection.XAcceptor;
 import com.sun.star.connection.XConnection;
 import com.sun.star.connection.XConnector;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
index 44271e10cb4d..224394755ad8 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
@@ -21,7 +21,6 @@ import com.sun.star.configuration.backend.XLayer;
 import com.sun.star.configuration.backend.XLayerHandler;
 import com.sun.star.io.XActiveDataSink;
 import com.sun.star.io.XInputStream;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
index ec849a0e432f..55af96b9f861 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
@@ -20,8 +20,6 @@ package ifc.configuration.backend;
 import com.sun.star.configuration.backend.XLayer;
 import com.sun.star.configuration.backend.XMultiLayerStratum;
 import com.sun.star.configuration.backend.XUpdatableLayer;
-import com.sun.star.lang.XMultiServiceFactory;
-
 import lib.MultiMethodTest;
 
 import util.XLayerHandlerImpl;
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
index 873270a65cc0..2ebea13d2c74 100644
--- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
+++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
@@ -21,7 +21,6 @@ package ifc.configuration.backend;
 import com.sun.star.configuration.backend.XSchema;
 import com.sun.star.io.XActiveDataSink;
 import com.sun.star.io.XInputStream;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.UnoRuntime;
 
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
index 357c56be0a59..b98337070245 100644
--- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
+++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java
@@ -26,7 +26,6 @@ import lib.StatusException;
 import com.sun.star.connection.XAcceptor;
 import com.sun.star.connection.XConnection;
 import com.sun.star.connection.XConnector;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java
index e7447e8403fa..fa1d9b074d92 100644
--- a/qadevOOo/tests/java/ifc/connection/_XConnector.java
+++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java
@@ -24,7 +24,6 @@ import lib.StatusException;
 import com.sun.star.connection.XAcceptor;
 import com.sun.star.connection.XConnection;
 import com.sun.star.connection.XConnector;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
index 8153be576818..275b67774b65 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java
@@ -25,7 +25,6 @@ import com.sun.star.frame.DispatchDescriptor;
 import com.sun.star.frame.FrameSearchFlag;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
index beff5a6f906e..56553fdc0bca 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java
@@ -28,7 +28,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XDispatchRecorder;
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.URL;
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
index 4c529b7c968d..81bf327b21f3 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java
@@ -24,7 +24,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XDispatchRecorder;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.frame.XDispatchRecorderSupplier;
 import com.sun.star.frame.XFrame;
 import com.sun.star.lang.XComponent;
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
index 751b773c13a8..b5c0416e7fc5 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java
@@ -30,7 +30,6 @@ import com.sun.star.frame.XFrameLoader;
 import com.sun.star.frame.XLoadEventListener;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 
diff --git a/qadevOOo/tests/java/ifc/frame/_XStorable.java b/qadevOOo/tests/java/ifc/frame/_XStorable.java
index b3bf9f317c23..6c476d152255 100644
--- a/qadevOOo/tests/java/ifc/frame/_XStorable.java
+++ b/qadevOOo/tests/java/ifc/frame/_XStorable.java
@@ -24,7 +24,6 @@ import util.utils;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.frame.XStorable;
 import com.sun.star.io.IOException;
-import com.sun.star.lang.XMultiServiceFactory;
 
 /**
 * Testing <code>com.sun.star.frame.XStorable</code>
diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index 8760149b2744..83040fa01f64 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -28,7 +28,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XSynchronousFrameLoader;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.URL;
 import com.sun.star.util.XURLTransformer;
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 9991ca8c7ed8..60ebafa2d1a3 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -26,7 +26,6 @@ import com.sun.star.i18n.CalendarItem;
 import com.sun.star.i18n.XCalendar;
 import com.sun.star.i18n.XLocaleData;
 import com.sun.star.lang.Locale;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
index 2b4a6d00b97a..97acd4013a10 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java
@@ -22,7 +22,6 @@ import com.sun.star.i18n.NativeNumberMode;
 import com.sun.star.i18n.XExtendedCalendar;
 import com.sun.star.i18n.XLocaleData;
 import com.sun.star.lang.Locale;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
index 85aaad60b8e4..7acb03479f6b 100644
--- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java
+++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java
@@ -33,7 +33,6 @@ import com.sun.star.io.XObjectInputStream;
 import com.sun.star.io.XObjectOutputStream;
 import com.sun.star.io.XOutputStream;
 import com.sun.star.io.XPersistObject;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 
diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
index 396e6bb23957..36c228b448f9 100644
--- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
+++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java
@@ -22,7 +22,6 @@ import lib.MultiMethodTest;
 import lib.StatusException;
 import util.RegistryTools;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.loader.CannotActivateFactoryException;
 import com.sun.star.loader.XImplementationLoader;
diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
index ce69886839ab..09ebb1fe92b3 100644
--- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
+++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java
@@ -18,7 +18,6 @@
 
 package ifc.reflection;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.reflection.XIdlClass;
 import com.sun.star.reflection.XIdlReflection;
 import com.sun.star.uno.TypeClass;
diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
index e3d035c55cc9..eae1c88d5a93 100644
--- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
+++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java
@@ -18,7 +18,6 @@
 
 package ifc.registry;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.registry.CannotRegisterImplementationException;
 import com.sun.star.registry.XImplementationRegistration;
 import com.sun.star.registry.XSimpleRegistry;
diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
index 79a6edfeff74..1b73af54f9b6 100644
--- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
+++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java
@@ -22,7 +22,6 @@ import lib.Status;
 import lib.StatusException;
 import util.RegistryTools;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.registry.InvalidRegistryException;
 import com.sun.star.registry.XRegistryKey;
 import com.sun.star.registry.XSimpleRegistry;
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
index 0fb9da0c4c4a..bead09fd6b8e 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java
@@ -26,7 +26,6 @@ import lib.Status;
 import com.sun.star.io.XDataInputStream;
 import com.sun.star.io.XInputStream;
 import com.sun.star.io.XTextInputStream;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.DataType;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XParameters;
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
index 3c5b9db25d24..0b86d1b00bc1 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
@@ -27,7 +27,6 @@ import util.ValueComparer;
 import com.sun.star.io.XDataInputStream;
 import com.sun.star.io.XInputStream;
 import com.sun.star.io.XTextInputStream;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.sdbc.XRow;
 import com.sun.star.sdbc.XRowUpdate;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
index 5ed0334e1d32..dbfd307fc195 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XEnhancedMouseClickHandler;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XEnhancedMouseClickBroadcaster;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java
index 68d61fe3b142..9f03a9a1f96f 100644
--- a/qadevOOo/tests/java/ifc/text/_MailMerge.java
+++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java
@@ -20,7 +20,6 @@ package ifc.text;
 
 import lib.MultiPropertyTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.XConnection;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
index 5697ace74dd3..db1715d9668a 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java
@@ -22,7 +22,6 @@ import lib.MultiMethodTest;
 import lib.Status;
 import lib.StatusException;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.ucb.XCachedDynamicResultSetFactory;
 import com.sun.star.ucb.XCachedDynamicResultSetStubFactory;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
index 43cbb80d8440..b4001e4cbb0a 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java
@@ -18,7 +18,6 @@
 
 package ifc.ucb;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.Command;
 import com.sun.star.ucb.CommandAbortedException;
 import com.sun.star.ucb.CommandInfo;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
index e12325d9a569..d129579e1ff4 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java
@@ -21,7 +21,6 @@ package ifc.ucb;
 import lib.MultiMethodTest;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XContentIdentifier;
 import com.sun.star.ucb.XContentIdentifierFactory;
 
diff --git a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
index ec99008f5ef6..4dd9d6daa1e9 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java
@@ -20,7 +20,6 @@ package ifc.ucb;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XDataContainer;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
index 8aa2effcd76a..fb947ffb6540 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java
@@ -20,7 +20,6 @@ package ifc.ucb;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XFileIdentifierConverter;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
index 5d746c9ed271..a12dc1b1681e 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java
@@ -20,7 +20,6 @@ package ifc.ucb;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XRemoteContentProviderAcceptor;
 import com.sun.star.ucb.XRemoteContentProviderDoneListener;
 
diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
index 5c7c435a9c7d..c97b8946ea6a 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java
@@ -20,7 +20,6 @@ package ifc.ucb;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XContentProviderManager;
 import com.sun.star.ucb.XRemoteContentProviderAcceptor;
 import com.sun.star.ucb.XRemoteContentProviderActivator;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
index 06c9fc37b947..609a01b79a19 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java
@@ -22,7 +22,6 @@ import lib.MultiMethodTest;
 import lib.Status;
 import lib.StatusException;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.task.XInteractionHandler;
 import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
index 6c2795880dbb..00c6103f1d9d 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java
@@ -21,7 +21,6 @@ package ifc.ucb;
 import lib.MultiMethodTest;
 
 import com.sun.star.io.XInputStream;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess2;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
index 2ea17f389353..4b4c822a54a1 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java
@@ -23,7 +23,6 @@ import lib.Status;
 import lib.StatusException;
 
 import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ui.dialogs.FilePickerEvent;
 import com.sun.star.ui.dialogs.XExecutableDialog;
 import com.sun.star.ui.dialogs.XFilePicker;
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
index d0e910e23aeb..07c6e014f425 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java
@@ -20,7 +20,6 @@ package ifc.ui.dialogs;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ui.dialogs.XFolderPicker;
 
 /**
diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java
index 3ceff08a4267..ebf55ed0013c 100644
--- a/qadevOOo/tests/java/ifc/util/_PathSettings.java
+++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java
@@ -21,8 +21,6 @@ package ifc.util;
 import lib.MultiPropertyTest;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
-
 /**
  * Testing <code>com.sun.star.util.PathSettings</code>
  * service properties :
diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java
index 795b010677cc..3efd4c3e9a40 100644
--- a/qadevOOo/tests/java/ifc/view/_XPrintable.java
+++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java
@@ -24,7 +24,6 @@ import lib.StatusException;
 import util.utils;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.view.PaperOrientation;
diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
index beee263ec845..de0575e60480 100644
--- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
index db8c14a4ea95..5610aab265a1 100644
--- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
@@ -19,7 +19,6 @@
 package mod._acceptor.uno;
 
 import com.sun.star.uno.XInterface;
-import com.sun.star.lang.XMultiServiceFactory;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_adabas/ODriver.java b/qadevOOo/tests/java/mod/_adabas/ODriver.java
index 1369d601d0b7..d416e8b39700 100644
--- a/qadevOOo/tests/java/mod/_adabas/ODriver.java
+++ b/qadevOOo/tests/java/mod/_adabas/ODriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_ado/ODriver.java b/qadevOOo/tests/java/mod/_ado/ODriver.java
index 438f5871f5b5..ad88033b111f 100644
--- a/qadevOOo/tests/java/mod/_ado/ODriver.java
+++ b/qadevOOo/tests/java/mod/_ado/ODriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
index 3b6457076928..9e7f903703bb 100644
--- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
+++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
index ebe33e6e4c60..43e8124fff3d 100644
--- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
+++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
@@ -19,7 +19,6 @@
 package mod._bridgefac.uno;
 
 import com.sun.star.uno.XInterface;
-import com.sun.star.lang.XMultiServiceFactory;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
index 94c90e95336c..cac29dbdc267 100644
--- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java
+++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
@@ -19,7 +19,6 @@
 package mod._connector.uno;
 
 import com.sun.star.uno.XInterface;
-import com.sun.star.lang.XMultiServiceFactory;
 import java.io.PrintWriter;
 import lib.StatusException;
 import lib.TestCase;
diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java
index 0d0d470fdc47..7ba4617d8ced 100644
--- a/qadevOOo/tests/java/mod/_connectr/Connector.java
+++ b/qadevOOo/tests/java/mod/_connectr/Connector.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
index 158cb4f9afa8..d4fc7f1412f6 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
index 55572f7ad948..683f555af1a4 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
index 4f6fb96c53b2..d553fa8e1328 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
index 4575ce479ed0..6ed99c5c7eef 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.task.XInteractionContinuation;
 import com.sun.star.task.XInteractionRequest;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java
index d2f289a72bc8..257f87534a83 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_file/calc/ODriver.java b/qadevOOo/tests/java/mod/_file/calc/ODriver.java
index 1e5cd0c47040..e9ffcd22458f 100644
--- a/qadevOOo/tests/java/mod/_file/calc/ODriver.java
+++ b/qadevOOo/tests/java/mod/_file/calc/ODriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 
diff --git a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java
index 8ff4080d7874..5b0f0fab0f13 100644
--- a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java
+++ b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_file/flat/ODriver.java b/qadevOOo/tests/java/mod/_file/flat/ODriver.java
index da610ec6e9a6..9d8801af3bd6 100644
--- a/qadevOOo/tests/java/mod/_file/flat/ODriver.java
+++ b/qadevOOo/tests/java/mod/_file/flat/ODriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java
index 752909d85581..a994a0fb86b2 100644
--- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
index b536bb95c32d..7f1b44f59244 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
@@ -37,7 +37,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
index ffe88d6dbfd0..b02279b4c17f 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
index aa93efb2a202..bbb592b061ab 100644
--- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 755a5713cb0f..0e81eaafae19 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -46,7 +46,6 @@ import com.sun.star.form.DatabaseParameterEvent;
 import com.sun.star.form.XForm;
 import com.sun.star.form.XLoadable;
 import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.CommandType;
 import com.sun.star.sdb.ParametersRequest;
 import com.sun.star.sdb.RowChangeEvent;
diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java
index 20d534b5bdea..deb479afd45f 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java
index 224dc0120da2..a4739753107b 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
index d0be922ff9e5..7077272fc1e5 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
index 8fec646b1692..188583e277a0 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
@@ -28,7 +28,6 @@ import util.FormTools;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.drawing.XDrawPage;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 1f3faaac1980..6581a54c91ad 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -33,7 +33,6 @@ import com.sun.star.container.XNamed;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.form.XGridColumnFactory;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
index 31020d53a82d..0a2fabb872bf 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
index 2c45dc939cea..5e8831b1b340 100644
--- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
@@ -31,7 +31,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.drawing.XDrawPage;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
index 432816831cff..2c7b047ac64f 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
index c324c1d36407..918443a8a614 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
index 0fe543fb2ff2..ee35d9872b3b 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
index 3d2fb2f1425a..8401806e4689 100644
--- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
index bb2119a7bf42..1b8f460a000d 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
index fecfbcdb5f76..320352923486 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
index e687538e074d..22328d69ae5d 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
index 183b1bc2e4eb..37e20a9e08c0 100644
--- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
@@ -20,7 +20,6 @@ package mod._forms;
 
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
index 630ebd224eba..ecca4c16cc85 100644
--- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
@@ -20,7 +20,6 @@ package mod._forms;
 
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index 581cde0c15cc..7659fba213ce 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_fwk/Desktop.java b/qadevOOo/tests/java/mod/_fwk/Desktop.java
index c7080e88ea42..1158f5b74a1c 100644
--- a/qadevOOo/tests/java/mod/_fwk/Desktop.java
+++ b/qadevOOo/tests/java/mod/_fwk/Desktop.java
@@ -28,7 +28,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.frame.XDesktop;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
index 8c468beaa615..20091ea64167 100644
--- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
+++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java
@@ -34,7 +34,6 @@ import com.sun.star.frame.XDispatchRecorder;
 import com.sun.star.frame.XDispatchRecorderSupplier;
 import com.sun.star.frame.XFrame;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.uno.AnyConverter;
diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java
index 43dcbbb6f881..31d47378141e 100644
--- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java
+++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java b/qadevOOo/tests/java/mod/_fwk/Frame.java
index 7a8f62415993..2d199e4f74e2 100644
--- a/qadevOOo/tests/java/mod/_fwk/Frame.java
+++ b/qadevOOo/tests/java/mod/_fwk/Frame.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_fwk/JobHandler.java b/qadevOOo/tests/java/mod/_fwk/JobHandler.java
index c4c051b77a87..7b00c7be56a8 100644
--- a/qadevOOo/tests/java/mod/_fwk/JobHandler.java
+++ b/qadevOOo/tests/java/mod/_fwk/JobHandler.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java
index 80f01c881609..00ae84916d46 100644
--- a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java
+++ b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java
index fabae071f0c0..ea5326ace30a 100644
--- a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java
@@ -23,7 +23,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import lib.*;
 import util.DesktopTools;
 import util.SOfficeFactory;
diff --git a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java
index a74a7afdfffc..f6191c190d94 100644
--- a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java
+++ b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java
index 2e878629802c..42b8ab02dd2e 100644
--- a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java
+++ b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
 import util.utils;
diff --git a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java
index ec64613aede9..cdd842e86300 100644
--- a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java
+++ b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java
@@ -26,7 +26,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java
index 4f0c4f4a22bd..a579c7908232 100644
--- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java
+++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java
@@ -29,7 +29,6 @@ import lib.TestParameters;
 import util.utils;
 
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
index 4758b27c1af6..cf848d827b76 100644
--- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
+++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java
@@ -31,7 +31,6 @@ import util.utils;
 import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java
index f517f65c55ad..7fff156923a6 100644
--- a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java
+++ b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java
@@ -29,7 +29,6 @@ import lib.TestParameters;
 import util.utils;
 
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_fwl/PathSettings.java b/qadevOOo/tests/java/mod/_fwl/PathSettings.java
index 9b4e42cdd160..6642001c494b 100644
--- a/qadevOOo/tests/java/mod/_fwl/PathSettings.java
+++ b/qadevOOo/tests/java/mod/_fwl/PathSettings.java
@@ -37,7 +37,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java
index 76883c1d8377..dea7dcb982c5 100644
--- a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java
+++ b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java
index 43f04cc22cd5..3c1e7ad07dcb 100644
--- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java
+++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java
@@ -29,7 +29,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.beans.PropertyValue;
diff --git a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java
index b2b76a83130c..b8af38251fdd 100644
--- a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java
+++ b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java
@@ -28,7 +28,6 @@ import lib.TestParameters;
 import util.DBTools;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 
diff --git a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java
index 386e370d55f8..8c78dd2d2f02 100644
--- a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java
+++ b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java
index 843b51f46351..2e87a31ac6d4 100644
--- a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java
+++ b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java
index 5782458fa340..42133dabcfcd 100644
--- a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java
+++ b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java
@@ -17,7 +17,6 @@
  */
 package mod._qadevOOo;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index fd657866240c..1b33a5013c08 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index 24f79b4ce2de..014c1514ca1b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -35,7 +35,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
index c149e18e2eeb..f515be96d355 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
index ce78f5bd4992..d6fdbecf097c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
index ad1c6ed03838..7e4592aabf26 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 5f78735e4750..e35d766591cb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 6590a31dc4eb..ce3f885bab82 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XHeaderFooterContent;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index 041c89b4d298..767c6e6d2ff5 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index ae87bb79685f..d2494e629775 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -38,7 +38,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
index 2a8c2e9b8e31..fcc75f674cff 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index f0658ddd5151..f923cd4ae4a0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
index fc3f6fb434b7..ac371a92788f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
index 0357a008a67d..b5d52fc89d5e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetAnnotation;
 import com.sun.star.sheet.XSheetAnnotationAnchor;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
index e40e6f0aeb62..626110ecb41b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
@@ -19,7 +19,6 @@ package mod._sc;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetAnnotation;
 import com.sun.star.sheet.XSheetAnnotationAnchor;
 import com.sun.star.sheet.XSheetAnnotationShapeSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
index 1ee8eff35241..fea56fe90d9d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetAnnotation;
 import com.sun.star.sheet.XSheetAnnotationAnchor;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
index db5eb57264ac..d7c8e88702d8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetAnnotation;
 import com.sun.star.sheet.XSheetAnnotationAnchor;
 import com.sun.star.sheet.XSheetAnnotationsSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
index 2b4f27f74034..8fe4ee2117f6 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XAreaLinks;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
index 18fcb48fa341..3f153c9fa1ac 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
@@ -27,7 +27,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XAreaLinks;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java
index 936f1e62aa82..c527d3f01774 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java
@@ -25,7 +25,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
index 81e0522d290e..66f29bb5b22a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
@@ -26,7 +26,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
index e17a97b31731..6e568bce3bba 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
@@ -27,7 +27,6 @@ import util.ValueComparer;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetCellRange;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
index 76d9028f7943..f09eae64a9b0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellFormatRangesSupplier;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
index 29935fa0374e..56be56816f83 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellFormatRangesSupplier;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
index 2589679a92bd..75ce4c99ac01 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
index 0683f06efe52..4f3605ce3d32 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
@@ -28,7 +28,6 @@ import util.ValueComparer;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
index 1c9ce57a36b3..6046cdfb0b50 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
index 84c893de8607..4f6b4270ab1f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
index 9e51e1be6c32..66d9c5de212d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
@@ -27,7 +27,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
index cd455414da82..7976ae2a70ed 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangesQuery;
 import com.sun.star.sheet.XSheetCellRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
index 2561cbbf4de0..c8848a503cf1 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangesQuery;
 import com.sun.star.sheet.XSheetCellRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
index 4b0f771e77ef..5a2461ac8052 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
@@ -30,7 +30,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
index 9f86642d9544..ba73bf808afa 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.awt.Rectangle;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
index b63adf96c82f..7dec01a49e95 100644
--- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XConsolidatable;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
index 884acefac541..d1ca809cbefa 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
@@ -22,7 +22,6 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldGroupInfo;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotFieldGrouping;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
index 5f791cf3c255..b18f8832aab9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldGroupInfo;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotFieldGrouping;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
index 2fc6f8ecedcf..ad877c72c452 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldGroupInfo;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotFieldGrouping;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
index b0a8c501c58b..1ce2f651eef4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldOrientation;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
index 217788e8d914..aba76942a51b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
 import com.sun.star.sheet.XDataPilotTablesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
index db1f6a0bb5c1..b99311416aac 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldOrientation;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotField;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
index f7894bcfc3ca..a1e9f468954b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldOrientation;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotField;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
index 5763b8335a5b..908f5b4cbafb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.TableFilterField;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
index 5b07d9ef419b..4112e448f164 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
 import com.sun.star.sheet.XDataPilotTablesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
index 03de4460f03f..d3852ebcb5ad 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
@@ -22,7 +22,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XCellRangeReferrer;
 import com.sun.star.sheet.XDatabaseRanges;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
index 05f24633a593..cc584b26facc 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDatabaseRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellRangeAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
index 1b487e1a9198..61d1195a1047 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
@@ -34,7 +34,6 @@ import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
index 2a558c32f445..7668c879551d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
index 4931b0144bb3..ece4432a4eb6 100644
--- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetFilterable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
index 1b4b93b3f77a..820bb32527a2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XHeaderFooterContent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.style.XStyle;
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
index 23f067d7d91b..9dd33ffea9b5 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XHeaderFooterContent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.style.XStyle;
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
index 28b3687f11fe..8220a9eadfd8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
@@ -32,7 +32,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XHeaderFooterContent;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.style.XStyle;
diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java
index c296ebb37686..d509425e1b36 100644
--- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
index bfd6af3ce352..1a010e3cca5a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetAnnotations;
 import com.sun.star.sheet.XSheetAnnotationsSupplier;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
index 15518759e5df..3de7073193a2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XAreaLinks;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
index 30adc257b695..5663525fd5b9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
 import com.sun.star.sheet.XDataPilotTablesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
index 87c06b41fd04..f7430f0f159e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
@@ -22,7 +22,6 @@ import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNamed;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.DataPilotFieldOrientation;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotField;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
index a7277875d02f..0e893f86ac01 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDataPilotDescriptor;
 import com.sun.star.sheet.XDataPilotTables;
 import com.sun.star.sheet.XDataPilotTablesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
index 15336bfb57aa..5c1362c166eb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XDatabaseRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellRangeAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
index 73f107ceb5c3..afaa418eefd8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XLabelRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellRangeAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
index d067546f37a5..49ad1bb55d07 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XNamedRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
index bbab8e5e4179..b59fcafd8690 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XScenariosSupplier;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
index 9b0a0b50ac29..84fc296f74e2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
@@ -30,7 +30,6 @@ import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
index 7d29fb14ba11..368c29ccf674 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetLinkable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
index 82670af1c759..7395f563f0ed 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
@@ -31,7 +31,6 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
index 47958c28ea14..df734d4a5210 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
index 34fbf0c82b0e..52cd6c493d94 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.GeneralFunction;
 import com.sun.star.sheet.SubTotalColumn;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
index 011d7fefff41..02e758370741 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
index 9490b09c4041..8d740bab68c6 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
@@ -30,7 +30,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
index 1e7a2b2d124c..71efae8d2e19 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
index fcf6c5a42dff..08cab52fbb57 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
@@ -32,7 +32,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.ConditionOperator;
 import com.sun.star.sheet.XSheetConditionalEntries;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
index 7af65e5159d6..41c76ba825d9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
index 71ae1891cf21..9f19534ba7ee 100644
--- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XLabelRange;
 import com.sun.star.sheet.XLabelRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
index 23c0649635ae..9b17ebd8aebd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XLabelRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellRangeAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
index f2983d0d1ca8..4dd06f283c3e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
@@ -21,7 +21,6 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
index d24978f96308..b7d70df6b7b8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XNamedRanges;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.table.CellAddress;
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
index adc2fc134603..c6ca1e143e5a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XNamedRanges;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
index 8c18dd0d5501..cceb170437c9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XScenariosSupplier;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java
index c205762bf59f..0138ecdb7bf0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
index 842ce103ea4c..deab0f36b670 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
@@ -31,7 +31,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetLinkable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
index ec10f4b5eac3..703ca046d318 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSheetLinkable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
index a3a7a76669e3..1cf2e4ca0374 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java
index 2fdf023fd7f5..49d116d45ac6 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java
@@ -25,7 +25,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
index 6c18f4771800..9dd6d7e84330 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
index 307dd7ca46fc..260b73b92b93 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
index 898e5696dee4..647e1c82e86c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
@@ -30,7 +30,6 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.uno.AnyConverter;
diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
index 12c166725e21..f3a80469b429 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.GeneralFunction;
 import com.sun.star.sheet.SubTotalColumn;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
index cfbca04b3bf4..376953e0f0f4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.GeneralFunction;
 import com.sun.star.sheet.SubTotalColumn;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
index 9be8d36a3d2d..51a3580ac3d4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
@@ -40,7 +40,6 @@ import util.ValueComparer;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
index 2c6870a59556..f4fb466f5dcb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
index c225d233fdec..b00f162a6e60 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
index c786b65da147..f799f33d1056 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
@@ -31,7 +31,6 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.ConditionOperator;
 import com.sun.star.sheet.XSheetConditionalEntries;
 import com.sun.star.sheet.XSheetConditionalEntry;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
index 637f736db37c..b18cb869ee12 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.ConditionOperator;
 import com.sun.star.sheet.XSheetConditionalEntries;
 import com.sun.star.sheet.XSpreadsheet;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
index dbdcfc96cee8..a32ece10babd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java
index cc3b63fa72ec..992cc63ccbef 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
index c9f630697c56..d80d60f277cf 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
@@ -19,7 +19,6 @@ package mod._sc;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XScenariosSupplier;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
index a664deb59d6b..accd5c3e7575 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
index a66fd5608abb..8321c59eb45f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheets;
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
index 3162e2146eac..01f45b995f7a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
@@ -20,7 +20,6 @@ package mod._sc;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XUniqueCellFormatRangesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
index 130ab3626cef..4ad6f34ce751 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
@@ -19,7 +19,6 @@ package mod._sc;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XUniqueCellFormatRangesSupplier;
diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java
index 13f925a7af5a..57ca9dc9e38d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java
@@ -38,7 +38,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XViewPane;
 import com.sun.star.table.CellRangeAddress;
diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java
index dbb7052bc131..899316452179 100644
--- a/qadevOOo/tests/java/mod/_sch/AccArea.java
+++ b/qadevOOo/tests/java/mod/_sch/AccArea.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java
index 46e0caa65513..97cd53f7b6ca 100644
--- a/qadevOOo/tests/java/mod/_sch/AccAxis.java
+++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
index 7cac17065af5..6d67300fe2c8 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
index a13e93a7866a..0d3012fec7f8 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
index 32a8fae95b58..711f41a090c8 100644
--- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java
+++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java
index 5a7a14608023..79f874b1899a 100644
--- a/qadevOOo/tests/java/mod/_sch/AccFloor.java
+++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java
index ce78f4d042f2..74d93d649590 100644
--- a/qadevOOo/tests/java/mod/_sch/AccGrid.java
+++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java
index 278203b74062..5ca79a582cda 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegend.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
index 516bbe53f6c8..1fd5649bcc07 100644
--- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
+++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
index 7cdb2b59d349..a3fb6af8db2f 100644
--- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
+++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java
index f5897a49a002..36e434ff8638 100644
--- a/qadevOOo/tests/java/mod/_sch/AccTitle.java
+++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java
index 219c9c5f269b..366b4086f6f4 100644
--- a/qadevOOo/tests/java/mod/_sch/AccWall.java
+++ b/qadevOOo/tests/java/mod/_sch/AccWall.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
index d87620797f1f..66e1ea2cd016 100644
--- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XWindow;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
index 71b5ec26b9eb..9badd24576eb 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XAxisYSupplier;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.drawing.XShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java
index d2ad32b114af..938dd81ae982 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java
@@ -27,7 +27,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.chart.XChartData;
 import com.sun.star.chart.XChartDocument;
-import com.sun.star.lang.XMultiServiceFactory;
 
 /**
 * Test for object which is represented by service
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
index 2fca77dc9f99..a8d7359cefc0 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java
@@ -27,7 +27,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.chart.XChartData;
 import com.sun.star.chart.XChartDocument;
-import com.sun.star.lang.XMultiServiceFactory;
 
 /**
 * Test for object which is represented by service
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
index 0bdc0ae4a9db..dc517a1542e8 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java
@@ -20,7 +20,6 @@ package mod._sch;
 import com.sun.star.chart.XChartData;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.frame.XController;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.view.XSelectionSupplier;
diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java
index ccc7d4c83ba8..2eaf909325c3 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java
@@ -31,7 +31,6 @@ import com.sun.star.chart.XChartDocument;
 import com.sun.star.drawing.XShapeDescriptor;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java
index 6a8c6b7fbd36..edefbc25fed6 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java
@@ -31,7 +31,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.chart.XDiagram;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java
index 6fde716e5c04..ac1967ef1f88 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java
@@ -31,7 +31,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.chart.XDiagram;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
index 2d3ce42d965e..a9f64a035c6d 100644
--- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
+++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java
@@ -33,7 +33,6 @@ import com.sun.star.chart.XDiagram;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.document.XEmbeddedObjectSupplier;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XCellRangeAddressable;
 import com.sun.star.sheet.XSpreadsheet;
 import com.sun.star.sheet.XSpreadsheetDocument;
diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java
index b01884446ba7..6a3b236e4122 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartArea.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java
@@ -30,7 +30,6 @@ import util.utils;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java
index 79fba17bbf6b..2cd6045e2548 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XAxisXSupplier;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.drawing.XShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java
index 343b9451ec40..652386183aab 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java
@@ -30,7 +30,6 @@ import util.utils;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java
index aa5f9f770aea..048e4b3d8086 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartLine.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.chart.XDiagram;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 
diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java
index 1853e8012d75..200a82ac0b10 100644
--- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java
+++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.chart.XChartDocument;
 import com.sun.star.drawing.XShape;
-import com.sun.star.lang.XMultiServiceFactory;
 
 /**
 * Test for object which is represented by service
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
index 410862f5e5cc..650db26bf639 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java
@@ -40,7 +40,6 @@ import com.sun.star.drawing.XDrawView;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
index 4da30143c05d..0529cd2e20c7 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java
@@ -37,7 +37,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
index 4a5552bb50aa..4f00e4f4a861 100644
--- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
+++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java
@@ -37,7 +37,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java
index 00933e8d706e..d2d383b894c1 100644
--- a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java
+++ b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java
index 0b5883b5bf28..ffdb88a03fb5 100644
--- a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java
+++ b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.document.XLinkTargetSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java
index 85ccb1f3a75d..d391608b3e8e 100644
--- a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java
+++ b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java
@@ -37,7 +37,6 @@ import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XMasterPagesSupplier;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
index 0a5deddd9fec..5ad6094a7c65 100644
--- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java
index 4313168f5c56..049e84938704 100644
--- a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java
+++ b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java
@@ -34,7 +34,6 @@ import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdLayer.java b/qadevOOo/tests/java/mod/_sd/SdLayer.java
index d23d5422204a..4e09d7865515 100644
--- a/qadevOOo/tests/java/mod/_sd/SdLayer.java
+++ b/qadevOOo/tests/java/mod/_sd/SdLayer.java
@@ -32,7 +32,6 @@ import com.sun.star.drawing.XLayer;
 import com.sun.star.drawing.XLayerManager;
 import com.sun.star.drawing.XLayerSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java
index 89ee46baf0dd..39101db98ef8 100644
--- a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java
+++ b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java
@@ -35,7 +35,6 @@ import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XLayerSupplier;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java
index 901d8e7ed99f..486ea3b85577 100644
--- a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java
+++ b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java
@@ -34,7 +34,6 @@ import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XMasterPagesSupplier;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java
index df87506b78e9..3008a51eaad5 100644
--- a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XMasterPagesSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java
index 6f05f43953ef..cb22180eb742 100644
--- a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java
+++ b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java
@@ -33,7 +33,6 @@ import com.sun.star.drawing.XDrawPage;
 import com.sun.star.drawing.XShape;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
index 620e69cff971..4a2e68abe3e1 100644
--- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
+++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java
@@ -41,7 +41,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java
index f1e2deec14fe..4ded8addd6ce 100644
--- a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java
+++ b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java
index 5a53c546afd4..47e5f950a517 100644
--- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java
+++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java
@@ -41,7 +41,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java
index 977ccf0e46e5..1b1dbe934956 100644
--- a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java
+++ b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java
@@ -38,7 +38,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java
index 0b3121ca33ea..fbbe880a0e9d 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java
@@ -33,7 +33,6 @@ import com.sun.star.drawing.XDrawPage;
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.presentation.XCustomPresentationSupplier;
 import com.sun.star.uno.AnyConverter;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
index d2b3fcd4a239..a62e4a74b2cc 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.presentation.XCustomPresentationSupplier;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java
index 1c44948b4883..518458706afe 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java
@@ -25,7 +25,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.view.XSelectionSupplier;
 import ifc.view._XPrintJobBroadcaster;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java
index 517917b490fd..dc730216b203 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.presentation.XCustomPresentationSupplier;
 import com.sun.star.presentation.XPresentationSupplier;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java
index 1dec8b668153..2facdb56d7b0 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXShape.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java
@@ -34,7 +34,6 @@ import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XShape;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java
index a47d12d72f55..d942bd231d59 100644
--- a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java
+++ b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java
@@ -28,7 +28,6 @@ import lib.TestParameters;
 import util.dbg;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java
index d7ae8845f991..223b34c810f8 100644
--- a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java
+++ b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java
@@ -28,7 +28,6 @@ import lib.TestParameters;
 import util.dbg;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java
index 3ca7c0498dd2..07ecf780d1fd 100644
--- a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java
+++ b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java
@@ -28,7 +28,6 @@ import lib.TestParameters;
 import util.dbg;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 2a8cc16adb3b..02d68a7a2b49 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
index e76f09de5d51..73a335c93cba 100644
--- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java
@@ -35,7 +35,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sm/SmModel.java b/qadevOOo/tests/java/mod/_sm/SmModel.java
index dbcfeba3f1f7..fd5ef458310d 100644
--- a/qadevOOo/tests/java/mod/_sm/SmModel.java
+++ b/qadevOOo/tests/java/mod/_sm/SmModel.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 
 /**
  * Test for object which is represented by
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
index 1ad67750b08f..894930acc8f6 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java
@@ -37,7 +37,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
index d6706e4f1ba5..d7c169cbeae1 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java
@@ -42,7 +42,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
index c528f33e69d1..3d01fdc8e4e7 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
index 6a6bfc5ad6b4..5ae328093a03 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java
@@ -38,7 +38,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
index 0106c75c4371..5f1ef2b4a44d 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
index 9799da6d1250..378a8ef136b4 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
index 19578537379e..d00f0769eac0 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
index 9539067ad3ee..ce890931f79f 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java
@@ -37,7 +37,6 @@ import com.sun.star.accessibility.XAccessible;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
index 25149e3a2d28..3cdbe225bde7 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java
@@ -33,7 +33,6 @@ import com.sun.star.accessibility.XAccessible;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.XCloseable;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
index b782ea7032cd..99c8bfe3ae67 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
index 764f263d5cbb..af8bff7f3db2 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java
@@ -39,7 +39,6 @@ import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
index d7e155bc9264..a0f585e51937 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
index 200cd0cbccd2..8dd456f282ba 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java
@@ -35,7 +35,6 @@ import com.sun.star.accessibility.XAccessibleEditableText;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
index da5986ad8a51..5c55daa5317e 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
index 868f37b14a69..3ed89c4dceb9 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java
@@ -37,7 +37,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
index 0d65289a1e74..33f15a334e71 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java
@@ -36,7 +36,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XDrawPage;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
index 5c8bc1942764..b6be757523ab 100644
--- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
+++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java
@@ -36,7 +36,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.drawing.XShape;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java
index 1a09bdcd93aa..91e5482349d6 100644
--- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java
+++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java
@@ -21,7 +21,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.document.XExporter;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java
index 808c0ed8ecfc..e4e88cdbdf03 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java
@@ -22,7 +22,6 @@ import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
index 073b2f8e0f4d..352caae06981 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.URL;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java
index d2428c610103..a7d3cbc264e9 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShape.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java
@@ -33,7 +33,6 @@ import util.utils;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java
index 04dc22e1cdc5..673f92036291 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java
@@ -33,7 +33,6 @@ import util.utils;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java
index a163838f36b1..e005bc8caac3 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java
@@ -32,7 +32,6 @@ import util.ShapeDsc;
 import com.sun.star.drawing.XShape;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java
index 803ab15b7716..236d1904e0da 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java
@@ -31,7 +31,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java
index 0ea2a5b40cb2..95bf79fdcf14 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java
@@ -32,7 +32,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java
index ad14fe37ef7a..38f04646d20d 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java
@@ -37,7 +37,6 @@ import com.sun.star.drawing.XShape;
 import com.sun.star.drawing.XShapeGrouper;
 import com.sun.star.drawing.XShapes;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java
index f8941b14c172..9190cdacfd92 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java
@@ -32,7 +32,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java
index 1d7734bc6bd0..e9d77dadb19f 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java
index c97f2685dd0f..de7405616d30 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java
index ccddeedcb42b..45a61846cb77 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java
index 9b3be5993bba..70cc43d3b88e 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java
index 77be51b0fa13..55b5823cc375 100644
--- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java
+++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XEnumerationAccess;
 import com.sun.star.drawing.XShape;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java
index 5a7273eae609..89724efe6526 100644
--- a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java
+++ b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java
@@ -17,7 +17,6 @@
  */
 package mod._sw;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
index a905640199a9..4a45f3f2b1e8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java
@@ -35,7 +35,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
index affc55b0b17d..d4f3a54372aa 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java
@@ -33,7 +33,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleValue;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
index aac12792e449..b1626264686a 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java
@@ -34,7 +34,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
index f74349314a16..1789a086229f 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java
@@ -33,7 +33,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
index 72ee0a8ef33e..d473fd9f848e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java
@@ -40,7 +40,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
index 243cc5af25ea..69bbddac572f 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java
@@ -30,7 +30,6 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
index b79fb410fa2e..41cfbbe74abb 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java
@@ -34,7 +34,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.accessibility.XAccessibleSelection;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextTable;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
index 873c018d9126..0f776b5700a8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextTable;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
index f6dad97b5e5d..51bd95517687 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java
@@ -32,7 +32,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
index ea46f1f84315..0a131e411ecf 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.TextContentAnchorType;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
index 0303f4325497..b3af45ec1ed4 100644
--- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java
@@ -34,7 +34,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java
index 8d954e4f7fd6..e6f4befb4230 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java
@@ -29,7 +29,6 @@ import util.ParagraphDsc;
 import util.SOfficeFactory;
 import util.TableDsc;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java
index 1c71e3633faf..d15058ae2908 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java
index 67cfc87ea4c1..af67c95200e9 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XBookmarksSupplier;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java
index f11ff4017388..e341a3cdaa5e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java
@@ -27,7 +27,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XChapterNumberingSupplier;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
index b099c3f08641..0ba46a60c9d2 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java
index e7b2094a2132..3ca0a041023b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XDocumentIndexesSupplier;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
index e5c52186fef8..67997bfa1f50 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
@@ -31,7 +31,6 @@ import util.ShapeDsc;
 import com.sun.star.drawing.XDrawPage;
 import com.sun.star.drawing.XDrawPageSupplier;
 import com.sun.star.drawing.XShapes;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java
index 4d5e66854211..5f6f3d6b9c2c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java
@@ -31,7 +31,6 @@ import util.TableDsc;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XText;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java
index 8ac3c5441021..8d4ba8a1fac9 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 import util.dbg;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XLineNumberingProperties;
 import com.sun.star.text.XText;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXModule.java b/qadevOOo/tests/java/mod/_sw/SwXModule.java
index 15ae811f176f..b2c813e34eec 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXModule.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXModule.java
@@ -25,7 +25,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java
index dd5043cf8ffe..b770d98ad06e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java
@@ -30,7 +30,6 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
index f28cd9a06b2f..735d30dc20aa 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumeration;
 import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java
index e9d292666a2f..207d8dd9dbbf 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XEnumeration;
 import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java
index 785eb334489a..4804732ca16e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 
 /**
diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java
index 542841cb9ce0..040c41e4fb43 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXShape.java b/qadevOOo/tests/java/mod/_sw/SwXShape.java
index a03b76c51a10..d8606f31552b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXShape.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXShape.java
@@ -30,7 +30,6 @@ import com.sun.star.drawing.XDrawPage;
 import com.sun.star.drawing.XDrawPageSupplier;
 import com.sun.star.drawing.XShape;
 import com.sun.star.drawing.XShapes;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java
index 44a3037d2a3e..23e33e8b59c5 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
index 4550cec18f08..fc6af688885e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java
@@ -30,7 +30,6 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.AnyConverter;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java
index a279016637be..a216e471b70b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java
@@ -29,7 +29,6 @@ import util.ParagraphDsc;
 import util.SOfficeFactory;
 import util.TextSectionDsc;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.table.XCell;
 import com.sun.star.text.XSimpleText;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java
index 4e9e8b9234e7..bdb78ca07573 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.table.XCellRange;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextTable;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java
index e03064d7d483..3996058a453c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.table.XCellRange;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextTable;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java
index 832aeddc06b6..1ea7e3bf86a5 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.style.XStyle;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.ControlCharacter;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
index a11470f6b54d..cbe088ab8736 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.Property;
 import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XParagraphCursor;
 import com.sun.star.text.XSimpleText;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java
index ea9c4154bd9e..e32cdcb2ebd1 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextFieldsSupplier;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java
index c21d69916da5..2d45a8cbed09 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextFieldsSupplier;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java
index 4acc235dd8a9..9fa5e3736dda 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java
@@ -26,7 +26,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.TextContentAnchorType;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
index 77caca5dbc30..5d9b47f8a2f8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java
@@ -30,7 +30,6 @@ import util.SOfficeFactory;
 import util.TableDsc;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
index 91da8efeff85..94cbf3e038e8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
index 522dd5d9a1ad..0a3d44dcbeb9 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
@@ -29,7 +29,6 @@ import util.SOfficeFactory;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XEnumeration;
 import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
index c1ae07d08d4b..6e298f529919 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.container.XEnumeration;
 import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java
index e25491ff5b4f..32d510467c52 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java
@@ -27,7 +27,6 @@ import lib.TestParameters;
 import util.SOfficeFactory;
 import util.utils;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java
index a65a79ddc8e8..d6f4856d7168 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java
index 8f1b3298c7e7..da2c371099a3 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
index 25f7125344c6..0f0e9b03f03e 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
@@ -27,7 +27,6 @@ import util.SOfficeFactory;
 import util.ValueComparer;
 
 import com.sun.star.beans.XPropertySet;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.table.XCell;
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java
index 58ecd51dbce5..5339829ab4c8 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextTable;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java
index 2c3398ccc652..0b16413a6ca0 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java
@@ -28,7 +28,6 @@ import util.SOfficeFactory;
 
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.table.XTableRows;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
index 30ccf734a105..1dd1b45c467b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
@@ -35,7 +35,6 @@ import util.SOfficeFactory;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.form.XForm;
 import com.sun.star.frame.XController;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.text.ControlCharacter;
 import com.sun.star.text.XText;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java
index b59abcac68a9..dc942b9f3ff0 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextViewCursorSupplier;
 import com.sun.star.uno.UnoRuntime;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java
index b0e86b30e915..cadd80967c07 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java
@@ -26,7 +26,6 @@ import lib.TestEnvironment;
 import lib.TestParameters;
 import util.SOfficeFactory;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
index 69f408550b4b..c06cf952d2d3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java
@@ -21,7 +21,6 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.awt.XWindow;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
index b75c8c467921..a1ca56fa4dd3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java
@@ -21,7 +21,6 @@ import com.sun.star.accessibility.AccessibleRole;
 import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.awt.XWindow;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
index 8e4393a3146b..bd81276a0b3d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java
@@ -29,7 +29,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
index de300166dd55..e90299444f89 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java
@@ -29,7 +29,6 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
index 1b61eba45b28..9bf61b719ff1 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java
@@ -22,7 +22,6 @@ import com.sun.star.accessibility.XAccessible;
 import com.sun.star.accessibility.XAccessibleComponent;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
index 3a068ec820d4..32c784b3a71d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java
@@ -27,7 +27,6 @@ import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
index 7c96c41b0345..32f9ee052954 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java
@@ -32,7 +32,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
index 845605ced4d8..45b0d67e3762 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java
@@ -24,7 +24,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
index 5789d7385fef..66d029140eba 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java
@@ -24,7 +24,6 @@ import com.sun.star.awt.Rectangle;
 import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
index 001a2f6a6dac..5f980638b387 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java
@@ -23,7 +23,6 @@ import com.sun.star.accessibility.XAccessibleContext;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
index 15e0982dec0e..8387f0ec941e 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java
@@ -30,7 +30,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
index 298699468303..c5a755d18e08 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java
@@ -30,7 +30,6 @@ import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
index bb0f847e4b2e..acb3bab3bc27 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java
@@ -23,7 +23,6 @@ import com.sun.star.accessibility.XAccessibleAction;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
index 5b1876308bb9..64d7e34a0fa3 100644
--- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
+++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XExtendedToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
index 687c1244f703..751987727042 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java
@@ -19,7 +19,6 @@ package mod._toolkit;
 
 import com.sun.star.awt.tree.XMutableTreeDataModel;
 import com.sun.star.awt.tree.XMutableTreeNode;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java
index dcd010439514..42eab4b8dbf7 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabController.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java
@@ -23,7 +23,6 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XTabControllerModel;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.form.XForm;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.Type;
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
index ead5a1d6a1da..563720abd1ae 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java
@@ -18,7 +18,6 @@
 package mod._toolkit;
 
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
index d7f92dadf313..aeae187dc6de 100644
--- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java
@@ -23,7 +23,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
index 73fd63af34be..ec2dcaf4cf79 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
index 2a1569992a02..ee8960131b49 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
index 603be5d99557..d5c863d52316 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java
@@ -27,7 +27,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
index 239ca24dd6e0..8b0476578f48 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
index d610a913b088..f72b5f560816 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java
@@ -37,7 +37,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
index 975eca84c843..2a1abf6908cd 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
index 394bcf0ae6a8..38fbd61d7287 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java
@@ -30,7 +30,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
index e5aa0a75dbce..0142d93bcc3d 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
index 903f5e3180c8..e17e9cac4da8 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
index ec44c593c6dc..264f5abb3123 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
index 04b5849e562e..8d81569bb6fe 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java
@@ -27,7 +27,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XController;
 import com.sun.star.frame.XFrame;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
index 5cd94d60e84f..aaa5b9856a8f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
index ffc5a94981fa..7886ec93be46 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
index ddb835448920..8568c629b579 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
index bc7e4fcd710f..d9e696c9fc78 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
index 58df74c102e7..cce999e8df2b 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
index 988c9dc99db7..5158a29a4b09 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
index 1abe11d58768..dce7d7535b45 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
index e263f41ad14e..93eacd929823 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
index ed67e69a96af..e9c5563af172 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java
@@ -27,7 +27,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
index 4e0ae1e044f2..4694d7919562 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
index 78ddbd805fb2..d4119e2408e6 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
index 3d118cdb4bd6..b5955de75f16 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
index da1c9aec7fe4..5c0054870921 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
index b4091b1c0cd5..a9a6bebe868f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
index cfcacd8f4812..8ade3fe1d847 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
index bbf80fdd9f8c..5b71c36bc585 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
index afd9d717b761..cc16a49edef0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java
@@ -37,7 +37,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
index ad6a5f6990b9..66bf0a4846d0 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
index 30e359024a7b..a78384f278b2 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
index 31d19268d05f..1b64fb547aee 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
index 4cd62570d57b..620f9c390aba 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
index b4c985b0936c..df039b941be2 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
index 20562bd8356f..2b9f4888ad3f 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
index 99a900aba75f..5a47b5065334 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
index 0dc35968579d..7a8db780dcf6 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java
@@ -26,7 +26,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
index 59c6ae391990..4c31d10cab48 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
index 2a14d693f440..b416b10cc981 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java
@@ -28,7 +28,6 @@ import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
 import com.sun.star.frame.XFrame;
 import com.sun.star.frame.XModel;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
index 2e8ca3d81e53..04ca2b7ee276 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java
@@ -25,7 +25,6 @@ import com.sun.star.awt.XToolkit;
 import com.sun.star.awt.XWindow;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.drawing.XControlShape;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
index a3f1bff37041..173da055d942 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.XInterface;
 
 import java.io.PrintWriter;
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
index 696692bdba80..8350cb980923 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java
@@ -17,7 +17,6 @@
  */
 package mod._toolkit;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XInterface;
 
diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java
index 7d1bfaa2406c..d22192f56289 100644
--- a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java
+++ b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java
@@ -25,7 +25,6 @@ import lib.TestCase;
 import lib.TestEnvironment;
 import lib.TestParameters;
 
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.ucb.XRemoteContentProviderAcceptor;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;