diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-04 13:16:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-04 13:38:30 +0200 |
| commit | f493555623fb36bb51e78a4630483271ed36afe7 (patch) | |
| tree | ddd107373aafbcbdd3f31a1fd5f4e53e7c073f59 | |
| parent | cebdd852165cd3080a4eee885dceadcc41173ef3 (diff) | |
java: remove some casting in lib.TestParameters#getMSF
where the return value is always cast to XMultiServiceFactory,
so just do the cast in the method and avoid noise at the call sites.
Change-Id: I3a2e06ac6edb3c6021eda6442032db57aaa22e13
720 files changed, 1159 insertions, 1164 deletions
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 083f63580d8c..4e02f35d114d 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -947,7 +947,7 @@ public class TestCaseOldAPI extends ComplexTestCase { { XComponentLoader aLoader = UnoRuntime.queryInterface( XComponentLoader.class, - ((XMultiServiceFactory)param.getMSF()).createInstance( "com.sun.star.frame.Desktop" ) ); + param.getMSF().createInstance( "com.sun.star.frame.Desktop" ) ); aResult = UnoRuntime.queryInterface( XModel.class, @@ -974,7 +974,7 @@ public class TestCaseOldAPI extends ComplexTestCase { { aResult = UnoRuntime.queryInterface( XModel.class, - ((XMultiServiceFactory)param.getMSF()).createInstance( "com.sun.star.comp.chart2.ChartModel" ) ); + param.getMSF().createInstance( "com.sun.star.comp.chart2.ChartModel" ) ); } catch( Exception ex ) { diff --git a/connectivity/qa/complex/connectivity/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java index 1a5a6c4c5128..059c0333c24d 100644 --- a/connectivity/qa/complex/connectivity/DBaseDriverTest.java +++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java @@ -55,16 +55,16 @@ public class DBaseDriverTest extends ComplexTestCase implements TestCase public void Functions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { - DBaseStringFunctions aStringTest = new DBaseStringFunctions(((XMultiServiceFactory) param.getMSF()), this); + DBaseStringFunctions aStringTest = new DBaseStringFunctions((param.getMSF()), this); aStringTest.testFunctions(); - DBaseNumericFunctions aNumericTest = new DBaseNumericFunctions(((XMultiServiceFactory) param.getMSF()), this); + DBaseNumericFunctions aNumericTest = new DBaseNumericFunctions((param.getMSF()), this); aNumericTest.testFunctions(); - DBaseDateFunctions aDateTest = new DBaseDateFunctions(((XMultiServiceFactory) param.getMSF()), this); + DBaseDateFunctions aDateTest = new DBaseDateFunctions((param.getMSF()), this); aDateTest.testFunctions(); - DBaseSqlTests aSqlTest = new DBaseSqlTests(((XMultiServiceFactory) param.getMSF()), this); + DBaseSqlTests aSqlTest = new DBaseSqlTests((param.getMSF()), this); aSqlTest.testFunctions(); } } diff --git a/connectivity/qa/complex/connectivity/FlatFileAccess.java b/connectivity/qa/complex/connectivity/FlatFileAccess.java index ab7716ace303..b1b5f5788133 100644 --- a/connectivity/qa/complex/connectivity/FlatFileAccess.java +++ b/connectivity/qa/complex/connectivity/FlatFileAccess.java @@ -57,7 +57,7 @@ public class FlatFileAccess extends ComplexTestCase public void before() throws Exception { - m_database = new CsvDatabase( (XMultiServiceFactory)param.getMSF() ); + m_database = new CsvDatabase( param.getMSF() ); // proper settings final XPropertySet dataSourceSettings = m_database.getDataSource().geSettings(); diff --git a/connectivity/qa/complex/connectivity/HsqlDriverTest.java b/connectivity/qa/complex/connectivity/HsqlDriverTest.java index 02892c5e84b6..c178e9443194 100644 --- a/connectivity/qa/complex/connectivity/HsqlDriverTest.java +++ b/connectivity/qa/complex/connectivity/HsqlDriverTest.java @@ -56,7 +56,7 @@ public class HsqlDriverTest extends ComplexTestCase { XDataSource ds = null; System.gc(); try { - HsqlDatabase database = new HsqlDatabase( (XMultiServiceFactory)param.getMSF() ); + HsqlDatabase database = new HsqlDatabase( param.getMSF() ); ds = database.getDataSource().getXDataSource(); } catch(Exception ex) { throw new RuntimeException("factory: unable to construct data source" ); @@ -98,10 +98,10 @@ public class HsqlDriverTest extends ComplexTestCase { new com.sun.star.beans.PropertyValue("Storage",0,stor,PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("URL",0,mod.getURL(),PropertyState.DIRECT_VALUE) }; - drv = UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver")); + drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver")); - TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv); + TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv); StopWatch sw = new StopWatch(); @@ -129,8 +129,8 @@ public class HsqlDriverTest extends ComplexTestCase { new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0, false,PropertyState.DIRECT_VALUE) }; - drv = UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.comp.sdbc.JDBCDriver")); - TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv); + drv = UnoRuntime.queryInterface(XDriver.class,param.getMSF().createInstance("com.sun.star.comp.sdbc.JDBCDriver")); + TestCacheSize test = new TestCacheSize((param.getMSF()),info,drv); test.setURL("jdbc:hsqldb:g:\\hsql\\db"); diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java index 7bc75d94b466..b34a8185be87 100644 --- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java +++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java @@ -64,7 +64,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase //prop[0] = new PropertyValue("JavaDriverClass", 0, "com.ingres.jdbc.IngresDriver", PropertyState.DIRECT_VALUE); // get the remote office component context - XMultiServiceFactory xServiceManager = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory xServiceManager = param.getMSF(); Object x = xServiceManager.createInstance("com.sun.star.sdbc.DriverManager"); com.sun.star.sdbc.XDriverAccess xDriverAccess = UnoRuntime.queryInterface(XDriverAccess.class, x); com.sun.star.sdbc.XDriver xDriver = xDriverAccess.getDriverByURL(url); diff --git a/extensions/qa/integration/extensions/ObjectInspector.java b/extensions/qa/integration/extensions/ObjectInspector.java index 44f370e45562..4dac96782a46 100644 --- a/extensions/qa/integration/extensions/ObjectInspector.java +++ b/extensions/qa/integration/extensions/ObjectInspector.java @@ -58,7 +58,7 @@ public class ObjectInspector extends complexlib.ComplexTestCase /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); m_context = UnoRuntime.queryInterface( XComponentContext.class, UnoRuntime.queryInterface( XPropertySet.class, m_orb ).getPropertyValue( "DefaultContext" ) ); m_desktop = new Frame( m_orb.createInstance( "com.sun.star.frame.Desktop" ) ); diff --git a/extensions/qa/integration/extensions/TestSkeleton.java b/extensions/qa/integration/extensions/TestSkeleton.java index f196f8b3e658..64547c3b00b2 100644 --- a/extensions/qa/integration/extensions/TestSkeleton.java +++ b/extensions/qa/integration/extensions/TestSkeleton.java @@ -46,7 +46,7 @@ public class TestSkeleton extends complexlib.ComplexTestCase /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); } /* ------------------------------------------------------------------ */ diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index 1456289a0ee4..7b750b91c44a 100644 --- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java +++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java @@ -204,7 +204,7 @@ public class TypeDetection extends ComplexTestCase { public void before() throws Exception { // create TypeDetection - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + XMultiServiceFactory xMSF = param.getMSF(); assure("Could not get XMultiServiceFactory", xMSF != null); Object oInterface = xMSF.createInstance( diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index d8758017ccc1..92060711130a 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -93,7 +93,7 @@ public class CellBinding extends complexlib.ComplexTestCase /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); m_document = new SpreadsheetDocument( m_orb ); m_formLayer = new FormLayer( m_document ); } diff --git a/forms/qa/integration/forms/ControlValidation.java b/forms/qa/integration/forms/ControlValidation.java index 55718f71adc1..d6d7622731cc 100644 --- a/forms/qa/integration/forms/ControlValidation.java +++ b/forms/qa/integration/forms/ControlValidation.java @@ -61,7 +61,7 @@ public class ControlValidation extends complexlib.ComplexTestCase implements com /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); } /* ------------------------------------------------------------------ */ diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index 55ddfbfbf2a9..3126a1929087 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -463,7 +463,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE /* ------------------------------------------------------------------ */ private boolean ensureDataSource() throws Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); XNameAccess databaseContext = UnoRuntime.queryInterface( XNameAccess.class, m_orb.createInstance( "com.sun.star.sdb.DatabaseContext" ) ); diff --git a/forms/qa/integration/forms/FormPropertyBags.java b/forms/qa/integration/forms/FormPropertyBags.java index 47f50541582d..184fd35be2d5 100644 --- a/forms/qa/integration/forms/FormPropertyBags.java +++ b/forms/qa/integration/forms/FormPropertyBags.java @@ -66,7 +66,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); m_document = DocumentHelper.blankTextDocument( m_orb ); m_formLayer = new FormLayer( m_document ); } diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index dd2a09e62dee..6d8222a85e90 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -76,7 +76,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com /* ------------------------------------------------------------------ */ public void before() { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); } /* ------------------------------------------------------------------ */ diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java index b2c641caad73..3e83af998fef 100644 --- a/forms/qa/integration/forms/RadioButtons.java +++ b/forms/qa/integration/forms/RadioButtons.java @@ -61,7 +61,7 @@ public class RadioButtons extends complexlib.ComplexTestCase /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); } /* ------------------------------------------------------------------ */ diff --git a/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java index 85e1d16ac91f..a4ab28e48cb3 100644 --- a/forms/qa/integration/forms/TestCase.java +++ b/forms/qa/integration/forms/TestCase.java @@ -44,7 +44,7 @@ public abstract class TestCase extends complexlib.ComplexTestCase implements com /* ------------------------------------------------------------------ */ public void before() throws com.sun.star.uno.Exception, java.lang.Exception { - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); } /* ------------------------------------------------------------------ */ diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java index cfa9539bfec4..1d26ff2a5090 100644 --- a/forms/qa/integration/forms/XMLFormSettings.java +++ b/forms/qa/integration/forms/XMLFormSettings.java @@ -69,7 +69,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase public void before() throws java.lang.Exception { // create the document and assign related members - m_orb = (XMultiServiceFactory)param.getMSF(); + m_orb = param.getMSF(); m_document = new XMLDocument( m_orb ); m_formLayer = new FormLayer( m_document ); diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/runner/base/java_fat.java index 10131730fbd4..527f7285a161 100644 --- a/qadevOOo/runner/base/java_fat.java +++ b/qadevOOo/runner/base/java_fat.java @@ -133,7 +133,7 @@ public class java_fat implements TestBase } firstRun = false; - XMultiServiceFactory msf = (XMultiServiceFactory) m_aParams.getMSF(); + XMultiServiceFactory msf = m_aParams.getMSF(); if (msf == null) { diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 8a4f4382268a..a45d46a7dc95 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -387,7 +387,7 @@ public class GraphicalTestArguments // get methods public XMultiServiceFactory getMultiServiceFactory() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)m_aCurrentParams.getMSF(); + XMultiServiceFactory xMSF = m_aCurrentParams.getMSF(); // check if MultiServiceFactory is given if (getReferenceType().toLowerCase().equals("pdf") || diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/runner/graphical/ParameterHelper.java index 91cd735c283c..ac8c6eeffec0 100644 --- a/qadevOOo/runner/graphical/ParameterHelper.java +++ b/qadevOOo/runner/graphical/ParameterHelper.java @@ -248,7 +248,7 @@ public class ParameterHelper // get methods public XMultiServiceFactory getMultiServiceFactory() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)m_aCurrentParams.getMSF(); + XMultiServiceFactory xMSF = m_aCurrentParams.getMSF(); // check if MultiServiceFactory is given if (getReferenceType().toLowerCase().equals("pdf") || diff --git a/qadevOOo/runner/helper/InetTools.java b/qadevOOo/runner/helper/InetTools.java index 1ee6622d8281..2a5371d8ddaf 100644 --- a/qadevOOo/runner/helper/InetTools.java +++ b/qadevOOo/runner/helper/InetTools.java @@ -34,7 +34,7 @@ public class InetTools { * <code>lib.TestParameters</code> */ public static boolean setHTTPProxy(TestParameters param){ - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory xMSF = param.getMSF(); PropertyValue[] ProvArgs = new PropertyValue[1]; PropertyValue Arg = new PropertyValue(); Arg.Name = "nodepath"; diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java index c339b1c9806c..e04f1da491b3 100644 --- a/qadevOOo/runner/helper/OfficeProvider.java +++ b/qadevOOo/runner/helper/OfficeProvider.java @@ -109,7 +109,7 @@ public class OfficeProvider implements AppProvider public boolean disposeManager(lib.TestParameters param) { - XMultiServiceFactory msf = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory msf = param.getMSF(); if (msf == null) { @@ -364,7 +364,7 @@ public class OfficeProvider implements AppProvider public boolean closeExistingOffice(lib.TestParameters param, boolean closeIfPossible) { - XMultiServiceFactory msf = (XMultiServiceFactory) param.getMSF(); + XMultiServiceFactory msf = param.getMSF(); final boolean alreadyConnected = (msf != null); debug = param.getBool(PropertyName.DEBUG_IS_ACTIVE); diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index e2884044df07..773e77de22d7 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -89,7 +89,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , try { XSimpleFileAccess xHelper = UnoRuntime.queryInterface(XSimpleFileAccess.class, - ((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.ucb.SimpleFileAccess")); + param.getMSF().createInstance("com.sun.star.ucb.SimpleFileAccess")); /* com.sun.star.ucb.XSimpleFileAccess xHelper = (com.sun.star.ucb.XSimpleFileAccess)OfficeConnect.createRemoteInstance( com.sun.star.ucb.XSimpleFileAccess.class, "com.sun.star.ucb.SimpleFileAccess");*/ diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/runner/helper/UnoProvider.java index e3628de63a0a..41873b4c95bc 100644 --- a/qadevOOo/runner/helper/UnoProvider.java +++ b/qadevOOo/runner/helper/UnoProvider.java @@ -87,7 +87,7 @@ public class UnoProvider implements AppProvider { * @return A created MultiServiceFactory. */ public Object getManager(TestParameters param) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + XMultiServiceFactory xMSF = param.getMSF(); if (xMSF == null) { // bootstrap UNO. String unorcName = getUnorcName(param); diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 66050ee6ea8e..9fe80bf7d921 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -19,8 +19,11 @@ package lib; import java.util.HashMap; + import util.PropertyName; + import com.sun.star.beans.XPropertySet; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.XComponentContext; //import com.sun.star.lang.XMultiServiceFactory; @@ -279,10 +282,10 @@ public class TestParameters extends HashMap<String,Object> { /** * @return a XMultiServiceFactory to be used by a test (tests). */ - public Object getMSF() { + public XMultiServiceFactory getMSF() { Object ret = null; ret = get("ServiceFactory"); - return ret; + return (XMultiServiceFactory) ret; } public XComponentContext getComponentContext() { diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java index 63eb4c57828e..c607342936cd 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java @@ -1134,7 +1134,7 @@ public class _XAccessibleText extends MultiMethodTest { String cbText = null; try { - cbText = util.SysUtils.getSysClipboardText((XMultiServiceFactory)tParam.getMSF()); + cbText = util.SysUtils.getSysClipboardText(tParam.getMSF()); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't access system clipboard :"); e.printStackTrace(log); @@ -1150,7 +1150,7 @@ public class _XAccessibleText extends MultiMethodTest { res &= locRes; try { - cbText = util.SysUtils.getSysClipboardText((XMultiServiceFactory)tParam.getMSF()); + cbText = util.SysUtils.getSysClipboardText(tParam.getMSF()); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't access system clipboard :"); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java index 1358e7c3d0a6..af25feb0d61b 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java @@ -167,7 +167,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { protected Object getNewValue(String p, Object v) { Object newValue = null; try { - newValue = ((XMultiServiceFactory)tParam.getMSF()).createInstance( + newValue = tParam.getMSF().createInstance( "com.sun.star.util.NumberFormatsSupplier"); } catch (com.sun.star.uno.Exception e) {} return newValue; diff --git a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java index 3186ec53100f..993384e5aa0d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java +++ b/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java @@ -49,7 +49,7 @@ public class _XMessageBoxFactory extends MultiMethodTest { com.sun.star.awt.MessageBoxType.ERRORBOX, 1, "The Title", "The Message"); final UITools tools = new UITools( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), UnoRuntime.queryInterface(XWindow.class, mb)); final boolean[] done = new boolean[] { false }; final boolean[] good = new boolean[] { false }; diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java index 106b67b7c750..4063b0cb080a 100644 --- a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java +++ b/qadevOOo/tests/java/ifc/awt/_XScrollBar.java @@ -38,7 +38,7 @@ public class _XScrollBar extends MultiMethodTest { com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener(); public void _addAdjustmentListener() { - util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), + util.FormTools.switchDesignOf(tParam.getMSF(), (XTextDocument) tEnv.getObjRelation("Document")); shortWait(); oObj.addAdjustmentListener(listener); diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java index 2bec1d15c68f..ecae658fe56b 100644 --- a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java +++ b/qadevOOo/tests/java/ifc/awt/_XSpinValue.java @@ -37,7 +37,7 @@ public class _XSpinValue extends MultiMethodTest { com.sun.star.awt.XAdjustmentListener listener = new AdjustmentListener(); public void _addAdjustmentListener() { - util.FormTools.switchDesignOf((XMultiServiceFactory) tParam.getMSF(), + util.FormTools.switchDesignOf(tParam.getMSF(), (XTextDocument) tEnv.getObjRelation("Document")); shortWait(); oObj.addAdjustmentListener(listener); diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java index af2f9b251aac..d104be99410d 100644 --- a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java +++ b/qadevOOo/tests/java/ifc/awt/_XTopWindow.java @@ -97,7 +97,7 @@ public class _XTopWindow extends MultiMethodTest { protected void before() { - aTextDoc = util.WriterTools.createTextDoc((XMultiServiceFactory)tParam.getMSF()); + aTextDoc = util.WriterTools.createTextDoc(tParam.getMSF()); } /** @@ -164,7 +164,7 @@ public class _XTopWindow extends MultiMethodTest { try { menu = UnoRuntime.queryInterface(XMenuBar.class, - ((XMultiServiceFactory)tParam.getMSF()). + tParam.getMSF(). createInstance("com.sun.star.awt.MenuBar")) ; } catch (com.sun.star.uno.Exception e) { log.println("Can't instanciate MenuBar service") ; diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 697eeafb5bef..885c699b671c 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -464,7 +464,7 @@ public class _XUserInputInterception extends MultiMethodTest { util.DesktopTools.bringWindowToFront(xModel); XWindow xWindow = AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java index ebd98f3f5e20..f27dd3ba7f61 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java +++ b/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java @@ -146,13 +146,13 @@ public class _XBridgeFactory extends MultiMethodTest { // first creating a connection try { XInterface x = (XInterface) - ((XMultiServiceFactory)tParam.getMSF()).createInstance + tParam.getMSF().createInstance ("com.sun.star.connection.Connector") ; XConnector xCntr = UnoRuntime.queryInterface (XConnector.class, x) ; - x = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance + x = (XInterface) tParam.getMSF().createInstance ("com.sun.star.connection.Acceptor") ; XAcceptor xAccptr = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java index bc7656dc87f4..22e191fe01a5 100644 --- a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java +++ b/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java @@ -148,7 +148,7 @@ public class _XUnoUrlResolver extends MultiMethodTest { connectStr += curPort; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); // get the bridge factory XBridgeFactory xBrdgFctr = UnoRuntime.queryInterface(XBridgeFactory.class, diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java index 9ecb306b4bb4..c55c4579a918 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java @@ -96,7 +96,7 @@ public class _XBackend extends MultiMethodTest { try { XStringSubstitution sts = createStringSubstitution( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); String ent = sts.getSubstituteVariableValue("$(inst)") + "/share/registry"; XUpdateHandler aHandler = oObj.getUpdateHandler( @@ -128,7 +128,7 @@ public class _XBackend extends MultiMethodTest { try { XStringSubstitution sts = createStringSubstitution( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); String ent = sts.getSubstituteVariableValue("$(inst)") + "/share/registry"; XLayer[] Layers = oObj.listLayers( diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java index 45deb0a4a19d..44271e10cb4d 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java @@ -93,19 +93,19 @@ public class _XLayerHandler extends MultiMethodTest { oObj.endNode(); oObj.endLayer(); - Object LayerParser = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object LayerParser = tParam.getMSF().createInstance( "com.sun.star.comp.configuration.backend.xml.LayerParser"); XActiveDataSink xSink = UnoRuntime.queryInterface( XActiveDataSink.class, LayerParser); - Object fileacc = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object fileacc = tParam.getMSF().createInstance( "com.sun.star.comp.ucb.SimpleFileAccess"); XSimpleFileAccess simpleAccess = UnoRuntime.queryInterface( XSimpleFileAccess.class, fileacc); String filename = util.utils.getOfficeTemp( - (XMultiServiceFactory) tParam.getMSF()) + + tParam.getMSF()) + "LayerWriter.xcu"; log.println("Going to parse: " + filename); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java index b4fb0be0bd9a..ec849a0e432f 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java @@ -181,7 +181,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String ent = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + + tParam.getMSF()) + "/../share/registry"; String UpdateLayerID = oObj.getUpdateLayerId( "org.openoffice.Office.Linguistic", ent); @@ -224,7 +224,7 @@ public class _XMultiLayerStratum extends MultiMethodTest { try { String ent = util.utils.getOfficeURL( - (XMultiServiceFactory) tParam.getMSF()) + + tParam.getMSF()) + "/../share/registry"; String[] LayerIDs = oObj.listLayerIds("org.openoffice.Office.Jobs", ent); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java index b0bc8f5b3368..873270a65cc0 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java @@ -240,7 +240,7 @@ public class _XSchema extends MultiMethodTest { XSimpleFileAccess simpleAccess = null; XInputStream xStream = null; try { - Object fileacc = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); + Object fileacc = tParam.getMSF().createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); simpleAccess = UnoRuntime.queryInterface(XSimpleFileAccess.class,fileacc); log.println("Going to parse: "+filename); xStream = simpleAccess.openFileRead(filename); diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index 2d7b9045c28a..357c56be0a59 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -124,14 +124,13 @@ public class _XAcceptor extends MultiMethodTest { // creating services requierd try { - Object oConnector = ((XMultiServiceFactory)tParam.getMSF()). + Object oConnector = (tParam.getMSF()). createInstance("com.sun.star.connection.Connector") ; xConnector = UnoRuntime.queryInterface (XConnector.class, oConnector) ; - XInterface acceptor = (XInterface) ((XMultiServiceFactory) - tParam.getMSF()).createInstance + XInterface acceptor = (XInterface) tParam.getMSF().createInstance ("com.sun.star.connection.Acceptor") ; dupAcceptor = UnoRuntime.queryInterface diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/tests/java/ifc/connection/_XConnector.java index dca84f120954..e7447e8403fa 100644 --- a/qadevOOo/tests/java/ifc/connection/_XConnector.java +++ b/qadevOOo/tests/java/ifc/connection/_XConnector.java @@ -114,8 +114,7 @@ public class _XConnector extends MultiMethodTest { // create the acceptor try { - x = (XInterface) ( - (XMultiServiceFactory)tParam.getMSF()).createInstance + x = (XInterface) tParam.getMSF().createInstance ("com.sun.star.connection.Acceptor") ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/ifc/container/_XSet.java b/qadevOOo/tests/java/ifc/container/_XSet.java index 886468f20d30..743a894f5d04 100644 --- a/qadevOOo/tests/java/ifc/container/_XSet.java +++ b/qadevOOo/tests/java/ifc/container/_XSet.java @@ -54,7 +54,7 @@ public class _XSet extends MultiMethodTest { public void _insert() { boolean res = true ; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); element = xMSF.createInstance( "com.sun.star.reflection.TypeDescriptionProvider"); diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java index ff042e7d754e..8153be576818 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchProvider.java @@ -71,7 +71,7 @@ public class _XDispatchProvider extends MultiMethodTest { url.Complete = dispatchUrl; try { XURLTransformer xParser=UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)tParam.getMSF()).createInstance + tParam.getMSF().createInstance ("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of // URL objects. @@ -105,7 +105,7 @@ public class _XDispatchProvider extends MultiMethodTest { try { log.println("Parsing URL"); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)tParam.getMSF()).createInstance + tParam.getMSF().createInstance ("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of // URL objects. diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java index b166288a4bb4..beff5a6f906e 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java @@ -74,7 +74,7 @@ public class _XDispatchRecorder extends MultiMethodTest { oObj.startRecording(xFrame); log.println("dispatch calles via API must be recorded"); - dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; @@ -124,7 +124,7 @@ public class _XDispatchRecorder extends MultiMethodTest { oObj.startRecording(xFrame); // positve test - dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; @@ -155,7 +155,7 @@ public class _XDispatchRecorder extends MultiMethodTest { oObj.startRecording(xFrame); - dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java index 7a868c9dd15c..4c529b7c968d 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -74,13 +74,13 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { * service created for obtaining document's frame. */ protected void before() { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); try { log.println( "creating a text document" ); xTextDoc = SOF.createTextDoc(null); - Object inst = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object inst = tParam.getMSF().createInstance ("com.sun.star.frame.Desktop"); desktop = UnoRuntime.queryInterface (XDesktop.class, inst); @@ -163,7 +163,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { boolean res = true; if (recorder == null) { try { - Object inst = ((XMultiServiceFactory) tParam.getMSF()).createInstance + Object inst = tParam.getMSF().createInstance ("com.sun.star.comp.framework.DispatchRecorder"); recorder = UnoRuntime.queryInterface (XDispatchRecorder.class, inst); @@ -182,7 +182,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, fr); - URL dispURL = utils.parseURL((XMultiServiceFactory) tParam.getMSF(), ".uno:InsertText"); + URL dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); XDispatch xDisp = xDispProv.queryDispatch(dispURL,"",0); diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java index 17f3d4022437..751b773c13a8 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java @@ -94,13 +94,13 @@ public class _XFrameLoader extends MultiMethodTest { frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ; if (frame == null) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); frameSup = SOF.createTextDoc( null ); - Object oDsk = ((XMultiServiceFactory)tParam.getMSF()) + Object oDsk = tParam.getMSF() .createInstance("com.sun.star.frame.Desktop") ; XDesktop dsk = UnoRuntime.queryInterface(XDesktop.class, oDsk) ; diff --git a/qadevOOo/tests/java/ifc/frame/_XStorable.java b/qadevOOo/tests/java/ifc/frame/_XStorable.java index 635826d4eec2..b3bf9f317c23 100644 --- a/qadevOOo/tests/java/ifc/frame/_XStorable.java +++ b/qadevOOo/tests/java/ifc/frame/_XStorable.java @@ -130,7 +130,7 @@ public class _XStorable extends MultiMethodTest { public void _storeAsURL() { // getting an url to store String url = utils.getOfficeTemp( - (XMultiServiceFactory)tParam.getMSF()); + tParam.getMSF()); if (url != null) { url += "xstorable.store.as.test"; @@ -158,7 +158,7 @@ public class _XStorable extends MultiMethodTest { public void _storeToURL() { // getting an url to store String url = utils.getOfficeTemp( - (XMultiServiceFactory)tParam.getMSF()); + tParam.getMSF()); if (url != null) { url += "xstorable.store.as.test"; diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java index db8b06a5321e..8760149b2744 100644 --- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java @@ -80,7 +80,7 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { } SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)tParam.getMSF() ); + tParam.getMSF() ); XURLTransformer xURLTrans = null; @@ -90,15 +90,13 @@ public class _XSynchronousFrameLoader extends MultiMethodTest { log.println( "creating a textdocument" ); frameSup = SOF.createTextDoc( null ); - Object oDsk = ( - (XMultiServiceFactory)tParam.getMSF()).createInstance + Object oDsk = tParam.getMSF().createInstance ("com.sun.star.frame.Desktop") ; XDesktop dsk = UnoRuntime.queryInterface (XDesktop.class, oDsk) ; frame = dsk.getCurrentFrame() ; - Object o = ( - (XMultiServiceFactory)tParam.getMSF()).createInstance + Object o = tParam.getMSF().createInstance ("com.sun.star.util.URLTransformer") ; xURLTrans = UnoRuntime.queryInterface (XURLTransformer.class, o) ; diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 4bb7acff0f39..9991ca8c7ed8 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -74,7 +74,7 @@ public class _XCalendar extends MultiMethodTest { try { locData = UnoRuntime.queryInterface( XLocaleData.class, - ((XMultiServiceFactory)tParam.getMSF()).createInstance( + tParam.getMSF().createInstance( "com.sun.star.i18n.LocaleData")); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java index 7f89b7d93a9b..2b4a6d00b97a 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedCalendar.java @@ -45,7 +45,7 @@ public class _XExtendedCalendar extends MultiMethodTest { try { locData = UnoRuntime.queryInterface( XLocaleData.class, - ((XMultiServiceFactory)tParam.getMSF()).createInstance( + tParam.getMSF().createInstance( "com.sun.star.i18n.LocaleData")); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java index b6118c1082fc..85aaad60b8e4 100644 --- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java +++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java @@ -116,7 +116,7 @@ public class _XPersistObject extends MultiMethodTest { XPropertySetInfo objpsi = objps.getPropertySetInfo(); Property[] objprops = objpsi.getProperties(); - Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname); + Object oCopy = tParam.getMSF().createInstance(sname); XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy); @@ -156,7 +156,7 @@ public class _XPersistObject extends MultiMethodTest { bResult &= locRes; } } else { - Object oCopy = ((XMultiServiceFactory)tParam.getMSF()).createInstance(sname); + Object oCopy = tParam.getMSF().createInstance(sname); XPersistObject persCopy = UnoRuntime.queryInterface(XPersistObject.class, oCopy); persCopy.read(iStream); @@ -199,17 +199,17 @@ public class _XPersistObject extends MultiMethodTest { */ protected void initPipe() { try { - Object aPipe = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object aPipe = tParam.getMSF().createInstance ("com.sun.star.io.Pipe"); - Object istream = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object istream = tParam.getMSF().createInstance ("com.sun.star.io.ObjectInputStream"); - Object ostream = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object ostream = tParam.getMSF().createInstance ("com.sun.star.io.ObjectOutputStream"); // Now the objects that aren't described anywhere - Object mistream = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object mistream = tParam.getMSF().createInstance ("com.sun.star.io.MarkableInputStream"); - Object mostream = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object mostream = tParam.getMSF().createInstance ("com.sun.star.io.MarkableOutputStream"); XActiveDataSink xdSi = UnoRuntime.queryInterface(XActiveDataSink.class, istream); diff --git a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java index ae6de212538e..396e6bb23957 100644 --- a/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java +++ b/qadevOOo/tests/java/ifc/loader/_XImplementationLoader.java @@ -82,11 +82,11 @@ public class _XImplementationLoader extends MultiMethodTest { XRegistryKey key ; XSimpleRegistry xReg = null ; - String tmpDir = util.utils.getOfficeTempDir((XMultiServiceFactory)tParam.getMSF()); + String tmpDir = util.utils.getOfficeTempDir(tParam.getMSF()); try { xReg = RegistryTools.createRegistryService - ((XMultiServiceFactory)tParam.getMSF()) ; + (tParam.getMSF()) ; xReg.open(tmpDir + "XImpLoader_tmp.rdb", false, true) ; diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java index 306c25883fe6..ce69886839ab 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java +++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java @@ -72,7 +72,7 @@ public class _XIdlReflection extends MultiMethodTest{ Object obj = null; try { - obj = ((XMultiServiceFactory)tParam.getMSF()). + obj = tParam.getMSF(). createInstance("com.sun.star.io.Pipe") ; } catch (com.sun.star.uno.Exception e) { log.println("Can't create object"); diff --git a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java index b0e76a11585d..e3d035c55cc9 100644 --- a/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java +++ b/qadevOOo/tests/java/ifc/registry/_XImplementationRegistration.java @@ -71,10 +71,10 @@ public class _XImplementationRegistration extends MultiMethodTest { String name = null; try { - name = utils.getOfficeTempDir((XMultiServiceFactory)tParam.getMSF()) + + name = utils.getOfficeTempDir(tParam.getMSF()) + "XImplementationRegistration_tmp.rdb"; reg = RegistryTools.openRegistry - (name, (XMultiServiceFactory)tParam.getMSF()) ; + (name, tParam.getMSF()) ; oObj.registerImplementation(loader, url, reg) ; diff --git a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java index f7a6607460ec..79a6edfeff74 100644 --- a/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java +++ b/qadevOOo/tests/java/ifc/registry/_XSimpleRegistry.java @@ -234,7 +234,7 @@ public class _XSimpleRegistry extends MultiMethodTest { XSimpleRegistry reg = null; try { - reg = RegistryTools.createRegistryService((XMultiServiceFactory) tParam.getMSF()); + reg = RegistryTools.createRegistryService(tParam.getMSF()); } catch (com.sun.star.uno.Exception e) { log.print("Can't create registry service: "); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java index ce389b1c2156..63daab6f2619 100644 --- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java +++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java @@ -272,7 +272,7 @@ public class _XEventAttacherManager extends MultiMethodTest { requiredMethod("insertEntry()"); try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); attachedObject = xMSF.createInstance ( "com.sun.star.uno.NamingService" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java index adc2843eeeb5..0cff3d08117b 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory.java @@ -63,7 +63,7 @@ public class _XInvocationAdapterFactory extends MultiMethodTest { XInvocation xInv = null ; XMultiServiceFactory xMSF = null; try { - xMSF = (XMultiServiceFactory)tParam.getMSF(); + xMSF = tParam.getMSF(); Object[] args = {xMSF.createInstance ("com.sun.star.io.Pipe")}; diff --git a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java index 2ed17685667b..636c6578f2e4 100644 --- a/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java +++ b/qadevOOo/tests/java/ifc/script/_XInvocationAdapterFactory2.java @@ -63,7 +63,7 @@ public class _XInvocationAdapterFactory2 extends MultiMethodTest { XInvocation xInv = null ; XMultiServiceFactory xMSF = null; try { - xMSF = (XMultiServiceFactory)tParam.getMSF(); + xMSF = tParam.getMSF(); Object[] args = {xMSF.createInstance ("com.sun.star.io.Pipe")}; diff --git a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java index 8506da931cf3..7f38d055159e 100644 --- a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java +++ b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java @@ -52,7 +52,7 @@ public class _XTypeConverter extends MultiMethodTest { * @see com.sun.star.container.XSet */ public void _convertTo() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; Object value = null ; try { diff --git a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java index 9f975420d9b7..0fb9da0c4c4a 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XParameters.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XParameters.java @@ -400,7 +400,7 @@ public class _XParameters extends MultiMethodTest { if (idx < 0) log.println("Type not found in relation: not tested"); else { try { - Object oStream = ((XMultiServiceFactory)tParam.getMSF()). + Object oStream = tParam.getMSF(). createInstance("com.sun.star.io.DataInputStream") ; XInputStream xStream = UnoRuntime.queryInterface (XInputStream.class, oStream); @@ -430,7 +430,7 @@ public class _XParameters extends MultiMethodTest { if (idx < 0) log.println("Type not found in relation: not tested"); else { try { - Object oStream = ((XMultiServiceFactory)tParam.getMSF()) + Object oStream = tParam.getMSF() .createInstance("com.sun.star.io.TextInputStream") ; XInputStream xStream = UnoRuntime.queryInterface (XInputStream.class, oStream); @@ -460,7 +460,7 @@ public class _XParameters extends MultiMethodTest { if (idx < 0) log.println("Type not found in relation: not tested"); else { try { - Object obj = ((XMultiServiceFactory)tParam.getMSF()). + Object obj = tParam.getMSF(). createInstance("com.sun.star.io.Pipe") ; oObj.setObject(idx, obj) ; @@ -488,7 +488,7 @@ public class _XParameters extends MultiMethodTest { if (idx < 0) log.println("Type not found in relation: not tested"); else { try { - Object obj = ((XMultiServiceFactory)tParam.getMSF()). + Object obj = tParam.getMSF(). createInstance("com.sun.star.io.Pipe") ; oObj.setObjectWithInfo(idx, obj, DataType.OBJECT, 0) ; diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java index 53cd93d9fa5b..3c5b9db25d24 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java @@ -536,7 +536,7 @@ public class _XRowUpdate extends MultiMethodTest { } try { - Object oStream = ((XMultiServiceFactory)tParam.getMSF()). + Object oStream = tParam.getMSF(). createInstance("com.sun.star.io.DataInputStream") ; XInputStream newVal = UnoRuntime.queryInterface (XInputStream.class, oStream); @@ -573,7 +573,7 @@ public class _XRowUpdate extends MultiMethodTest { } try { - Object oStream = ((XMultiServiceFactory)tParam.getMSF()). + Object oStream = tParam.getMSF(). createInstance("com.sun.star.io.TextInputStream") ; XInputStream newVal = UnoRuntime.queryInterface (XInputStream.class, oStream); @@ -610,7 +610,7 @@ public class _XRowUpdate extends MultiMethodTest { } try { - Object newVal = ((XMultiServiceFactory)tParam.getMSF()). + Object newVal = tParam.getMSF(). createInstance("com.sun.star.io.Pipe") ; oObj.updateObject(idx, newVal) ; @@ -645,7 +645,7 @@ public class _XRowUpdate extends MultiMethodTest { } try { - Object newVal = ((XMultiServiceFactory)tParam.getMSF()). + Object newVal = tParam.getMSF(). createInstance("com.sun.star.io.Pipe") ; oObj.updateNumericObject(idx, newVal, 0) ; diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java index 91a16504cbaa..5afd917ca7fe 100644 --- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java +++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java @@ -59,7 +59,7 @@ public class _FunctionDescription extends MultiMethodTest { } try { - XMultiServiceFactory oDocMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory oDocMSF = tParam.getMSF(); XInterface FA = (XInterface)oDocMSF. createInstance("com.sun.star.sheet.FunctionArgument"); diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java index 7e72330e4ea3..0996351fc09c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java @@ -105,7 +105,7 @@ public class _XDocumentAuditing extends MultiMethodTest { props[0].Name = "AutoRefreshArrows"; props[0].Value = Boolean.FALSE; XModel xModel = UnoRuntime.queryInterface(XModel.class, oObj); - dispatch(xModel.getCurrentController().getFrame(), (XMultiServiceFactory)tParam.getMSF(), ".uno:AutoRefreshArrows", props); + dispatch(xModel.getCurrentController().getFrame(), tParam.getMSF(), ".uno:AutoRefreshArrows", props); // prepare the sheets try { @@ -133,7 +133,7 @@ public class _XDocumentAuditing extends MultiMethodTest { props[0].Name = "AutoRefreshArrows"; props[0].Value = Boolean.TRUE; XModel xModel = UnoRuntime.queryInterface(XModel.class, oObj); - dispatch(xModel.getCurrentController().getFrame(), (XMultiServiceFactory)tParam.getMSF(), ".uno:AutoRefreshArrows", props); + dispatch(xModel.getCurrentController().getFrame(), tParam.getMSF(), ".uno:AutoRefreshArrows", props); } private static boolean maxDelta(int x, int y, int max) { diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index 47e5b73e5495..3ff61e47e96a 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -77,7 +77,7 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), docModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), docModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index 6fd2c3983dc7..ce6ea4c13215 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -173,7 +173,7 @@ public class _XRangeSelection extends MultiMethodTest { XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); System.out.println("Name: " + xModel.getCurrentController().getFrame().getName()); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), xModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(tParam.getMSF(), xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); @@ -185,7 +185,7 @@ public class _XRangeSelection extends MultiMethodTest { Object toolkit = null; try { - toolkit = ((XMultiServiceFactory)tParam.getMSF()).createInstance("com.sun.star.awt.Toolkit"); + toolkit = tParam.getMSF().createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); e.printStackTrace(log); @@ -231,7 +231,7 @@ public class _XRangeSelection extends MultiMethodTest { * @return A point representing the closer button. */ private Point getCloser(Point center) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object aToolkit = null; try { aToolkit = xMSF.createInstance("com.sun.star.awt.Toolkit"); diff --git a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java index b343b30d9e02..362ca903c880 100644 --- a/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java +++ b/qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java @@ -47,8 +47,8 @@ public class _XSystemShellExecute extends MultiMethodTest { */ public void _execute() { String cClassPath = System.getProperty("DOCPTH"); - String cResFile = utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF())+"SystemShellExecute.txt"; - String cResURL = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF())+"SystemShellExecute.txt"; + String cResFile = utils.getOfficeTempDirSys(tParam.getMSF())+"SystemShellExecute.txt"; + String cResURL = utils.getOfficeTemp(tParam.getMSF())+"SystemShellExecute.txt"; String cArgs = "-classpath " + cClassPath + " SystemShellExecute " + cResFile; @@ -72,7 +72,7 @@ public class _XSystemShellExecute extends MultiMethodTest { XSimpleFileAccess xFileAccess = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object fa = xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); xFileAccess = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java index 1188e1fba908..65b518b066f1 100644 --- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java +++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java @@ -54,7 +54,7 @@ public class _XAutoFormattable extends MultiMethodTest { */ public void _autoFormat() { boolean bResult = true; - XMultiServiceFactory oMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory oMSF = tParam.getMSF(); String name = "Default"; try { diff --git a/qadevOOo/tests/java/ifc/text/_MailMerge.java b/qadevOOo/tests/java/ifc/text/_MailMerge.java index 98b2ec3cac0e..68d61fe3b142 100644 --- a/qadevOOo/tests/java/ifc/text/_MailMerge.java +++ b/qadevOOo/tests/java/ifc/text/_MailMerge.java @@ -33,9 +33,9 @@ public class _MailMerge extends MultiPropertyTest { */ protected PropertyTester URLTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) { - if (oldValue.equals(util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()))) + if (oldValue.equals(util.utils.getOfficeTemp(tParam.getMSF()))) return util.utils.getFullTestURL(""); else - return util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + return util.utils.getOfficeTemp(tParam.getMSF()); } } ; diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java index d2560e672d1e..42f08e8af37a 100644 --- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java +++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java @@ -112,7 +112,7 @@ public class _XPagePrintable extends MultiMethodTest { boolean res = true; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); String printFile = utils.getOfficeTemp(xMSF) + "XPagePrintable.prt"; log.println("Printing to : "+ printFile); diff --git a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java index afa05d30bf7c..5697ace74dd3 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCachedDynamicResultSetStubFactory.java @@ -126,7 +126,7 @@ public class _XCachedDynamicResultSetStubFactory extends MultiMethodTest { XCachedDynamicResultSetFactory setFac = null ; try { - Object fac = ((XMultiServiceFactory)tParam.getMSF()).createInstance + Object fac = tParam.getMSF().createInstance ("com.sun.star.ucb.CachedDynamicResultSetFactory") ; setFac = UnoRuntime.queryInterface diff --git a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java index 64878978b837..43cbb80d8440 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XCommandProcessor.java @@ -184,7 +184,7 @@ public class _XCommandProcessor extends MultiMethodTest { String commandName = "globalTransfer"; String srcURL = util.utils.getFullTestURL("SwXTextEmbeddedObject.sdw") ; - String tmpURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String tmpURL = util.utils.getOfficeTemp(tParam.getMSF()) ; log.println("Copying '" + srcURL + "' to '" + tmpURL) ; GlobalTransferCommandArgument arg = new diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java index 033c8dd6860a..e12325d9a569 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentIdentifierFactory.java @@ -49,7 +49,7 @@ public class _XContentIdentifierFactory extends MultiMethodTest { */ public void _createContentIdentifier() { // creating a content identifier string - tmp url - String tmpDir = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + String tmpDir = utils.getOfficeTemp(tParam.getMSF()); String contentId = utils.getFullURL(tmpDir); diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java index faaa82435302..b1a10fe72dfd 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java +++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java @@ -93,7 +93,7 @@ public class _XContentProviderManager extends MultiMethodTest { * @see #contentProvider */ public void before() { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); log.println("creating testing content providers"); try { diff --git a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java index 6aa025e1cfe0..ec99008f5ef6 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java +++ b/qadevOOo/tests/java/ifc/ucb/_XDataContainer.java @@ -103,7 +103,7 @@ public class _XDataContainer extends MultiMethodTest { * Has <b>OK</b> status if no runtime exseptions occurred. */ public void _setDataURL() { - dataURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + dataURL = util.utils.getOfficeTemp(tParam.getMSF()) ; oObj.setDataURL(dataURL) ; tRes.tested("setDataURL()", true) ; } diff --git a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java index 97a6e8a75709..8aa2effcd76a 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java +++ b/qadevOOo/tests/java/ifc/ucb/_XFileIdentifierConverter.java @@ -48,7 +48,7 @@ public class _XFileIdentifierConverter extends MultiMethodTest { * same location). <p> */ public void _getFileProviderLocality() { - String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + String baseURL = util.utils.getOfficeTemp(tParam.getMSF()); log.println("Using: "+baseURL); int loc = oObj.getFileProviderLocality(baseURL); log.println("Getting: "+loc); @@ -62,9 +62,9 @@ public class _XFileIdentifierConverter extends MultiMethodTest { * representation of the URL passed. <p> */ public void _getSystemPathFromFileURL() { - String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + String baseURL = util.utils.getOfficeTemp(tParam.getMSF()); log.println("Using (Base): "+baseURL); - String sysURL = util.utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF()); + String sysURL = util.utils.getOfficeTempDirSys(tParam.getMSF()); log.println("Using (System): "+sysURL); String get = oObj.getSystemPathFromFileURL(baseURL); log.println("Getting: "+get); @@ -79,9 +79,9 @@ public class _XFileIdentifierConverter extends MultiMethodTest { * of the system dependent path passed. <p> */ public void _getFileURLFromSystemPath() { - String baseURL = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + String baseURL = util.utils.getOfficeTemp(tParam.getMSF()); log.println("Using (Base): "+baseURL); - String sysURL = util.utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF()); + String sysURL = util.utils.getOfficeTempDirSys(tParam.getMSF()); log.println("Using (System): "+sysURL); String get = oObj.getFileURLFromSystemPath(sysURL,sysURL); log.println("Getting: "+get); diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java index 7a70b4b1a55d..5d746c9ed271 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java +++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderAcceptor.java @@ -61,7 +61,7 @@ public class _XRemoteContentProviderAcceptor extends MultiMethodTest { boolean res = false; String[] template = new String[]{"file"}; - res = oObj.addRemoteContentProvider("ContentID",(XMultiServiceFactory)tParam.getMSF(), + res = oObj.addRemoteContentProvider("ContentID",tParam.getMSF(), template,aDoneListener); tRes.tested("addRemoteContentProvider()",res); diff --git a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java index f21779ba5411..5c7c435a9c7d 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java +++ b/qadevOOo/tests/java/ifc/ucb/_XRemoteContentProviderActivator.java @@ -58,7 +58,7 @@ public class _XRemoteContentProviderActivator extends MultiMethodTest { XRemoteContentProviderAcceptor xRCPA = (XRemoteContentProviderAcceptor) tEnv.getObjRelation("RCPA"); String[] template = new String[]{"file"}; - xRCPA.addRemoteContentProvider("ContentID",(XMultiServiceFactory)tParam.getMSF(),template,null); + xRCPA.addRemoteContentProvider("ContentID",tParam.getMSF(),template,null); XContentProviderManager CPM = oObj.activateRemoteContentProviders(); res = (CPM != null); xRCPA.removeRemoteContentProvider("ContentID"); diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java index 21049cebec98..06c9fc37b947 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java @@ -65,7 +65,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { try { String copiedFile = ""; String dirname = util.utils.getFullTestURL("XSimpleFileAccess"); - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String filename = dirname+"XSimpleFileAccess.txt"; copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt"; @@ -95,7 +95,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { try { String copiedFile = ""; String dirname = util.utils.getFullTestURL("XSimpleFileAccess"); - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String filename = dirname+"XSimpleFileAccess.txt"; copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt"; @@ -127,7 +127,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { try { String copiedFile = ""; String dirname = util.utils.getFullTestURL("XSimpleFileAccess"); - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String filename = dirname+"XSimpleFileAccess.txt"; copiedFile = dirnameTo + "XSimpleFileAccess_copy.txt"; @@ -185,7 +185,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { String filename = dirname+"XSimpleFileAccess.txt"; boolean result = true; - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String readonlyCopy = dirnameTo + "XSimpleFileAccess_copy.txt" ; if (oObj.exists(readonlyCopy)) @@ -231,7 +231,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { String dirname = util.utils.getFullTestURL("XSimpleFileAccess"); String filename = dirname+"XSimpleFileAccess.txt"; - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String readonlyCopy = dirnameTo + "XSimpleFileAccess_copy.txt" ; if (oObj.exists(readonlyCopy)) @@ -261,7 +261,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { */ public void _createFolder() { try { - String tmpdirname = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String tmpdirname = util.utils.getOfficeTemp(tParam.getMSF()) ; String newFolder = tmpdirname+"SimpleSubFolder"; if (oObj.exists(newFolder)) @@ -455,7 +455,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { */ public void _openFileWrite() { try { - String tmpdirname = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String tmpdirname = util.utils.getOfficeTemp(tParam.getMSF()) ; String copiedFile = tmpdirname+"XSimpleFileAccess_openWrite.txt"; @@ -486,7 +486,7 @@ public class _XSimpleFileAccess extends MultiMethodTest { */ public void _openFileReadWrite() { try { - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String copiedFile = dirnameTo + "XSimpleFileAccess2.txt" ; if (oObj.exists(copiedFile)) diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java index a10dbb0592dd..6c2795880dbb 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess2.java @@ -42,7 +42,7 @@ public class _XSimpleFileAccess2 extends MultiMethodTest { public void _writeFile() { boolean result = true; try { - String dirnameTo = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + String dirnameTo = util.utils.getOfficeTemp(tParam.getMSF()) ; String fileURL = dirnameTo + "XSimpleFileAccess_new.txt"; String dirname = util.utils.getFullTestURL("XSimpleFileAccess"); String filename = dirname+"XSimpleFileAccess.txt"; diff --git a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java index 98812ec76e29..730f2053154c 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java @@ -69,7 +69,7 @@ public class _XSortedDynamicResultSetFactory extends MultiMethodTest { public void _createSortedDynamicResultSet() { boolean result = true ; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XDynamicResultSet dynResSet = null ; try { Object oUCB = xMSF.createInstanceWithArguments diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index c065f059a583..631f8cee1381 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -60,7 +60,7 @@ public class _XContextMenuInterception extends MultiMethodTest { xCI = UnoRuntime.queryInterface( XContextMenuInterceptor.class, new ContextMenuInterceptor()); - xMSF = (XMultiServiceFactory)tParam.getMSF(); + xMSF = tParam.getMSF(); //ensure that the first model is focused diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index 3cb5616d6675..dc20472b0a61 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -48,7 +48,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { * extract the multi service factory. */ protected void before() { - mxMSF = (XMultiServiceFactory)tParam.getMSF(); + mxMSF = tParam.getMSF(); sShortCutManagerServiceName = (String)tEnv.getObjRelation("XConfigurationManager.ShortCutManager"); } diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java index 45f336446270..2ea17f389353 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java @@ -107,7 +107,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { XExecutableDialog exD = UnoRuntime.queryInterface( XExecutableDialog.class, tEnv.getTestObject()); - dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + dir1 = util.utils.getOfficeTemp(tParam.getMSF()); dir2 = util.utils.getFullTestURL(""); eThread = new ExecThread(exD); } @@ -270,7 +270,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { XExecutableDialog exD = UnoRuntime.queryInterface( XExecutableDialog.class, tEnv.getTestObject()); - dir1 = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + dir1 = util.utils.getOfficeTemp(tParam.getMSF()); dir2 = util.utils.getFullTestURL(""); eThread = new ExecThread(exD); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java index c5c50cde6b09..d0e910e23aeb 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFolderPicker.java @@ -44,7 +44,7 @@ public class _XFolderPicker extends MultiMethodTest { */ public void _setDisplayDirectory() { boolean result = true ; - dir = util.utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) ; + dir = util.utils.getOfficeTemp(tParam.getMSF()) ; log.println("Trying to set dir '" + dir + "'") ; try { diff --git a/qadevOOo/tests/java/ifc/util/_PathSettings.java b/qadevOOo/tests/java/ifc/util/_PathSettings.java index 57bd23b77d38..3ceff08a4267 100644 --- a/qadevOOo/tests/java/ifc/util/_PathSettings.java +++ b/qadevOOo/tests/java/ifc/util/_PathSettings.java @@ -71,7 +71,7 @@ public class _PathSettings extends MultiPropertyTest { if (path.length() > 0 && !path.endsWith(";")) { path += ";"; } - path += utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()); + path += utils.getOfficeTemp(tParam.getMSF()); return path; } }); diff --git a/qadevOOo/tests/java/ifc/view/_XPrintable.java b/qadevOOo/tests/java/ifc/view/_XPrintable.java index cb7baa91741a..795b010677cc 100644 --- a/qadevOOo/tests/java/ifc/view/_XPrintable.java +++ b/qadevOOo/tests/java/ifc/view/_XPrintable.java @@ -123,13 +123,13 @@ public class _XPrintable extends MultiMethodTest { boolean result = true ; final String file = "XPrintable.prt" ; - final String fileName = utils.getOfficeTempDirSys((XMultiServiceFactory)tParam.getMSF())+file ; - final String fileURL = utils.getOfficeTemp((XMultiServiceFactory)tParam.getMSF()) + file ; + final String fileName = utils.getOfficeTempDirSys(tParam.getMSF())+file ; + final String fileURL = utils.getOfficeTemp(tParam.getMSF()) + file ; XSimpleFileAccess fAcc = null ; try { Object oFAcc = - ((XMultiServiceFactory)tParam.getMSF()).createInstance + tParam.getMSF().createInstance ("com.sun.star.ucb.SimpleFileAccess") ; fAcc = UnoRuntime.queryInterface (XSimpleFileAccess.class, oFAcc) ; diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java index 9b4c10b4c791..beee263ec845 100644 --- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java @@ -82,7 +82,7 @@ public class Acceptor extends TestCase { try { acceptor = (XInterface) - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.connection.Acceptor"); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java index bc0d1be8f8c0..db8c14a4ea95 100644 --- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java @@ -77,7 +77,7 @@ public class Acceptor extends TestCase { try { acceptor = (XInterface) - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.connection.Acceptor"); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/qadevOOo/tests/java/mod/_adabas/ODriver.java b/qadevOOo/tests/java/mod/_adabas/ODriver.java index f21a92f6da78..1369d601d0b7 100644 --- a/qadevOOo/tests/java/mod/_adabas/ODriver.java +++ b/qadevOOo/tests/java/mod/_adabas/ODriver.java @@ -64,7 +64,7 @@ public class ODriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()). + oObj = (XInterface)Param.getMSF(). createInstance("com.sun.star.comp.sdbcx.adabas.ODriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_ado/ODriver.java b/qadevOOo/tests/java/mod/_ado/ODriver.java index 8753d97247d7..438f5871f5b5 100644 --- a/qadevOOo/tests/java/mod/_ado/ODriver.java +++ b/qadevOOo/tests/java/mod/_ado/ODriver.java @@ -63,7 +63,7 @@ public class ODriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()). + oObj = (XInterface)Param.getMSF(). createInstance("com.sun.star.comp.sdbc.ado.ODriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java index e9abc115640c..15f004eea95b 100644 --- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java @@ -53,7 +53,7 @@ public class AccessibleShape extends TestCase { log.println("Cleaning up"); DesktopTools.closeDoc(xTextDoc); try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object o = xMSF.createInstance("com.sun.star.frame.Desktop"); XDesktop xDesk = UnoRuntime.queryInterface(XDesktop.class, o); DesktopTools.closeDoc(xDesk.getCurrentFrame()); @@ -63,7 +63,7 @@ public class AccessibleShape extends TestCase { } protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); log.println( "creating a test environment" ); String aURL=utils.getFullTestURL("basDialog.odt"); xTextDoc = WriterTools.loadTextDoc(xMSF,aURL); @@ -96,7 +96,7 @@ public class AccessibleShape extends TestCase { utils.shortWait(3000); try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance + oObj = (XInterface) tParam.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java index 19ad2410067a..3b6457076928 100644 --- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java @@ -71,7 +71,7 @@ public class BridgeFactory extends TestCase { XInterface oObj = null ; try { - oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance + oObj = (XInterface) Param.getMSF().createInstance ("com.sun.star.bridge.BridgeFactory") ; } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java index 6ed4835b6efa..ebe33e6e4c60 100644 --- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java @@ -69,7 +69,7 @@ public class BridgeFactory extends TestCase { try { oObj = (XInterface) - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.bridge.BridgeFactory") ; } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java index d55bc7db403d..0eb692be8040 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java @@ -81,7 +81,7 @@ public class CachedContentResultSetFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedContentResultSetFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java index b206180a6609..4491a1df369f 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java @@ -79,7 +79,7 @@ public class CachedContentResultSetStubFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedContentResultSetStubFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java index 2f3d93cf0252..03367f0ba086 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java @@ -79,7 +79,7 @@ public class CachedDynamicResultSetFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedDynamicResultSetFactory" ); diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java index f42a9ab839a1..c44e903a4e8f 100644 --- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java +++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java @@ -76,7 +76,7 @@ public class CachedDynamicResultSetStubFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance ( "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ); diff --git a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java index d455b5df81e1..f957153ebe13 100644 --- a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java +++ b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java @@ -37,7 +37,7 @@ public class SimpleCommandMail extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.system.SimpleCommandMail" ); diff --git a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java index fafd45873a62..e7a3875e49de 100644 --- a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java +++ b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java @@ -68,7 +68,7 @@ public class ChaosContentProvider extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object cntFactory = null ; try { diff --git a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java index 2b6929b97259..6ab9c64f643d 100644 --- a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java +++ b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java @@ -81,7 +81,7 @@ public class CntUnoDataContainer extends TestCase { TestParameters Param, PrintWriter log) { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object relationContainer = null ; Object xIn = null; diff --git a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java index ee5ae9e8e049..a5d3d1c1fa50 100644 --- a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java +++ b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java @@ -53,7 +53,7 @@ public class PropertyMatcherFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java index 4e98ca91e979..94c90e95336c 100644 --- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java +++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java @@ -75,7 +75,7 @@ public class Connector extends TestCase { try { XInterface connector = (XInterface) - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.connection.Connector") ; oObj = connector ; diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java index 7ce030b8fb4b..0d0d470fdc47 100644 --- a/qadevOOo/tests/java/mod/_connectr/Connector.java +++ b/qadevOOo/tests/java/mod/_connectr/Connector.java @@ -78,7 +78,7 @@ public class Connector extends TestCase { try { XInterface connector = (XInterface) - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.connection.Connector") ; oObj = connector ; diff --git a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java index f7972b10bb47..7f43234c31fa 100644 --- a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java @@ -57,7 +57,7 @@ public class CoreReflection extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.reflection.CoreReflection"); } diff --git a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java index 439d119bc979..bda037ee5ae6 100644 --- a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java +++ b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java @@ -53,7 +53,7 @@ public class CoreReflection extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.reflection.CoreReflection"); } diff --git a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java index 748a3e30b6b0..23fa7fe34e6a 100644 --- a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java @@ -69,7 +69,7 @@ public class DLLComponentLoader extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.DLLComponentLoader" ); } diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java index 425866018748..7279f910b1ce 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java @@ -103,13 +103,13 @@ public class ConnectionLineAccessibility extends TestCase try { - ((XMultiServiceFactory) Param.getMSF()) + Param.getMSF() .createInstance("com.sun.star.sdb.DatabaseContext"); - oDBSource = ((XMultiServiceFactory) Param.getMSF()) + oDBSource = Param.getMSF() .createInstance("com.sun.star.sdb.DataSource"); - newQuery = ((XMultiServiceFactory) Param.getMSF()) + newQuery = Param.getMSF() .createInstance("com.sun.star.sdb.QueryDefinition"); - ((XMultiServiceFactory) Param.getMSF()) + Param.getMSF() .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) @@ -183,7 +183,7 @@ public class ConnectionLineAccessibility extends TestCase store = UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument()); - aFile = utils.getOfficeTemp((XMultiServiceFactory) Param.getMSF())+"ConnectionLine.odb"; + aFile = utils.getOfficeTemp(Param.getMSF())+"ConnectionLine.odb"; log.println("... filename will be "+aFile); store.storeAsURL(aFile,new PropertyValue[] {}); @@ -331,7 +331,7 @@ public class ConnectionLineAccessibility extends TestCase loadProps[2].Name = "DataSource"; loadProps[2].Value = oDBSource; - QueryComponent = DesktopTools.loadDoc((XMultiServiceFactory) Param.getMSF(),".component:DB/QueryDesign",loadProps); + QueryComponent = DesktopTools.loadDoc(Param.getMSF(),".component:DB/QueryDesign",loadProps); util.utils.shortWait(1000); @@ -378,7 +378,7 @@ public class ConnectionLineAccessibility extends TestCase log.println("closing QueryComponent ..."); DesktopTools.closeDoc(QueryComponent); log.println("... done"); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object sfa = xMSF.createInstance("com.sun.star.comp.ucb.SimpleFileAccess"); XSimpleFileAccess xSFA = UnoRuntime.queryInterface(XSimpleFileAccess.class, sfa); log.println("deleting database file"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java index 74ad256c0061..158cb4f9afa8 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java +++ b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java @@ -70,7 +70,7 @@ public class DBContentLoader extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.sdb.ContentLoader") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java index 9051c2c5ecc8..c904d8d88df7 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java @@ -102,13 +102,13 @@ public class JoinViewAccessibility extends TestCase { try { - ((XMultiServiceFactory) Param.getMSF ()) + Param.getMSF () .createInstance ("com.sun.star.sdb.DatabaseContext"); - oDBSource = ((XMultiServiceFactory) Param.getMSF ()) + oDBSource = Param.getMSF () .createInstance ("com.sun.star.sdb.DataSource"); - newQuery = ((XMultiServiceFactory) Param.getMSF ()) + newQuery = Param.getMSF () .createInstance ("com.sun.star.sdb.QueryDefinition"); - ((XMultiServiceFactory) Param.getMSF ()) + Param.getMSF () .createInstance ("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { @@ -176,7 +176,7 @@ public class JoinViewAccessibility extends TestCase { XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource); store = UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument()); - aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"JoinView.odb"; + aFile = utils.getOfficeTemp (Param.getMSF ())+"JoinView.odb"; log.println ("... filename will be "+aFile); store.storeAsURL (aFile,new PropertyValue[] {}); @@ -312,7 +312,7 @@ public class JoinViewAccessibility extends TestCase { loadProps[2].Name = "DataSource"; loadProps[2].Value = oDBSource; - QueryComponent = DesktopTools.loadDoc ((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps); + QueryComponent = DesktopTools.loadDoc (Param.getMSF (),".component:DB/QueryDesign",loadProps); xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent). getCurrentController().getFrame().getContainerWindow(); @@ -354,7 +354,7 @@ public class JoinViewAccessibility extends TestCase { log.println ("closing QueryComponent ..."); DesktopTools.closeDoc (QueryComponent); log.println ("... done"); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF (); + XMultiServiceFactory xMSF = Param.getMSF (); Object sfa = xMSF.createInstance ("com.sun.star.comp.ucb.SimpleFileAccess"); XSimpleFileAccess xSFA = UnoRuntime.queryInterface (XSimpleFileAccess.class, sfa); log.println ("deleting database file"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java index d48c7c34ed5a..aeaf5253d170 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java @@ -58,7 +58,7 @@ public class OCommandDefinition extends TestCase { XMultiServiceFactory xMSF = null ; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.sdb.QueryDefinition" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java index 595dd7d3d6f7..232010c6753d 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java @@ -84,7 +84,7 @@ public class ODatabaseContext extends TestCase { XMultiServiceFactory xMSF = null ; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); } catch( com.sun.star.uno.Exception e ) { @@ -104,7 +104,7 @@ public class ODatabaseContext extends TestCase { // adding obj relation for XNamingService try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.sdb.DataSource" ); XPropertySet xDSProps = UnoRuntime.queryInterface(XPropertySet.class, oInterface) ; @@ -114,7 +114,7 @@ public class ODatabaseContext extends TestCase { XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oInterface); XStorable store = UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument ()); - String aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"DatabaseContext.odb"; + String aFile = utils.getOfficeTemp (Param.getMSF ())+"DatabaseContext.odb"; log.println("store to '" + aFile + "'"); store.storeAsURL(aFile,new PropertyValue[]{}); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java index 065e07ab7a91..03c0f6145def 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java @@ -120,7 +120,7 @@ public class ODatabaseSource extends TestCase { Object oInterface = null; XMultiServiceFactory xMSF = null ; - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); try{ oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); @@ -136,7 +136,7 @@ public class ODatabaseSource extends TestCase { xDBContextNameServ = UnoRuntime.queryInterface(XNamingService.class, oInterface) ; // retrieving temp directory for database - String tmpDatabaseUrl = utils.getOfficeTempDir((XMultiServiceFactory)Param.getMSF()); + String tmpDatabaseUrl = utils.getOfficeTempDir(Param.getMSF()); tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ; @@ -187,7 +187,7 @@ public class ODatabaseSource extends TestCase { // registering source in DatabaseContext XStorable store = UnoRuntime.queryInterface(XStorable.class, xDBDoc); - String aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"DataSource.odb"; + String aFile = utils.getOfficeTemp (Param.getMSF ())+"DataSource.odb"; try{ store.storeAsURL(aFile,new PropertyValue[]{}); } catch (IOException e){ @@ -210,7 +210,7 @@ public class ODatabaseSource extends TestCase { // adding obj relation for interface XCompletedConnection Object handler = null ; try { - handler = ((XMultiServiceFactory)Param.getMSF()).createInstance + handler = Param.getMSF().createInstance ("com.sun.star.sdb.InteractionHandler") ; } catch (Exception e) { log.println("Relation for XCompletedConnection wasn't created") ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java index 697aa4f46fee..55572f7ad948 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java @@ -67,7 +67,7 @@ public class ODatasourceAdministrationDialog extends TestCase { Object oInterface = null; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.sdb.DatasourceAdministrationDialog" ); } catch( com.sun.star.uno.Exception e ) { log.println("Service not available" ); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index 4dc98f6a4dcf..4f6fb96c53b2 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -99,7 +99,7 @@ public class ODatasourceBrowser extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF())); + Param.getMSF())); System.setProperty("hideMe", "false"); } @@ -191,7 +191,7 @@ public class ODatasourceBrowser extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a text document"); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java index 474f8df44ef4..4575ce479ed0 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java @@ -80,7 +80,7 @@ public class OInteractionHandler extends TestCase { Object oInterface = null; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance( + oInterface = Param.getMSF().createInstance( "com.sun.star.sdb.InteractionHandler" ); } diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index c958adaf97ba..6d13603a4c3a 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -64,7 +64,7 @@ public class OQueryDesign extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { xDesk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()) ); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF()) ); } protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { @@ -76,7 +76,7 @@ public class OQueryDesign extends TestCase { XDispatchProvider aProv = UnoRuntime.queryInterface(XDispatchProvider.class,xDesk); XDispatch getting = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XNameAccess xNameAccess = null; @@ -236,7 +236,7 @@ public class OQueryDesign extends TestCase { XMultiServiceFactory xMSF; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 6050c6b8bee2..0e0d0e582872 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -159,7 +159,7 @@ public class ORowSet extends TestCase { protected void initialize ( TestParameters Param, PrintWriter _log) throws StatusException { - m_orb = (XMultiServiceFactory)Param.getMSF(); + m_orb = Param.getMSF(); String tmpDir = utils.getOfficeTemp( m_orb ); @@ -243,7 +243,7 @@ public class ORowSet extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XMultiServiceFactory orb = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory orb = Param.getMSF(); uniqueSuffix++; boolean envCreatedOK = false ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java index aa0641542627..d2f289a72bc8 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java @@ -74,7 +74,7 @@ public class OSQLMessageDialog extends TestCase { Object err2 = null; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance( + oInterface = Param.getMSF().createInstance( "com.sun.star.sdb.ErrorMessageDialog" ); err1 = new com.sun.star.sdbc.SQLException("err1"); @@ -98,7 +98,7 @@ public class OSQLMessageDialog extends TestCase { try{ xToolkit = UnoRuntime.queryInterface( com.sun.star.awt.XToolkit.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.awt.Toolkit") ); + Param.getMSF().createInstance("com.sun.star.awt.Toolkit") ); } catch (com.sun.star.uno.Exception e){ log.println("could not create instacne of 'com.sun.star.awt.Toolkit'" ); throw new StatusException("could not create instacne of 'com.sun.star.awt.Toolkit'", e) ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 5e632d0e8251..501cf0bbfcb8 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -168,7 +168,7 @@ public class OSingleSelectQueryComposer extends TestCase { Object oInterface = null; XMultiServiceFactory xMSF = null ; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); XNameAccess xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java index d500e787e76b..9ca266aaeae4 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java +++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java @@ -125,7 +125,7 @@ public class SbaXGridControl extends TestCase { * Creates Writer document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); @@ -145,7 +145,7 @@ public class SbaXGridControl extends TestCase { XInterface toolkit = null; try { - toolkit = (XInterface) ((XMultiServiceFactory)tParam.getMSF()) + toolkit = (XInterface) tParam.getMSF() .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -386,7 +386,7 @@ public class SbaXGridControl extends TestCase { log.println("ImplName: " + utils.getImplName(oObj)); - FormTools.switchDesignOf((XMultiServiceFactory)Param.getMSF(), xTextDoc); + FormTools.switchDesignOf(Param.getMSF(), xTextDoc); // adding relation for XUpdateBroadcaster final XInterface ctrl = oObj; diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java index 5887999090df..9f187d49f630 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java +++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java @@ -102,13 +102,13 @@ public class TableWindowAccessibility extends TestCase { XStorable store = null; try { - ((XMultiServiceFactory) Param.getMSF()) + Param.getMSF() .createInstance("com.sun.star.sdb.DatabaseContext"); - oDBSource = ((XMultiServiceFactory) Param.getMSF()) + oDBSource = Param.getMSF() .createInstance("com.sun.star.sdb.DataSource"); - newQuery = ((XMultiServiceFactory) Param.getMSF()) + newQuery = Param.getMSF() .createInstance("com.sun.star.sdb.QueryDefinition"); - ((XMultiServiceFactory) Param.getMSF()) + Param.getMSF() .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); @@ -167,7 +167,7 @@ public class TableWindowAccessibility extends TestCase { XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource); store = UnoRuntime.queryInterface(XStorable.class, xDDS.getDatabaseDocument()); - aFile = utils.getOfficeTemp ((XMultiServiceFactory) Param.getMSF ())+"TableWindow.odb"; + aFile = utils.getOfficeTemp (Param.getMSF ())+"TableWindow.odb"; log.println("... filename will be "+aFile); store.storeAsURL(aFile,new PropertyValue[]{}); log.println("... done"); @@ -286,7 +286,7 @@ public class TableWindowAccessibility extends TestCase { loadProps[2].Name = "DataSource"; loadProps[2].Value = oDBSource; - QueryComponent = DesktopTools.loadDoc((XMultiServiceFactory) Param.getMSF (),".component:DB/QueryDesign",loadProps); + QueryComponent = DesktopTools.loadDoc(Param.getMSF (),".component:DB/QueryDesign",loadProps); xWindow = UnoRuntime.queryInterface(XModel.class, QueryComponent). getCurrentController().getFrame().getContainerWindow(); @@ -341,7 +341,7 @@ public class TableWindowAccessibility extends TestCase { log.println ("closing QueryComponent ..."); DesktopTools.closeDoc (QueryComponent); log.println ("... done"); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF (); + XMultiServiceFactory xMSF = Param.getMSF (); Object sfa = xMSF.createInstance ("com.sun.star.comp.ucb.SimpleFileAccess"); XSimpleFileAccess xSFA = UnoRuntime.queryInterface (XSimpleFileAccess.class, sfa); log.println ("deleting database file"); diff --git a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java index 655838c6e181..191b5b573d70 100644 --- a/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java +++ b/qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java @@ -44,7 +44,7 @@ import com.sun.star.uno.XInterface; public class OConnectionPool extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java index dd814bc47c7c..a8563b10d470 100644 --- a/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_defreg/NestedRegistry.java @@ -133,7 +133,7 @@ public class NestedRegistry extends TestCase { XInterface oObj = null; Object oInterface = null; - final String tmpDir = utils.getOfficeTempDirSys((XMultiServiceFactory)Param.getMSF()) ; + final String tmpDir = utils.getOfficeTempDirSys(Param.getMSF()) ; final String openF = tmpDir + "XSimpleRegistry_open" + uniq + ".rdb" ; final String destroyF = tmpDir + "XSimpleRegistry_destroy" + uniq + ".rdb" ; @@ -152,7 +152,7 @@ public class NestedRegistry extends TestCase { } try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); reg1 = RegistryTools. createRegistryService(xMSF) ; reg1.open(mergeF, false, true) ; diff --git a/qadevOOo/tests/java/mod/_dtrans/generic.java b/qadevOOo/tests/java/mod/_dtrans/generic.java index 69d210822ecb..893c0f70479c 100644 --- a/qadevOOo/tests/java/mod/_dtrans/generic.java +++ b/qadevOOo/tests/java/mod/_dtrans/generic.java @@ -42,7 +42,7 @@ public class generic extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java index 41a8923999a4..fd3f98cf1131 100644 --- a/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java +++ b/qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java @@ -58,7 +58,7 @@ public class Dynamic extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.loader.Dynamic" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_file/calc/ODriver.java b/qadevOOo/tests/java/mod/_file/calc/ODriver.java index 3f3154c80098..1e5cd0c47040 100644 --- a/qadevOOo/tests/java/mod/_file/calc/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/calc/ODriver.java @@ -67,8 +67,7 @@ public class ODriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)( - (XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.sdbc.calc.ODriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java index ca2e79e0f376..8ff4080d7874 100644 --- a/qadevOOo/tests/java/mod/_file/dbase/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/dbase/ODriver.java @@ -66,8 +66,7 @@ public class ODriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)( - (XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.sdbc.dbase.ODriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_file/flat/ODriver.java b/qadevOOo/tests/java/mod/_file/flat/ODriver.java index d2376207c123..da610ec6e9a6 100644 --- a/qadevOOo/tests/java/mod/_file/flat/ODriver.java +++ b/qadevOOo/tests/java/mod/_file/flat/ODriver.java @@ -64,8 +64,7 @@ public class ODriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)( - (XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.sdbc.flat.ODriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java index 7fc00c2b6d29..56b611f1b0c4 100644 --- a/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java +++ b/qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java @@ -55,7 +55,7 @@ public class SimpleFileAccess extends TestCase { Object oIH = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.comp.ucb.SimpleFileAccess"); oIH = xMSF.createInstance("com.sun.star.sdb.InteractionHandler"); diff --git a/qadevOOo/tests/java/mod/_fop/FolderPicker.java b/qadevOOo/tests/java/mod/_fop/FolderPicker.java index 597a8006837d..b3f04bc08585 100644 --- a/qadevOOo/tests/java/mod/_fop/FolderPicker.java +++ b/qadevOOo/tests/java/mod/_fop/FolderPicker.java @@ -68,7 +68,7 @@ public class FolderPicker extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index db79e6b0d213..8109ae63cee0 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -216,7 +216,7 @@ public class GenericModelTest extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); - m_xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); + m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); m_ConnectionColsed = false; debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE); m_propertiesToSet.clear(); @@ -370,7 +370,7 @@ public class GenericModelTest extends TestCase { PrintWriter log) { XInterface oObj = null; XControlShape aShape = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try{ log.println("adding contol shape '" + m_kindOfControl + "'"); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index 5cc64c8a5ca8..752909d85581 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java @@ -84,7 +84,7 @@ public class OButtonControl extends TestCase { * Creates a text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index f698c2a4433d..b536bb95c32d 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -92,7 +92,7 @@ public class OCheckBoxControl extends TestCase { * Creates a new text document. */ protected void initialize ( TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( ((XMultiServiceFactory)Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index 1afe97ec982a..ffe88d6dbfd0 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -96,7 +96,7 @@ public class OComboBoxControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index d8ee4393d218..aa93efb2a202 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java @@ -96,7 +96,7 @@ public class OCurrencyControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 464c00d50b1c..755a5713cb0f 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -232,11 +232,11 @@ public class ODatabaseForm extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { //log.println( "creating a draw document" ); //xTextDoc = WriterTools.createTextDoc(t((XMultiServiceFactory) Param.getMSF)); - tmpDir = utils.getOfficeTemp(((XMultiServiceFactory) tParam.getMSF())); + tmpDir = utils.getOfficeTemp((tParam.getMSF())); origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); - dbTools = new DBTools( (XMultiServiceFactory)tParam.getMSF(), log ); + dbTools = new DBTools( tParam.getMSF(), log ); // creating DataSource and registering it in DatabaseContext String dbURL = (String) tParam.get("test.db.url"); @@ -298,9 +298,9 @@ public class ODatabaseForm extends TestCase { do { tableName = "ODatabaseForm_tmp" + uniqueSuffix; oldF = utils.getFullURL(origDB); - newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + + newF = utils.getOfficeTemp(tParam.getMSF()) + tableName + ".dbf"; - } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && + } while (!utils.tryOverwriteFile((tParam.getMSF()), oldF, newF) && (uniqueSuffix++ < 50)); } } @@ -325,7 +325,7 @@ public class ODatabaseForm extends TestCase { } log.println("creating a text document"); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) Param.getMSF())); + xTextDoc = WriterTools.createTextDoc((Param.getMSF())); //initialize test table if (isMySQLDB) { diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index 1318aad9c8b2..20d534b5bdea 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -95,7 +95,7 @@ public class ODateControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index 3636c487358f..224dc0120da2 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -96,7 +96,7 @@ public class OEditControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 931e1fc167fc..5ced66e56103 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -95,7 +95,7 @@ public class OFileControlModel extends TestCase { * Creates Draw document where controls are placed. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); try { log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index e76ada4407ce..d0be922ff9e5 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -92,7 +92,7 @@ public class OFormattedControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index a0554eb987cc..8fec646b1692 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java +++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java @@ -77,7 +77,7 @@ public class OFormsCollection extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a draw document"); - xDrawDoc = DrawTools.createDrawDoc(((XMultiServiceFactory) tParam.getMSF())); + xDrawDoc = DrawTools.createDrawDoc((tParam.getMSF())); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index b2e40975be59..1f3faaac1980 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -262,7 +262,7 @@ class OGridControlModelold extends TestCase { * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index e055a5f2feaf..31020d53a82d 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -74,7 +74,7 @@ public class OGroupBoxControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index 689fd972b5e0..2c45dc939cea 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -92,7 +92,7 @@ public class OHiddenModel extends TestCase { * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); try { log.println("creating a draw document"); @@ -141,7 +141,7 @@ public class OHiddenModel extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); String objName = "HiddenControl"; XInterface ctrl = SOF.createControl(xDrawDoc, objName); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index 751bb12bc6de..432816831cff 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -79,7 +79,7 @@ public class OImageButtonControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index 6a184896c61e..c324c1d36407 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -80,7 +80,7 @@ public class OImageControlControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index ca4d5cb22e1c..0fe543fb2ff2 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -48,7 +48,7 @@ public class OListBoxControl extends TestCase { XTextDocument xTextDoc; protected void initialize ( TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( ((XMultiServiceFactory) Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index e99c832bd6d3..3d2fb2f1425a 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java @@ -49,7 +49,7 @@ public class ONavigationBarControl extends TestCase { * Creates a text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index 95467c74dd80..bb2119a7bf42 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -95,7 +95,7 @@ public class ONumericControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index b56e442e95e0..fecfbcdb5f76 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -95,7 +95,7 @@ public class OPatternControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index d15a961544a9..e687538e074d 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -83,7 +83,7 @@ public class ORadioButtonControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index d83ecbcb2409..183b1bc2e4eb 100644 --- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java @@ -42,7 +42,7 @@ public class OScrollBarModel extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); + xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java index 3dea0c2f06e5..630ebd224eba 100644 --- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java @@ -42,7 +42,7 @@ public class OSpinButtonModel extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); + xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index fc4eb5a849a3..581cde0c15cc 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -96,7 +96,7 @@ public class OTimeControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); @@ -228,7 +228,7 @@ public class OTimeControl extends TestCase { textComp.addTextListener(listener); tEnv.addObjRelation("TestTextListener", listener); - FormTools.switchDesignOf(((XMultiServiceFactory) Param.getMSF()), xTextDoc); + FormTools.switchDesignOf((Param.getMSF()), xTextDoc); shortWait(); return tEnv; diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java index e54adfae90de..0a93157f876e 100644 --- a/qadevOOo/tests/java/mod/_fps/FilePicker.java +++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java @@ -90,7 +90,7 @@ public class FilePicker extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object[] iniArgs = new Object[] { new Short (com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_READONLY_VERSION)}; diff --git a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java index f86e4d1d84f7..c56060f83026 100644 --- a/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java +++ b/qadevOOo/tests/java/mod/_ftransl/DataFormatTranslator.java @@ -63,7 +63,7 @@ public class DataFormatTranslator extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.datatransfer.DataFormatTranslator" ); } diff --git a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java index 7d7e0b9f5239..7390925211e8 100644 --- a/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ControlMenuController.java @@ -60,7 +60,7 @@ public class ControlMenuController extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.ControlMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/Desktop.java b/qadevOOo/tests/java/mod/_fwk/Desktop.java index e68f0b9b44c7..c7080e88ea42 100644 --- a/qadevOOo/tests/java/mod/_fwk/Desktop.java +++ b/qadevOOo/tests/java/mod/_fwk/Desktop.java @@ -93,7 +93,7 @@ public class Desktop extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a text document" ); @@ -107,7 +107,7 @@ public class Desktop extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.Desktop"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java index 2873cb192291..8c468beaa615 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java @@ -74,7 +74,7 @@ public class DispatchRecorder extends TestCase { XDispatchRecorder xDR = null; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); oDoc = SOF.createTextDoc(null); try { Thread.sleep(1000); @@ -93,7 +93,7 @@ public class DispatchRecorder extends TestCase { xFramePS.getPropertyValue("DispatchRecorderSupplier")); if (xDRS == null) { - Object oDRS = ((XMultiServiceFactory)Param.getMSF()).createInstance( + Object oDRS = Param.getMSF().createInstance( "com.sun.star.comp.framework.DispatchRecorderSupplier"); xFramePS.setPropertyValue("DispatchRecorderSupplier", oDRS); xDRS = UnoRuntime.queryInterface(XDispatchRecorderSupplier.class,oDRS); @@ -103,7 +103,7 @@ public class DispatchRecorder extends TestCase { if (xDR != null) { oObj = xDR; } else { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.DispatchRecorder"); xDR = UnoRuntime.queryInterface (XDispatchRecorder.class, oObj); @@ -115,7 +115,7 @@ public class DispatchRecorder extends TestCase { // fill recorder with content. It's needed for XIndexReplace - URL dispURL = utils.parseURL((XMultiServiceFactory) Param.getMSF(), ".uno:InsertDateField"); + URL dispURL = utils.parseURL(Param.getMSF(), ".uno:InsertDateField"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; prop.Value = "XDispatchRecorder.recordDispatch()"; @@ -140,7 +140,7 @@ public class DispatchRecorder extends TestCase { for (int n = 1; n < (THRCNT + 1); n++) { log.println("adding INSTANCE" + n + " as obj relation to environment"); - instanceURL = utils.parseURL((XMultiServiceFactory) Param.getMSF(), ".uno:InsertText"); + instanceURL = utils.parseURL(Param.getMSF(), ".uno:InsertText"); dispProp.Name = "Text"; dispProp.Value = "Instance " + n; dispArgs = new PropertyValue[] {dispProp}; diff --git a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java index b5c4aa6c6502..43dcbbb6f881 100644 --- a/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java @@ -50,7 +50,7 @@ public class DispatchRecorderSupplier extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.DispatchRecorderSupplier"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java index 0ca2de528e19..fbfc5d6b279a 100644 --- a/qadevOOo/tests/java/mod/_fwk/FontMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontMenuController.java @@ -34,7 +34,7 @@ public class FontMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.FontMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java index 27ee0a049236..d117a24dedf8 100644 --- a/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java @@ -34,7 +34,7 @@ public class FontSizeMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.FontSizeMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java index 0984baaae892..4e84afe2fc60 100644 --- a/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FooterMenuController.java @@ -34,7 +34,7 @@ public class FooterMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.FooterMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java index b8fdac98802e..3e704fc1ddd4 100644 --- a/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/FormatMenuController.java @@ -34,7 +34,7 @@ public class FormatMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.FormatMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/Frame.java b/qadevOOo/tests/java/mod/_fwk/Frame.java index 46a726ff8ea2..7a8f62415993 100644 --- a/qadevOOo/tests/java/mod/_fwk/Frame.java +++ b/qadevOOo/tests/java/mod/_fwk/Frame.java @@ -70,7 +70,7 @@ public class Frame extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a text document" ); diff --git a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java index d8a458195477..fc63456a4a9b 100644 --- a/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java @@ -34,7 +34,7 @@ public class HeaderMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.HeaderMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java index 2da3ba876870..48bee5e75beb 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobExecutor.java +++ b/qadevOOo/tests/java/mod/_fwk/JobExecutor.java @@ -104,7 +104,7 @@ public class JobExecutor extends TestCase { boolean configured = false; try { - Object obj = ((XMultiServiceFactory)Param.getMSF()).createInstance("test.Job"); + Object obj = Param.getMSF().createInstance("test.Job"); serviceRegistered = obj != null; } catch(com.sun.star.uno.Exception e) {} @@ -120,7 +120,7 @@ public class JobExecutor extends TestCase { XNameAccess jobs = null; XNameAccess events = null; try { - Object obj = ((XMultiServiceFactory)Param.getMSF()).createInstance + Object obj = Param.getMSF().createInstance ("com.sun.star.configuration.ConfigurationProvider"); XMultiServiceFactory xConfigMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, obj); PropertyValue[] args = new PropertyValue[1]; @@ -203,9 +203,9 @@ public class JobExecutor extends TestCase { Object job = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.JobExecutor"); - job = ((XMultiServiceFactory)Param.getMSF()).createInstance("test.Job"); + job = Param.getMSF().createInstance("test.Job"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException( diff --git a/qadevOOo/tests/java/mod/_fwk/JobHandler.java b/qadevOOo/tests/java/mod/_fwk/JobHandler.java index ec582c230954..c4c051b77a87 100644 --- a/qadevOOo/tests/java/mod/_fwk/JobHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/JobHandler.java @@ -50,7 +50,7 @@ public class JobHandler extends TestCase { boolean serviceRegistered = false; try { - Object obj = ((XMultiServiceFactory)Param.getMSF()).createInstance("test.Job"); + Object obj = Param.getMSF().createInstance("test.Job"); serviceRegistered = obj != null; } catch(com.sun.star.uno.Exception e) {} @@ -65,7 +65,7 @@ public class JobHandler extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.jobs.JobDispatch"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java index 5b6321816d3a..feec68b53952 100644 --- a/qadevOOo/tests/java/mod/_fwk/LayoutManager.java +++ b/qadevOOo/tests/java/mod/_fwk/LayoutManager.java @@ -72,7 +72,7 @@ public class LayoutManager extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); log.println("Creating instance..."); diff --git a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java index ee21c236d013..4347bd371ba0 100644 --- a/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java @@ -34,7 +34,7 @@ public class MacrosMenuController extends TestCase{ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.MacrosMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java index 27f9c163a7b3..80f01c881609 100644 --- a/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java +++ b/qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java @@ -52,7 +52,7 @@ public class MailToDispatcher extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.MailToDispatcher"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java index d896e5d918b0..6f4e0060c9f4 100644 --- a/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java @@ -34,7 +34,7 @@ public class MenuBarFactory extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.MenuBarFactory"); tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java index 5c781f099c86..fabae071f0c0 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleManager.java @@ -71,7 +71,7 @@ public class ModuleManager extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.ModuleManager"); } catch(Exception e) { e.printStackTrace(log); @@ -80,7 +80,7 @@ public class ModuleManager extends TestCase { } // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); // get text document interfaces try { diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java index 21945a1dcb5b..4e1653fd5c08 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java @@ -76,7 +76,7 @@ public class ModuleUIConfigurationManager extends TestCase { TestEnvironment tEnv = null; try { - xMSF = (XMultiServiceFactory)tParam.getMSF(); + xMSF = tParam.getMSF(); log.println("Creating instance..."); xTextDoc = WriterTools.createTextDoc(xMSF); diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java index 5967689de641..0cf94ae38842 100644 --- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java +++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java @@ -35,7 +35,7 @@ public class ModuleUIConfigurationManagerSupplier extends TestCase{ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); oObj = (XInterface)xMSF.createInstance("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"); tEnv = new TestEnvironment(oObj); tEnv.addObjRelation("XModuleUIConfigurationManagerSupplier.ConfigurationManager", diff --git a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java index 158e3073dda1..c55afc396ffe 100644 --- a/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java @@ -69,7 +69,7 @@ public class ObjectMenuController extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.ObjectMenuController"); diff --git a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java index d985a0f6a73b..7b9b70087ad3 100644 --- a/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java @@ -66,7 +66,7 @@ public class PopupMenuControllerFactory extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface xInst = null; log.println("Creating instance..."); diff --git a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java index d2f2d9e00870..a74a7afdfffc 100644 --- a/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/ServiceHandler.java @@ -52,7 +52,7 @@ public class ServiceHandler extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.ServiceHandler"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java index 2e707a6affdd..2e878629802c 100644 --- a/qadevOOo/tests/java/mod/_fwk/SoundHandler.java +++ b/qadevOOo/tests/java/mod/_fwk/SoundHandler.java @@ -52,7 +52,7 @@ public class SoundHandler extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.frame.ContentHandler"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); @@ -61,7 +61,7 @@ public class SoundHandler extends TestCase { } TestEnvironment tEnv = new TestEnvironment( oObj ); - URL dispURL = utils.parseURL((XMultiServiceFactory)Param.getMSF(), + URL dispURL = utils.parseURL(Param.getMSF(), utils.getFullTestURL("ok.wav")); System.out.println("DISPATCHURL: "+ dispURL.Complete); diff --git a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java index 1cda12f51897..e8499e3c0c70 100644 --- a/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java +++ b/qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java @@ -35,7 +35,7 @@ public class StatusBarControllerFactory extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.StatusBarControllerFactory"); diff --git a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java index 1a2962f3c891..59f540a0f3cf 100644 --- a/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java +++ b/qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java @@ -34,7 +34,7 @@ public class ToolBarsMenuController extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.ToolBarsMenuController"); } diff --git a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java index e32b6650c46e..5799b79c1c3c 100644 --- a/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java @@ -34,7 +34,7 @@ public class UICategoryDescription extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.comp.framework.UICategoryDescription"); } diff --git a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java index f7a4714f45d9..2ec3390c2564 100644 --- a/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java +++ b/qadevOOo/tests/java/mod/_fwk/UICommandDescription.java @@ -31,7 +31,7 @@ public class UICommandDescription extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { oObj = (XInterface)xMSF.createInstance("com.sun.star.frame.UICommandDescription"); } diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 51f3b2a77d14..6a1992f586dd 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -59,7 +59,7 @@ public class UIConfigurationManager extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); log.println("Creating instance..."); diff --git a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java index 20cf909ca3cc..f6511cb4a862 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java @@ -69,7 +69,7 @@ public class UIElementFactoryManager extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { TestEnvironment tEnv = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); log.println("Creating instance..."); xTextDoc = WriterTools.createTextDoc(xMSF); diff --git a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java index 1e5a74d1358a..ec64613aede9 100644 --- a/qadevOOo/tests/java/mod/_fwk/URLTransformer.java +++ b/qadevOOo/tests/java/mod/_fwk/URLTransformer.java @@ -48,7 +48,7 @@ public class URLTransformer extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.framework.URLTransformer"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java index ee007bcaa6d0..4f0c4f4a22bd 100644 --- a/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java @@ -65,7 +65,7 @@ public class ContentHandlerFactory extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.frame.ContentHandlerFactory") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java index 7d28cea3e46b..4758b27c1af6 100644 --- a/qadevOOo/tests/java/mod/_fwl/FilterFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FilterFactory.java @@ -71,7 +71,7 @@ public class FilterFactory extends TestCase { Object oInterface = null ; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.document.FilterFactory") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java index 4260ac315676..f517f65c55ad 100644 --- a/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java +++ b/qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java @@ -64,7 +64,7 @@ public class FrameLoaderFactory extends TestCase { Object oInterface = null ; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.frame.FrameLoaderFactory") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_fwl/PathSettings.java b/qadevOOo/tests/java/mod/_fwl/PathSettings.java index 6e91ee8363fc..9b4e42cdd160 100644 --- a/qadevOOo/tests/java/mod/_fwl/PathSettings.java +++ b/qadevOOo/tests/java/mod/_fwl/PathSettings.java @@ -98,7 +98,7 @@ public class PathSettings extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.comp.framework.PathSettings") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java index 6611333cb198..76883c1d8377 100644 --- a/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java +++ b/qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java @@ -58,7 +58,7 @@ public class SubstituteVariables extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.util.PathSubstitution") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index 5adc3755c952..43f04cc22cd5 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -91,7 +91,7 @@ public class TypeDetection extends TestCase { Object oInterface = null ; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.document.TypeDetection") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); @@ -139,14 +139,14 @@ public class TypeDetection extends TestCase { log.println("create text document with bookmarks"); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); String fileURL = null; try { xTextDoc = SOF.createTextDoc( null ); XInterface xBookMark = SOfficeFactory.createBookmark( xTextDoc ); SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) xBookMark ); - fileURL = utils.getOfficeTemp((XMultiServiceFactory)Param.getMSF() ); + fileURL = utils.getOfficeTemp(Param.getMSF() ); fileURL = fileURL + "bookmarks.oot"; XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); diff --git a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java index 9eda614abf7c..14189caec3c2 100644 --- a/qadevOOo/tests/java/mod/_i18n/BreakIterator.java +++ b/qadevOOo/tests/java/mod/_i18n/BreakIterator.java @@ -56,7 +56,7 @@ public class BreakIterator extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -80,7 +80,7 @@ public class BreakIterator extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.i18n.BreakIterator" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java index 253674a61d81..78299b030a92 100644 --- a/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java +++ b/qadevOOo/tests/java/mod/_i18n/CalendarImpl.java @@ -50,7 +50,7 @@ public class CalendarImpl extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.i18n.LocaleCalendar" ); } diff --git a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java index 5cc036f7cc01..b2d75a72edaa 100644 --- a/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java +++ b/qadevOOo/tests/java/mod/_i18n/ChapterCollator.java @@ -55,7 +55,7 @@ public class ChapterCollator extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.i18n.ChapterCollator" ); } diff --git a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java index 3b5e751f5997..780c6a73acd1 100644 --- a/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java +++ b/qadevOOo/tests/java/mod/_i18n/CharacterClassification.java @@ -57,7 +57,7 @@ public class CharacterClassification extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.i18n.CharacterClassification" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_i18n/Collator.java b/qadevOOo/tests/java/mod/_i18n/Collator.java index 9117f3d6cfe5..6d3248d8ac37 100644 --- a/qadevOOo/tests/java/mod/_i18n/Collator.java +++ b/qadevOOo/tests/java/mod/_i18n/Collator.java @@ -53,7 +53,7 @@ public class Collator extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.i18n.Collator" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java index 5071a614d9a6..3b6344cd3fb6 100644 --- a/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java +++ b/qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java @@ -57,7 +57,7 @@ public class IndexEntrySupplier extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.i18n.IndexEntrySupplier" ); } diff --git a/qadevOOo/tests/java/mod/_i18n/LocaleData.java b/qadevOOo/tests/java/mod/_i18n/LocaleData.java index e31faafe21f3..b85cf19111a0 100644 --- a/qadevOOo/tests/java/mod/_i18n/LocaleData.java +++ b/qadevOOo/tests/java/mod/_i18n/LocaleData.java @@ -57,7 +57,7 @@ public class LocaleData extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.i18n.LocaleData" ); } catch( com.sun.star.uno.Exception e ) { log.println("LocaleData Service not available" ); diff --git a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java index 667a033accff..8fdc8a8d2f6b 100644 --- a/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java +++ b/qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java @@ -60,7 +60,7 @@ public class NumberFormatCodeMapper extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.i18n.NumberFormatCodeMapper" ); } diff --git a/qadevOOo/tests/java/mod/_i18n/Transliteration.java b/qadevOOo/tests/java/mod/_i18n/Transliteration.java index bca12d805d19..8e9de0d76414 100644 --- a/qadevOOo/tests/java/mod/_i18n/Transliteration.java +++ b/qadevOOo/tests/java/mod/_i18n/Transliteration.java @@ -53,7 +53,7 @@ public class Transliteration extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.i18n.Transliteration" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java index a120df1c5175..eb2886438291 100644 --- a/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java @@ -50,7 +50,7 @@ public class ImplementationRegistration extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.registry.ImplementationRegistration" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java index 904c08053337..5b9ceaf5bd64 100644 --- a/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java +++ b/qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java @@ -55,7 +55,7 @@ public class ImplementationRegistration extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.registry.ImplementationRegistration" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_insp/Introspection.java b/qadevOOo/tests/java/mod/_insp/Introspection.java index 1909cb7a25dd..26774dd23dbe 100644 --- a/qadevOOo/tests/java/mod/_insp/Introspection.java +++ b/qadevOOo/tests/java/mod/_insp/Introspection.java @@ -54,7 +54,7 @@ public class Introspection extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.Introspection" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java index 544dcb558683..71c8f6c5c311 100644 --- a/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java +++ b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java @@ -49,7 +49,7 @@ public class Introspection extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.Introspection" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_inv/Invocation.java b/qadevOOo/tests/java/mod/_inv/Invocation.java index c91a25b01037..19214ba7d17b 100644 --- a/qadevOOo/tests/java/mod/_inv/Invocation.java +++ b/qadevOOo/tests/java/mod/_inv/Invocation.java @@ -65,7 +65,7 @@ public class Invocation extends TestCase { * </ul> */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java index a91c53e60e0e..71b3d4dd72b7 100644 --- a/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java @@ -49,7 +49,7 @@ public class InvocationAdapterFactory extends TestCase { * <code>com.sun.star.script.InvocationAdapterFactory</code>. */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java index 0e70b3017c1c..1681aedb9b76 100644 --- a/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java +++ b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java @@ -48,7 +48,7 @@ public class InvocationAdapterFactory extends TestCase { */ protected TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java index 42acae957131..140ad5cbacad 100644 --- a/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java +++ b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java @@ -63,7 +63,7 @@ public class Invocation extends TestCase { * </ul> */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java index c3f71e730f87..3f39a429b07e 100644 --- a/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java @@ -63,7 +63,7 @@ public class JavaComponentLoader extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.comp.stoc.JavaComponentLoader" ); } diff --git a/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java index 3f31adb438c9..fca32ef203ea 100644 --- a/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java +++ b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java @@ -58,7 +58,7 @@ public class JavaComponentLoader extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.comp.stoc.JavaComponentLoader" ); } diff --git a/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java index 20b229546c34..d0e5bbaa92ac 100644 --- a/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java @@ -51,7 +51,7 @@ public class JavaVirtualMachine extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java index 750120670ec6..b2b76a83130c 100644 --- a/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java +++ b/qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java @@ -62,7 +62,7 @@ public class JDBCDriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.sdbc.JDBCDriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java index 9fd8f50a9024..683d60bf2888 100644 --- a/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java +++ b/qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java @@ -53,7 +53,7 @@ public class JavaVirtualMachine extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_lng/DicList.java b/qadevOOo/tests/java/mod/_lng/DicList.java index d5b93ce3f5be..8453d66b603f 100644 --- a/qadevOOo/tests/java/mod/_lng/DicList.java +++ b/qadevOOo/tests/java/mod/_lng/DicList.java @@ -68,7 +68,7 @@ public class DicList extends TestCase { public synchronized TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_lng/LinguProps.java b/qadevOOo/tests/java/mod/_lng/LinguProps.java index 8fd6c1ef5c17..262027a02c4a 100644 --- a/qadevOOo/tests/java/mod/_lng/LinguProps.java +++ b/qadevOOo/tests/java/mod/_lng/LinguProps.java @@ -66,7 +66,7 @@ public class LinguProps extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java index 7f1c9c6cb6c5..b2e75881a44d 100644 --- a/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java +++ b/qadevOOo/tests/java/mod/_lng/LngSvcMgr.java @@ -60,7 +60,7 @@ public class LngSvcMgr extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java index 0d89efa13059..2c447c0d18b6 100644 --- a/qadevOOo/tests/java/mod/_lnn/Hyphenator.java +++ b/qadevOOo/tests/java/mod/_lnn/Hyphenator.java @@ -74,7 +74,7 @@ public class Hyphenator extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java index 85fa590e6c0c..09af542ecec4 100644 --- a/qadevOOo/tests/java/mod/_lnn/SpellChecker.java +++ b/qadevOOo/tests/java/mod/_lnn/SpellChecker.java @@ -72,7 +72,7 @@ public class SpellChecker extends TestCase { */ protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface oObj = null; Object LinguServiceManager = null; diff --git a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java index d539c461e8df..0bf6febc644a 100644 --- a/qadevOOo/tests/java/mod/_lnn/Thesaurus.java +++ b/qadevOOo/tests/java/mod/_lnn/Thesaurus.java @@ -67,7 +67,7 @@ public class Thesaurus extends TestCase { */ protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java index db1edb917ed1..1d67600ed64b 100644 --- a/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java +++ b/qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java @@ -59,7 +59,7 @@ public class MimeContentTypeFactory extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { diff --git a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java index 798a5eb0ac45..386e370d55f8 100644 --- a/qadevOOo/tests/java/mod/_mozab/MozabDriver.java +++ b/qadevOOo/tests/java/mod/_mozab/MozabDriver.java @@ -63,7 +63,7 @@ public class MozabDriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()). + oObj = (XInterface)Param.getMSF(). createInstance("com.sun.star.comp.sdbc.MozabDriver"); } catch (com.sun.star.uno.Exception e) { throw new StatusException(Status.failed("Couldn't create object")); diff --git a/qadevOOo/tests/java/mod/_namingservice/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/NamingService.java index ff45a7e28503..3000a4ec7c4b 100644 --- a/qadevOOo/tests/java/mod/_namingservice/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice/NamingService.java @@ -63,7 +63,7 @@ public class NamingService extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.uno.NamingService" ); } @@ -79,7 +79,7 @@ public class NamingService extends TestCase { // objRelation for XNamingService as object to be registered try { tEnv.addObjRelation("XNamingService.RegisterObject", - ((XMultiServiceFactory)Param.getMSF()).createInstance + Param.getMSF().createInstance ("com.sun.star.lang.ServiceManager")) ; } catch (com.sun.star.uno.Exception e) { log.println("Can't create object relation") ; diff --git a/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java index d200b8c97270..4147ea9464d0 100644 --- a/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java +++ b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java @@ -60,7 +60,7 @@ public class NamingService extends TestCase { XMultiServiceFactory xMSF = null; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.uno.NamingService" ); } diff --git a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java index 05b02b2fcf42..5269f3320a56 100644 --- a/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java +++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java @@ -129,7 +129,7 @@ public class NestedRegistry extends TestCase { Object oInterface = null; final String tmpDir = utils.getOfficeTempDirSys( - (XMultiServiceFactory)Param.getMSF()) ; + Param.getMSF()) ; final String openF = tmpDir + "XSimpleRegistry_open" + uniq + ".rdb" ; final String destroyF = tmpDir + "XSimpleRegistry_destroy" + uniq + ".rdb" ; @@ -148,7 +148,7 @@ public class NestedRegistry extends TestCase { } try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); reg1 = RegistryTools. createRegistryService(xMSF) ; reg1.open(mergeF, false, true) ; diff --git a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java index 127dad682ef2..843b51f46351 100644 --- a/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java +++ b/qadevOOo/tests/java/mod/_odbc/ODBCDriver.java @@ -59,7 +59,7 @@ public class ODBCDriver extends TestCase { XInterface oObj = null; try { - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance( + oObj = (XInterface)Param.getMSF().createInstance( "com.sun.star.comp.sdbc.ODBCDriver"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java index 9717505efffe..5f0c49ebdc11 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspector.java @@ -75,7 +75,7 @@ public class ObjectInspector extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println("create a desktop..."); - StarDesktop = DesktopTools.createDesktop((XMultiServiceFactory) Param.getMSF()); + StarDesktop = DesktopTools.createDesktop(Param.getMSF()); if (StarDesktop == null){ throw new StatusException("Could not get a Desktop: null", null); } @@ -99,7 +99,7 @@ public class ObjectInspector extends TestCase { this.cleanup(tParam, log); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface oInspector = (XInterface) xMSF.createInstance("com.sun.star.inspection.ObjectInspector"); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java index c9846f6f4cae..26dec23177f1 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java @@ -67,7 +67,7 @@ public class ObjectInspectorModel extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println("create a desktop..."); - StarDesktop = DesktopTools.createDesktop((XMultiServiceFactory) Param.getMSF()); + StarDesktop = DesktopTools.createDesktop(Param.getMSF()); if (StarDesktop == null){ throw new StatusException("Could not get a Desktop: null", null); } @@ -89,7 +89,7 @@ public class ObjectInspectorModel extends TestCase { this.cleanup(tParam, log); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XPropertySet xMSFProp = UnoRuntime.queryInterface(XPropertySet.class, xMSF); XComponentContext xDefaultContext = null; diff --git a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java index 2f7ba4829ec1..5f4878f57149 100644 --- a/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java @@ -51,7 +51,7 @@ public class ProxyFactory extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java index a4523c031fa4..d5e00292893b 100644 --- a/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java +++ b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java @@ -49,7 +49,7 @@ public class ProxyFactory extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java index b81b5e8326e5..5782458fa340 100644 --- a/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java +++ b/qadevOOo/tests/java/mod/_qadevOOo/SelfTest.java @@ -40,7 +40,7 @@ public class SelfTest extends TestCase protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); log.println("initialize the selftest"); try diff --git a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java index 19c33c8f4273..20c768f57bb3 100644 --- a/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider.java @@ -77,7 +77,7 @@ public class RegistryTypeDescriptionProvider extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context diff --git a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java index 9f1d9d594022..a248041b30c8 100644 --- a/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java +++ b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java @@ -72,7 +72,7 @@ public class RegistryTypeDescriptionProvider extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index 3a44607ead1e..ae2f76d04169 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -178,7 +178,7 @@ public class various extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_remotebridge/various.java b/qadevOOo/tests/java/mod/_remotebridge/various.java index 6801e642d9fb..27b1558e6331 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/various.java @@ -171,7 +171,7 @@ public class various extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java index 9013668a1efe..81892bd64fe8 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java @@ -148,7 +148,7 @@ public class AccessibleEditableTextPara_HeaderFooter extends TestCase { * Opens new writer document. */ protected void initialize(TestParameters Param, PrintWriter log) { - msf = (XMultiServiceFactory) Param.getMSF(); + msf = Param.getMSF(); try { SOfficeFactory SOF = SOfficeFactory.getFactory(msf); diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java index 930031ebfd56..fd657866240c 100644 --- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java @@ -58,7 +58,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { * Creates a spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); xSheetDoc = SOF.createCalcDoc(null); @@ -121,7 +121,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ( (XMultiServiceFactory) Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); aParseURL[0].Complete = ".uno:PrintPreview"; @@ -145,7 +145,7 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) Param.getMSF(), xModel)); + Param.getMSF(), xModel)); if (xRoot != null) { AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE_CELL, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java index 09cb12e28893..24f79b4ce2de 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java @@ -90,7 +90,7 @@ public class ScAccessibleCell extends TestCase { TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); @@ -104,7 +104,7 @@ public class ScAccessibleCell extends TestCase { XModel aModel = UnoRuntime.queryInterface(XModel.class, xSpreadsheetDoc); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java index 72199eef0bf1..c149e18e2eeb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java @@ -63,7 +63,7 @@ public class ScAccessibleCsvCell extends TestCase { shortWait(); try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance + oObj = (XInterface) tParam.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -138,7 +138,7 @@ public class ScAccessibleCsvCell extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); log.println("opening dialog"); @@ -146,7 +146,7 @@ public class ScAccessibleCsvCell extends TestCase { try { args[0] = new PropertyValue(); args[0].Name = "InteractionHandler"; - args[0].Value = ((XMultiServiceFactory)Param.getMSF()).createInstance( + args[0].Value = Param.getMSF().createInstance( "com.sun.star.comp.uui.UUIInteractionHandler"); } catch(com.sun.star.uno.Exception e) { } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java index d8f12e493846..ce78f5bd4992 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java @@ -63,7 +63,7 @@ public class ScAccessibleCsvGrid extends TestCase { shortWait(); try { - oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance + oObj = (XInterface) Param.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -133,7 +133,7 @@ public class ScAccessibleCsvGrid extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); log.println("opening dialog"); @@ -141,7 +141,7 @@ public class ScAccessibleCsvGrid extends TestCase { try { args[0] = new PropertyValue(); args[0].Name = "InteractionHandler"; - args[0].Value = ((XMultiServiceFactory)Param.getMSF()).createInstance( + args[0].Value = Param.getMSF().createInstance( "com.sun.star.comp.uui.UUIInteractionHandler"); } catch(com.sun.star.uno.Exception e) { } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index c43c8762ed53..0ce9ab6bed39 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -64,7 +64,7 @@ public class ScAccessibleCsvRuler extends TestCase { shortWait(); - XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory msf = Param.getMSF(); try { oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit"); @@ -162,7 +162,7 @@ public class ScAccessibleCsvRuler extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); log.println("opening dialog"); @@ -170,7 +170,7 @@ public class ScAccessibleCsvRuler extends TestCase { try { args[0] = new PropertyValue(); args[0].Name = "InteractionHandler"; - args[0].Value = ((XMultiServiceFactory)Param.getMSF()).createInstance( + args[0].Value = Param.getMSF().createInstance( "com.sun.star.comp.uui.UUIInteractionHandler"); } catch(com.sun.star.uno.Exception e) { } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index 91e76dba66f1..4652f4ce067f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -87,7 +87,7 @@ public class ScAccessibleDocument extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, ""); @@ -132,7 +132,7 @@ public class ScAccessibleDocument extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index ab2bf0d685f3..017b0459307f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -135,7 +135,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -156,7 +156,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); @@ -168,7 +168,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); XDesktop desk = UnoRuntime.queryInterface( - XDesktop.class,util.DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF())); + XDesktop.class,util.DesktopTools.createDesktop(Param.getMSF())); final XWindow win = desk.getCurrentFrame().getComponentWindow(); tEnv.addObjRelation("EventProducer", @@ -208,7 +208,7 @@ public class ScAccessibleDocumentPagePreview extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index 484ccf4bbcf4..6590a31dc4eb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -121,7 +121,7 @@ public class ScAccessiblePageHeader extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ( (XMultiServiceFactory) Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -144,7 +144,7 @@ public class ScAccessiblePageHeader extends TestCase { throw new RuntimeException(e); } try { - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole @@ -265,7 +265,7 @@ public class ScAccessiblePageHeader extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index 558143ad011c..e0e4581da3bc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -117,7 +117,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ( (XMultiServiceFactory) Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -138,7 +138,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); try { @@ -203,7 +203,7 @@ public class ScAccessiblePageHeaderArea extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java index 5acfdd26bafc..ae87bb79685f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java @@ -82,7 +82,7 @@ public class ScAccessiblePreviewCell extends TestCase { * Creates a spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); xSheetDoc = SOF.createCalcDoc(null); @@ -144,7 +144,7 @@ public class ScAccessiblePreviewCell extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); aParseURL[0].Complete = ".uno:PrintPreview"; @@ -168,7 +168,7 @@ public class ScAccessiblePreviewCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) Param.getMSF(), xModel)); + Param.getMSF(), xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE_CELL, true); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index 9cdce91ec9b9..2a8c2e9b8e31 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -124,7 +124,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { util.DesktopTools.closeDoc(oComp); } - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a Spreadsheet document"); @@ -221,7 +221,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { xController); XURLTransformer xParser = UnoRuntime.queryInterface( XURLTransformer.class, - ( (XMultiServiceFactory) Param.getMSF()) + Param.getMSF() .createInstance("com.sun.star.util.URLTransformer")); URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -249,7 +249,7 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { try { XAccessible xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) Param.getMSF(), xModel)); + Param.getMSF(), xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE, "A"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java index 2d1bbcfad274..f0658ddd5151 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java @@ -84,7 +84,7 @@ public class ScAccessiblePreviewTable extends TestCase { * Creates a spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); xSheetDoc = SOF.createCalcDoc(null); @@ -147,7 +147,7 @@ public class ScAccessiblePreviewTable extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); aParseURL[0].Complete = ".uno:PrintPreview"; @@ -172,7 +172,7 @@ public class ScAccessiblePreviewTable extends TestCase { try { xRoot = AccessibilityTools.getAccessibleObject( AccessibilityTools.getCurrentContainerWindow( - (XMultiServiceFactory)Param.getMSF(), xModel)); + Param.getMSF(), xModel)); if (xRoot != null) { oObj = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TABLE); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index ab30d7cf7ed8..7ba2f5ec9e3a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -73,7 +73,7 @@ public class ScAccessibleSpreadsheet extends TestCase { * Creates a spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); xSheetDoc = SOF.createCalcDoc(null); @@ -109,7 +109,7 @@ public class ScAccessibleSpreadsheet extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), xModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), xModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java index a88417820ab0..0357a008a67d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java @@ -69,7 +69,7 @@ public class ScAnnotationObj extends TestCase { * Creates a spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java index 3febbf16a107..e40e6f0aeb62 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java @@ -76,7 +76,7 @@ public class ScAnnotationShapeObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = - SOfficeFactory.getFactory((XMultiServiceFactory) tParam + SOfficeFactory.getFactory(tParam .getMSF()); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java index 91224f380248..1ee8eff35241 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java @@ -63,7 +63,7 @@ public class ScAnnotationTextCursor extends TestCase { private XSpreadsheetDocument xSheetDoc = null; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java index 4dd5b489680e..db5eb57264ac 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java @@ -70,7 +70,7 @@ public class ScAnnotationsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java index dfc852b1c0bf..2b4f27f74034 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java @@ -69,7 +69,7 @@ public class ScAreaLinkObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java index a144964c2c0e..18fcb48fa341 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java @@ -65,7 +65,7 @@ public class ScAreaLinksObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java index 1e7ccb439711..936f1e62aa82 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java @@ -72,7 +72,7 @@ public class ScAutoFormatFieldObj extends TestCase { log.println ("create Object ...") ; // creation of testobject here - XInterface formats = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance + XInterface formats = (XInterface)Param.getMSF().createInstance ("com.sun.star.sheet.TableAutoFormats"); XIndexAccess formatsIndex = UnoRuntime.queryInterface (XIndexAccess.class, formats); diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java index 0a012a181672..e2bb6df5392f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java @@ -74,7 +74,7 @@ public class ScAutoFormatObj extends TestCase { PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory oMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory oMSF = tParam.getMSF(); try { XInterface formats = (XInterface)oMSF.createInstance ("com.sun.star.sheet.TableAutoFormats"); diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java index a719d404da41..81e0522d290e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java @@ -66,7 +66,7 @@ public class ScAutoFormatsObj extends TestCase{ * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -114,7 +114,7 @@ public class ScAutoFormatsObj extends TestCase{ XComponent xComp = UnoRuntime.queryInterface (XComponent.class, xSheetDoc); oObj = (XInterface) AnyConverter.toObject( - new Type(XInterface.class),((XMultiServiceFactory)Param.getMSF()).createInstance + new Type(XInterface.class),Param.getMSF().createInstance ("com.sun.star.sheet.TableAutoFormats")); Object secondInstance = SOF.createInstance (xComp, "com.sun.star.sheet.TableAutoFormat"); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java index 523ccc89e456..e17a97b31731 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java @@ -105,7 +105,7 @@ public class ScCellCursorObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java index f47206410c59..903c87672782 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java @@ -70,7 +70,7 @@ public class ScCellFieldObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java index 89aca9cd8466..d7e0cba94216 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java @@ -65,7 +65,7 @@ public class ScCellFieldsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java index d598f1a07349..76d9028f7943 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java @@ -58,7 +58,7 @@ public class ScCellFormatsEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java index fb5fbc60b504..29935fa0374e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java @@ -60,7 +60,7 @@ public class ScCellFormatsObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java index 928cf2011382..2589679a92bd 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java @@ -87,7 +87,7 @@ public class ScCellObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "Creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java index abf41679015c..0683f06efe52 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java @@ -92,7 +92,7 @@ public class ScCellRangeObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java index e7d5cd7b5868..1c9ce57a36b3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java @@ -91,7 +91,7 @@ public class ScCellRangesObj extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); @@ -141,7 +141,7 @@ public class ScCellRangesObj extends TestCase { log.println( "Creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); log.println("Getting test object "); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java index 7bc68aadd224..84c893de8607 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java @@ -67,7 +67,7 @@ public class ScCellSearchObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java index ace8af3f50b8..9e51e1be6c32 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java @@ -95,7 +95,7 @@ public class ScCellTextCursor extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java index f811655d160b..cd455414da82 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java @@ -60,7 +60,7 @@ public class ScCellsEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java index a22119fea43a..2561cbbf4de0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java @@ -64,7 +64,7 @@ public class ScCellsObj extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java index 34e2f0830b91..4b0f771e77ef 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java @@ -70,7 +70,7 @@ public class ScChartObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java index c85646d1d220..9f86642d9544 100644 --- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java @@ -71,7 +71,7 @@ public class ScChartsObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java index 5d03ea9fbdb8..b63adf96c82f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java +++ b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java @@ -52,7 +52,7 @@ public class ScConsolidationDescriptor extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java index b98783087ed5..dc0e56f85661 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java @@ -67,7 +67,7 @@ public class ScDDELinkObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -132,7 +132,7 @@ public class ScDDELinkObj extends TestCase { // create testobject here - XMultiServiceFactory oMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oMSF = Param.getMSF(); // load the predefined testdocument String testdoc = util.utils.getFullTestURL("ScDDELinksObj.ods"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java index b9af7133ea5a..8ca54543e4c5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java @@ -65,7 +65,7 @@ public class ScDDELinksObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -112,7 +112,7 @@ public class ScDDELinksObj extends TestCase { // create testobject here - XMultiServiceFactory oMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oMSF = Param.getMSF(); // load the predefined testdocument String testdoc = utils.getFullTestURL("ScDDELinksObj.ods"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index e18f8990c229..884acefac541 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -65,7 +65,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( - (XMultiServiceFactory) tParam.getMSF ()); + tParam.getMSF ()); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index a8ac4a2d8ba4..5f791cf3c255 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -64,7 +64,7 @@ public class ScDataPilotFieldGroupObj extends TestCase protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( - (XMultiServiceFactory) tParam.getMSF ()); + tParam.getMSF ()); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 3560f61c915f..2fc6f8ecedcf 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -64,7 +64,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase protected void initialize (TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory ( - (XMultiServiceFactory) tParam.getMSF ()); + tParam.getMSF ()); try { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 73c2b8b8e224..b0a8c501c58b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -77,7 +77,7 @@ public class ScDataPilotFieldObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java index b114991b3f3e..217788e8d914 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java @@ -63,7 +63,7 @@ public class ScDataPilotFieldsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index d4ee87310b09..db1f6a0bb5c1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -78,7 +78,7 @@ public class ScDataPilotItemObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index 8e450ba23bd8..f7894bcfc3ca 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -78,7 +78,7 @@ public class ScDataPilotItemsObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java index b2d83385149a..5763b8335a5b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java @@ -69,7 +69,7 @@ public class ScDataPilotTableObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java index 60823b792cfe..5b07d9ef419b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java @@ -66,7 +66,7 @@ public class ScDataPilotTablesObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java index 69e113b18509..03de4460f03f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java @@ -77,7 +77,7 @@ public class ScDatabaseRangeObj extends TestCase { */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java index 47ef632ace49..05f24633a593 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java @@ -61,7 +61,7 @@ public class ScDatabaseRangesObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java index 91bc24c926be..2aa924552e41 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java +++ b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java @@ -39,7 +39,7 @@ public class ScDocumentConfiguration extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a sheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java index e1addb43d9e6..1b487e1a9198 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java @@ -50,7 +50,7 @@ public class ScDrawPageObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); @@ -110,7 +110,7 @@ public class ScDrawPageObj extends TestCase { oObj = (XDrawPage) AnyConverter.toObject( new Type(XDrawPage.class),oDP.getByIndex(0)); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xComp,5000,3500,7500,5000,"Rectangle"); DrawTools.getShapes((XDrawPage) oObj).add(oShape); diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java index ec5d7e5ca290..2a558c32f445 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java @@ -66,7 +66,7 @@ public class ScDrawPagesObj extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java index 60bca50afb3c..4931b0144bb3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java @@ -64,7 +64,7 @@ public class ScFilterDescriptorBase extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java index b40d972d3c6d..2d75835d63de 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java @@ -38,7 +38,7 @@ public class ScFunctionDescriptionObj extends TestCase { private XSpreadsheetDocument xSheetDoc = null; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -75,7 +75,7 @@ public class ScFunctionDescriptionObj extends TestCase { try { log.println("Getting test object ") ; - XMultiServiceFactory oDocMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory oDocMSF = Param.getMSF(); XInterface FDs = (XInterface)oDocMSF. createInstance("com.sun.star.sheet.FunctionDescriptions"); diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java index 16c8a7b65e8e..ae2bc2023ab7 100644 --- a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java @@ -59,7 +59,7 @@ public class ScFunctionListObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -98,7 +98,7 @@ public class ScFunctionListObj extends TestCase { log.println("Getting test object ") ; - XMultiServiceFactory oDocMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oDocMSF = Param.getMSF(); try { oObj = (XInterface)oDocMSF.createInstance( "com.sun.star.sheet.FunctionDescriptions"); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java index ba64417916b8..6ff934b45696 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java @@ -72,7 +72,7 @@ public class ScHeaderFieldObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java index f2a74cd2ccd3..48ef554f10bb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java @@ -68,7 +68,7 @@ public class ScHeaderFieldsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java index 9cab5f527ca1..1b4b93b3f77a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java @@ -58,7 +58,7 @@ public class ScHeaderFooterContentObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java index eda1bd97ecf8..23f067d7d91b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java @@ -97,7 +97,7 @@ public class ScHeaderFooterTextCursor extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java index 2e78b32d9850..28b3687f11fe 100644 --- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java @@ -86,7 +86,7 @@ public class ScHeaderFooterTextObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java index e8dfe2376a4b..c296ebb37686 100644 --- a/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java @@ -57,7 +57,7 @@ public class ScImportDescriptorBase extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java index a8737a126d7d..bfd6af3ce352 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java @@ -49,7 +49,7 @@ public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java index c129ffed8d88..15518759e5df 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java @@ -45,7 +45,7 @@ public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java index b74ab94906d4..9791996f1e26 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java @@ -48,7 +48,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -82,7 +82,7 @@ public class ScIndexEnumeration_DDELinksEnumeration extends TestCase { // create testobject here - XMultiServiceFactory oMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oMSF = Param.getMSF(); // load the predefined testdocument String testdoc = utils.getFullTestURL("ScDDELinksObj.ods"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java index b509a247e61f..30adc257b695 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java @@ -50,7 +50,7 @@ public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index 22f0044e55a8..87c06b41fd04 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -80,7 +80,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration */ protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a Spreadsheet document"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java index 7ae9cd143b7b..a7277875d02f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java @@ -50,7 +50,7 @@ public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java index 0ee636ba3c46..15336bfb57aa 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java @@ -46,7 +46,7 @@ public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java index 21e15cdbed6e..29c2959b37b6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java @@ -40,7 +40,7 @@ public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -72,7 +72,7 @@ public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase log.println("Getting test object ") ; - XMultiServiceFactory oDocMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oDocMSF = Param.getMSF(); try { oObj = (XInterface)oDocMSF.createInstance( "com.sun.star.sheet.FunctionDescriptions"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java index 42196345e791..73f107ceb5c3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java @@ -44,7 +44,7 @@ public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java index 309a7af6d975..d067546f37a5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java @@ -44,7 +44,7 @@ public class ScIndexEnumeration_NamedRangesEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java index 61e433b41ab9..bbab8e5e4179 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java @@ -50,7 +50,7 @@ public class ScIndexEnumeration_ScenariosEnumeration extends TestCase { */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java index f8fbb1e3cb95..9b0a0b50ac29 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java @@ -48,7 +48,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); @@ -80,7 +80,7 @@ public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase { log.println( "Creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); log.println("Getting test object "); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java index 4b3f21457f4d..7d29fb14ba11 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java @@ -47,7 +47,7 @@ public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java index 3ee20b7d5a98..82670af1c759 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java @@ -48,7 +48,7 @@ public class ScIndexEnumeration_SpreadsheetViewPanesEnumeration extends TestCase */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java index 274530eb39e9..47958c28ea14 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java @@ -43,7 +43,7 @@ public class ScIndexEnumeration_SpreadsheetsEnumeration extends TestCase { public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); xSpreadsheetDoc = SOF.createCalcDoc(null); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java index 719a42cccfbb..34fbf0c82b0e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java @@ -54,7 +54,7 @@ public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java index abad1b5c8d9a..011d7fefff41 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java @@ -41,7 +41,7 @@ public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{ * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -70,7 +70,7 @@ public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{ try { // creation of testobject here // get AutoFormats - oObj = (XInterface)((XMultiServiceFactory)Param.getMSF()).createInstance + oObj = (XInterface)Param.getMSF().createInstance ("com.sun.star.sheet.TableAutoFormats"); XEnumerationAccess ea = UnoRuntime.queryInterface(XEnumerationAccess.class,oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java index 34d71c436cfe..9490b09c4041 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java @@ -53,7 +53,7 @@ public class ScIndexEnumeration_TableChartsEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java index fecf2c80f504..1e7a2b2d124c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java @@ -48,7 +48,7 @@ public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java index 9f1fad4a5e4f..fcf6c5a42dff 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java @@ -52,7 +52,7 @@ public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCas */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java index 93ed10c004a9..7af65e5159d6 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java @@ -47,7 +47,7 @@ public class ScIndexEnumeration_TableRowsEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java index 10a42cc24039..fb6f759074dd 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java @@ -60,7 +60,7 @@ public class ScIndexEnumeration_TextFieldEnumeration extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java index 77892fe487ba..71ae1891cf21 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java @@ -57,7 +57,7 @@ public class ScLabelRangeObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java index 0da3168ad50a..23c0649635ae 100644 --- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java @@ -60,7 +60,7 @@ public class ScLabelRangesObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java index 3454ab2366dc..f2983d0d1ca8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java @@ -122,7 +122,7 @@ public class ScModelObj extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); if (xSpreadsheetDoc != null) { XComponent oComp = UnoRuntime.queryInterface( @@ -211,7 +211,7 @@ public class ScModelObj extends TestCase { tEnv.addObjRelation("CONT2", cont2); // create object relation for XPrintJobBroadcaster - String fileName = utils.getOfficeTempDirSys((XMultiServiceFactory) Param.getMSF())+"printfile.prt" ; + String fileName = utils.getOfficeTempDirSys(Param.getMSF())+"printfile.prt" ; File f = new File(fileName); if (f.exists()) { f.delete(); diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java index 02c851b3958e..d24978f96308 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java @@ -62,7 +62,7 @@ public class ScNamedRangeObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java index 3e2e0f366543..adc2fc134603 100644 --- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java @@ -65,7 +65,7 @@ public class ScNamedRangesObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java index affd1dbaeefd..5177c8e666af 100644 --- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java @@ -51,7 +51,7 @@ public class ScRecentFunctionsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -95,7 +95,7 @@ public class ScRecentFunctionsObj extends TestCase { try { log.println("Getting test object ") ; - XMultiServiceFactory oDocMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory oDocMSF = Param.getMSF(); oObj = (XInterface)oDocMSF.createInstance( "com.sun.star.sheet.RecentFunctions"); allFunctions = (XInterface)oDocMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java index 6c07364ff745..8c18dd0d5501 100644 --- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java @@ -66,7 +66,7 @@ public class ScScenariosObj extends TestCase { */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java index 429bea418af3..c205762bf59f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScShapeObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScShapeObj.java @@ -39,7 +39,7 @@ public class ScShapeObj extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a sheetdoc" ); @@ -85,7 +85,7 @@ public class ScShapeObj extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xSheetDoc,5000, 3500, 7500, 5000,"Rectangle"); DrawTools.getShapes(DrawTools.getDrawPage(xSheetDoc,0)).add(oShape); oObj = oShape ; diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java index c42e6bc30c43..842ce103ea4c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java @@ -72,7 +72,7 @@ public class ScSheetLinkObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java index 1cb7b41cc3eb..ec10f4b5eac3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java @@ -60,7 +60,7 @@ public class ScSheetLinksObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java index c1eecc8304b3..a3a7a76669e3 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java @@ -59,7 +59,7 @@ public class ScSortDescriptorBase extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java index 601410d8c883..2fdf023fd7f5 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java @@ -59,7 +59,7 @@ public class ScSpreadsheetSettings extends TestCase { // create testobject here try { - oObj = (XInterface)((XMultiServiceFactory)tParam.getMSF()). + oObj = (XInterface)tParam.getMSF(). createInstance("com.sun.star.sheet.GlobalSheetSettings"); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java index 095693601aa0..6c18f4771800 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java @@ -52,7 +52,7 @@ public class ScSpreadsheetSettingsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java index bc250c38478d..307dd7ca46fc 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java @@ -57,7 +57,7 @@ public class ScStyleFamiliesObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java index bf88ccc9ef34..898e5696dee4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java @@ -68,7 +68,7 @@ public class ScStyleFamilyObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -144,7 +144,7 @@ public class ScStyleFamilyObj extends TestCase { "Exception occurred while getting StyleFamily", e); } - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xSpreadsheetDoc); XInterface oInstance = (XInterface) diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java index 159feb1875da..6eaafaf7fb3c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java @@ -70,7 +70,7 @@ public class ScStyleObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java index b331e70ce29e..12c166725e21 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java @@ -70,7 +70,7 @@ public class ScSubTotalDescriptorBase extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java index 2d605e2ca049..cfbca04b3bf4 100644 --- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java @@ -65,7 +65,7 @@ public class ScSubTotalFieldObj extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java index a23baf835aac..9be8d36a3d2d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java @@ -93,7 +93,7 @@ public class ScTabViewObj extends TestCase { public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating two spreadsheet documents"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java index e129f7a5bf54..2c6870a59556 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java @@ -67,7 +67,7 @@ public class ScTableColumnObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java index 45af0f8fdb39..c225d233fdec 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java @@ -68,7 +68,7 @@ public class ScTableColumnsObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java index b6e8c89ab9bc..c786b65da147 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java @@ -66,7 +66,7 @@ public class ScTableConditionalEntry extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java index dce679686460..637f736db37c 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java @@ -71,7 +71,7 @@ public class ScTableConditionalFormat extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java index 7cc6cd3c076e..dbdcfc96cee8 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java @@ -64,7 +64,7 @@ public class ScTableRowObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java index 7ff7844664d0..cc3b63fa72ec 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java @@ -64,7 +64,7 @@ public class ScTableRowsObj extends TestCase { * Creates Spreadsheet document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java index 6c67def615d3..c9f630697c56 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java @@ -129,7 +129,7 @@ public class ScTableSheetObj extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a sheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java index 5cf9a0a3d5e6..a664deb59d6b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java @@ -69,7 +69,7 @@ public class ScTableSheetsObj extends TestCase { public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); xSpreadsheetDoc = SOF.createCalcDoc(null); @@ -109,7 +109,7 @@ public class ScTableSheetsObj extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); log.println("getting sheets"); XSpreadsheets xSpreadsheets = xSpreadsheetDoc.getSheets(); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java index 604ed259f3da..a66fd5608abb 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java @@ -62,7 +62,7 @@ public class ScTableValidationObj extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java index 9a3f9e59d99f..3162e2146eac 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java @@ -50,7 +50,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a sheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java index 29509d581621..130ab3626cef 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java @@ -49,7 +49,7 @@ public class ScUniqueCellFormatsObj extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a sheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java index 74ab48fff4a8..13f925a7af5a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java @@ -72,7 +72,7 @@ public class ScViewPaneObj extends TestCase { */ public void initialize( TestParameters Param, PrintWriter log ) { // get a soffice factory object - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java index 1e39aba1fa0b..58b70add46ff 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java @@ -73,7 +73,7 @@ public class XMLContentExporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a calc document" ); xSheetDoc = SOF.openDoc("scalc","_blank"); @@ -113,7 +113,7 @@ public class XMLContentExporter extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String CELL_TEXT = "XMLContentExporter"; diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java index 0716d95c4ca4..314ec72816cf 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java @@ -68,7 +68,7 @@ public class XMLContentImporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -121,7 +121,7 @@ public class XMLContentImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java b/qadevOOo/tests/java/mod/_sc/XMLExporter.java index fc848b11f617..dd00dc9c8551 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java @@ -71,7 +71,7 @@ public class XMLExporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a calc document" ); xSheetDoc = SOF.openDoc("scalc","_blank"); @@ -112,7 +112,7 @@ public class XMLExporter extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker Filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class), Filter); diff --git a/qadevOOo/tests/java/mod/_sc/XMLImporter.java b/qadevOOo/tests/java/mod/_sc/XMLImporter.java index 0cebdd120d64..e96f919ceb33 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLImporter.java @@ -67,7 +67,7 @@ public class XMLImporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -120,7 +120,7 @@ public class XMLImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance("com.sun.star.comp.Calc.XMLImporter") ; diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java index 6949b2ef673a..dfa6fdc6c4ca 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java @@ -69,7 +69,7 @@ public class XMLMetaExporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a calc document" ); @@ -114,7 +114,7 @@ public class XMLMetaExporter extends TestCase { PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java index 5f5c6525ef53..603279c2cc73 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java @@ -69,7 +69,7 @@ public class XMLMetaImporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -123,7 +123,7 @@ public class XMLMetaImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java index d82986a7f424..420fe4d4b1c8 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java @@ -69,7 +69,7 @@ public class XMLSettingsExporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a calc document" ); @@ -113,7 +113,7 @@ public class XMLSettingsExporter extends TestCase { PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; SettingsFilterChecker filter = new SettingsFilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class), filter); diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java index ef4126000333..3a25b689b34c 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java @@ -70,7 +70,7 @@ public class XMLSettingsImporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -123,7 +123,7 @@ public class XMLSettingsImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; final XPropertySet xPropSet ; try { diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java index 8b0bfbef7352..5de216d40ee8 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java @@ -71,7 +71,7 @@ public class XMLStylesExporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a calc document" ); @@ -114,8 +114,8 @@ public class XMLStylesExporter extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF() ; + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java index 1372245a5e4d..fd067f92481b 100644 --- a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java @@ -69,7 +69,7 @@ public class XMLStylesImporter extends TestCase { * New spreadsheet document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a Spreadsheet document" ); @@ -122,7 +122,7 @@ public class XMLStylesImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index ba806007c194..bfa6f631a5df 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -47,7 +47,7 @@ public class AccArea extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccArea extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index d435909b035c..700ca3342962 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -47,7 +47,7 @@ public class AccAxis extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccAxis extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 56693ad6f254..788a6a89e3bb 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -47,7 +47,7 @@ public class AccDataPoint extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccDataPoint extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index 7ba077a25ea9..e685e6a1bf95 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -47,7 +47,7 @@ public class AccDataSeries extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccDataSeries extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index c27052d8ec16..3bdc0af399b0 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -47,7 +47,7 @@ public class AccDiagram extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccDiagram extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index ed809bfbc1b1..e47c2d2060ae 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -48,7 +48,7 @@ public class AccFloor extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -86,7 +86,7 @@ public class AccFloor extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index 23b761ce46a4..f4062c13e76a 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -47,7 +47,7 @@ public class AccGrid extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccGrid extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index 884a9189b7a9..d8e82bc48e85 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -47,7 +47,7 @@ public class AccLegend extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccLegend extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 30ede484b398..96be09906734 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -47,7 +47,7 @@ public class AccLegendEntry extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccLegendEntry extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index 637c8aa62647..a34197931d95 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -48,7 +48,7 @@ public class AccStatisticsObject extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -67,7 +67,7 @@ public class AccStatisticsObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 842f4b0c2945..a461e23f9f48 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -47,7 +47,7 @@ public class AccTitle extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -63,7 +63,7 @@ public class AccTitle extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 6172e261f10f..d9758c1fe18d 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -48,7 +48,7 @@ public class AccWall extends TestCase { if (xChartDoc != null) cleanup(Param, log); log.println( "creating a chart document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); @@ -86,7 +86,7 @@ public class AccWall extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index b4a52f19a4e8..e531eaa860aa 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -51,7 +51,7 @@ public class AccessibleDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); @@ -106,7 +106,7 @@ public class AccessibleDocumentView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a chartdocument" ); xChartDoc = SOF.createChartDoc(null); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index 1ca86afedcd5..71b5ec26b9eb 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -60,7 +60,7 @@ public class ChXChartAxis extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index b5b24aa63e4f..d2ad32b114af 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -48,7 +48,7 @@ public class ChXChartData extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index 17135967bd38..2fca77dc9f99 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -51,7 +51,7 @@ public class ChXChartDataArray extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index c5c1e13b6b6d..0bdc0ae4a9db 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -110,7 +110,7 @@ public class ChXChartDocument extends TestCase { PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a chartdocument"); diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index b83219d44f5d..ccc7d4c83ba8 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -59,7 +59,7 @@ public class ChXChartView extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java index 2ca46dcf8254..6a8c6b7fbd36 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java @@ -73,7 +73,7 @@ public class ChXDataPoint extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -120,7 +120,7 @@ public class ChXDataPoint extends TestCase { XPropertySet oObj = null; XDiagram oDiagram = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); // get the DataRowPoint_Point try { diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java index 5c20ae6b7753..6fde716e5c04 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java @@ -79,7 +79,7 @@ public class ChXDataRow extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -140,7 +140,7 @@ public class ChXDataRow extends TestCase { log.println( "creating a new environment for chartdocument object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); Object line = SOF.createDiagram(xChartDoc,"XYDiagram"); tEnv.addObjRelation("LINE",line); diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java index 1190f46d8c62..2d3ce42d965e 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java @@ -140,7 +140,7 @@ public class ChXDiagram extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a sheetdocument" ); @@ -350,7 +350,7 @@ public class ChXDiagram extends TestCase { tEnv.addObjRelation("ROWAMOUNT", new Integer(rows)); tEnv.addObjRelation("COLAMOUNT", new Integer(cols)); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); Object stock = SOF.createDiagram(xChartDoc,"StockDiagram"); tEnv.addObjRelation("STOCK",stock); diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java index 66665a1adedd..b01884446ba7 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartArea.java +++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java @@ -64,7 +64,7 @@ public class ChartArea extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index d8a6b44c0511..79fba17bbf6b 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -55,7 +55,7 @@ public class ChartGrid extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java index 9c821fd1702e..343b9451ec40 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java @@ -81,7 +81,7 @@ public class ChartLegend extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java index 6ce09ec0d9d2..aa5f9f770aea 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLine.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java @@ -54,7 +54,7 @@ public class ChartLine extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -92,7 +92,7 @@ public class ChartLine extends TestCase { SOfficeFactory SOF = null; //get LineDiagram - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOF = SOfficeFactory.getFactory( Param.getMSF()); oDiagram = SOF.createDiagram(xChartDoc, "LineDiagram"); log.println( "getting Line-Diagram" ); diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index 86b3fa4af3a4..1853e8012d75 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -66,7 +66,7 @@ public class ChartTitle extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index 31ec4cd4bfa2..abcef7d405b7 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -68,7 +68,7 @@ public class AccessibleDrawDocumentView extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); // get the drawpage of drawing here log.println( "getting Drawpage" ); @@ -101,7 +101,7 @@ public class AccessibleDrawDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - (XMultiServiceFactory)Param.getMSF(),aModel); + Param.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); //com.sun.star.accessibility.AccessibleRole @@ -153,7 +153,7 @@ public class AccessibleDrawDocumentView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index 7738e0c02de8..658d07a441c6 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -67,7 +67,7 @@ public class AccessibleOutlineView extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - (XMultiServiceFactory)Param.getMSF(),aModel); + Param.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); @@ -118,7 +118,7 @@ public class AccessibleOutlineView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a impress document" ); @@ -138,7 +138,7 @@ public class AccessibleOutlineView extends TestCase { String aSlotID = "slot:27010"; XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, oObj ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()). + Param.getMSF(). createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index 1444fd24a49f..fdd126004e03 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -74,7 +74,7 @@ public class AccessibleSlideView extends TestCase { shortWait(); XWindow xWindow = AccessibilityTools.getCurrentWindow ( - (XMultiServiceFactory)Param.getMSF(),aModel); + Param.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); @@ -125,7 +125,7 @@ public class AccessibleSlideView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a impress document" ); @@ -145,7 +145,7 @@ public class AccessibleSlideView extends TestCase { XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, aModel.getCurrentController() ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()). + Param.getMSF(). createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java index 81b644afe0ae..00933e8d706e 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java @@ -133,7 +133,7 @@ public class DrawController_DrawView extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating two impress documents" ); @@ -201,9 +201,9 @@ public class DrawController_DrawView extends TestCase { Object oShapeCol1 = null; Object oShapeCol2 = null; try { - oShapeCol1 = ((XMultiServiceFactory)Param.getMSF()). + oShapeCol1 = Param.getMSF(). createInstance("com.sun.star.drawing.ShapeCollection"); - oShapeCol2 = ((XMultiServiceFactory)Param.getMSF()). + oShapeCol2 = Param.getMSF(). createInstance("com.sun.star.drawing.ShapeCollection"); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java index d1a4dac1050c..2c910bcb981f 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java @@ -91,7 +91,7 @@ public class DrawController_HandoutView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -147,7 +147,7 @@ public class DrawController_HandoutView extends TestCase { (TestParameters Param, PrintWriter log) { log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java index 69b43dd777d0..eeaef89e1c0d 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java @@ -91,7 +91,7 @@ public class DrawController_NotesView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -147,7 +147,7 @@ public class DrawController_NotesView extends TestCase { (TestParameters Param, PrintWriter log) { log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java index 2580717d8c49..61d2e9fcf8ba 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java @@ -91,7 +91,7 @@ public class DrawController_OutlineView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -147,7 +147,7 @@ public class DrawController_OutlineView extends TestCase { (TestParameters Param, PrintWriter log) { log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); diff --git a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java index 4398a659f686..cebb7667dd47 100644 --- a/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java +++ b/qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java @@ -91,7 +91,7 @@ public class DrawController_PresentationView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -147,7 +147,7 @@ public class DrawController_PresentationView extends TestCase { (TestParameters Param, PrintWriter log) { log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(xMSF); diff --git a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java index aebad4b673ef..0b5883b5bf28 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdDocLinkTargets.java @@ -55,7 +55,7 @@ public class SdDocLinkTargets extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java index b16c81e51d84..85ccb1f3a75d 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPage.java @@ -93,7 +93,7 @@ public class SdDrawPage extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); @@ -145,7 +145,7 @@ public class SdDrawPage extends TestCase { log.println( "creating a test environment" ); SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); // get the drawpage of drawing here log.println( "getting Drawpage" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java index 539f3f365aa6..0a5deddd9fec 100644 --- a/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdDrawPagesAccess.java @@ -65,7 +65,7 @@ public class SdDrawPagesAccess extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java index 20a023dc36f5..4313168f5c56 100644 --- a/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java @@ -86,7 +86,7 @@ public class SdGenericDrawPage extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); @@ -135,7 +135,7 @@ public class SdGenericDrawPage extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); // get the drawpage of drawing here log.println( "getting Drawpage" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdLayer.java b/qadevOOo/tests/java/mod/_sd/SdLayer.java index d147b92e388a..d23d5422204a 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayer.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayer.java @@ -60,7 +60,7 @@ public class SdLayer extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java index a80e88709196..89ee46baf0dd 100644 --- a/qadevOOo/tests/java/mod/_sd/SdLayerManager.java +++ b/qadevOOo/tests/java/mod/_sd/SdLayerManager.java @@ -70,7 +70,7 @@ public class SdLayerManager extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java index 861ad43fa60d..901d8e7ed99f 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPage.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPage.java @@ -87,7 +87,7 @@ public class SdMasterPage extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); @@ -154,7 +154,7 @@ public class SdMasterPage extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); //put something on the masterpage log.println( "inserting some Shapes" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java index b906feca90bd..df87506b78e9 100644 --- a/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdMasterPagesAccess.java @@ -59,7 +59,7 @@ public class SdMasterPagesAccess extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java index 1010751af2bf..6f05f43953ef 100644 --- a/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java +++ b/qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java @@ -60,7 +60,7 @@ public class SdPageLinkTargets extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); @@ -103,7 +103,7 @@ public class SdPageLinkTargets extends TestCase { XInterface oObj = oLTS.getLinks(); SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); log.println( "inserting some Shapes" ); XShapes oShapes = UnoRuntime.queryInterface(XShapes.class,the_page); XShape oShape = diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java index 84cebc5a7d6c..620e69cff971 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java @@ -89,7 +89,7 @@ public class SdUnoDrawView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -146,7 +146,7 @@ public class SdUnoDrawView extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating two draw documents" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java index ae72c1d9b2f3..f1e2deec14fe 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java @@ -84,7 +84,7 @@ public class SdUnoOutlineView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -130,7 +130,7 @@ public class SdUnoOutlineView extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a impress document" ); @@ -154,7 +154,7 @@ public class SdUnoOutlineView extends TestCase { String aSlotID = "slot:27010"; XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, oObj ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java index 7b4a589c79e0..5a53c546afd4 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoPresView.java @@ -88,7 +88,7 @@ public class SdUnoPresView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -144,7 +144,7 @@ public class SdUnoPresView extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating two impress documents" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java index 35503424478e..977ccf0e46e5 100644 --- a/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java @@ -56,7 +56,7 @@ public class SdUnoSlideView extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF()) ); + Param.getMSF()) ); } /** @@ -102,7 +102,7 @@ public class SdUnoSlideView extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); XDrawPages xDP = null; try { log.println( "creating a impress document" ); @@ -125,7 +125,7 @@ public class SdUnoSlideView extends TestCase { String aSlotID = "slot:27011"; XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, oObj ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java index 0f5c079ea865..0b3121ca33ea 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java @@ -73,7 +73,7 @@ public class SdXCustomPresentation extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index e77f83244f02..d2b3fcd4a239 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -66,7 +66,7 @@ public class SdXCustomPresentationAccess extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java index 708babc148d2..1c44948b4883 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java +++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java @@ -113,7 +113,7 @@ public class SdXImpressDocument extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating two impress documents"); @@ -175,7 +175,7 @@ public class SdXImpressDocument extends TestCase { tEnv.addObjRelation("TOSELECT", aShape); // create object relation for XPrintJobBroadcaster - String fileName = utils.getOfficeTempDirSys((XMultiServiceFactory) Param.getMSF())+"printfile.prt" ; + String fileName = utils.getOfficeTempDirSys(Param.getMSF())+"printfile.prt" ; File f = new File(fileName); if (f.exists()) { f.delete(); diff --git a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java index 9b630a11d159..517917b490fd 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXPresentation.java +++ b/qadevOOo/tests/java/mod/_sd/SdXPresentation.java @@ -60,7 +60,7 @@ public class SdXPresentation extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java index c342c8c4f3b3..1dec8b668153 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXShape.java +++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java @@ -72,7 +72,7 @@ public class SdXShape extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); try { log.println( "creating a draw document" ); @@ -120,7 +120,7 @@ public class SdXShape extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)Param.getMSF()); + Param.getMSF()); // get the drawpage of drawing here log.println( "getting Drawpage" ); diff --git a/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java index 5d2f34b07201..a29f64b73337 100644 --- a/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java @@ -93,7 +93,7 @@ public class OServiceManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.OServiceManager" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java index 84664a9122ad..a47d12d72f55 100644 --- a/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java +++ b/qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java @@ -65,7 +65,7 @@ public class AppDispatchProvider extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.comp.sfx2.AppDispatchProvider") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); diff --git a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java index db5078d76dfc..0662caf684f0 100644 --- a/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java +++ b/qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java @@ -47,7 +47,7 @@ public class DocumentTemplates extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { String aURL=util.utils.getFullTestURL("report2.stw"); - xTextDoc = util.WriterTools.loadTextDoc((XMultiServiceFactory)tParam.getMSF(),aURL); + xTextDoc = util.WriterTools.loadTextDoc(tParam.getMSF(),aURL); } protected void cleanup( TestParameters tParam, PrintWriter log ) { @@ -63,7 +63,7 @@ public class DocumentTemplates extends TestCase { protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface oObj = null; XStorable store = null; diff --git a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java index 6f2193f1ffe7..d7ae8845f991 100644 --- a/qadevOOo/tests/java/mod/_sfx/FrameLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/FrameLoader.java @@ -62,7 +62,7 @@ public class FrameLoader extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.comp.office.FrameLoader") ; } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java index c17d02db524a..3ca7c0498dd2 100644 --- a/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java +++ b/qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java @@ -65,7 +65,7 @@ public class SfxMacroLoader extends TestCase { //now get the OButtonControl try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.comp.sfx2.SfxMacroLoader"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get service"); @@ -88,7 +88,7 @@ public class SfxMacroLoader extends TestCase { // adding relation for XFrameLoader tEnv.addObjRelation("XDispatchProvider.URL", "macro:tools.UCB.CreateFolder(\"" + - utils.getOfficeTemp((XMultiServiceFactory)Param.getMSF()) + "/SfxMacroLoader\")") ; + utils.getOfficeTemp(Param.getMSF()) + "/SfxMacroLoader\")") ; return tEnv; diff --git a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java index 0170388467f5..66fab02221b5 100644 --- a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java +++ b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java @@ -68,7 +68,7 @@ public class DLLComponentLoader extends TestCase { XMultiServiceFactory xMSF = null; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.DLLComponentLoader" ); } diff --git a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java index e45bc8eea574..4e0474605c93 100644 --- a/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java @@ -110,14 +110,14 @@ public class SimpleRegistry extends TestCase { XInterface oObj = null; Object oInterface = null; final String tmpDir = utils.getOfficeTempDirSys( - (XMultiServiceFactory)Param.getMSF()) ; + Param.getMSF()) ; final String openF = "XSimpleRegistry_open.rdb" ; final String destroyF = "XSimpleRegistry_destroy.rdb" ; final String mergeF = "XSimpleRegistry_merge.rdb" ; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.registry.SimpleRegistry" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java index cc8cafc9b49b..8dfa8e397b3f 100644 --- a/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java +++ b/qadevOOo/tests/java/mod/_simreg/SimpleRegistry.java @@ -114,14 +114,14 @@ public class SimpleRegistry extends TestCase { throws StatusException { XInterface oObj = null; Object oInterface = null; - final String tmpDir = utils.getOfficeTempDirSys((XMultiServiceFactory)Param.getMSF()) ; + final String tmpDir = utils.getOfficeTempDirSys(Param.getMSF()) ; final String openF = "XSimpleRegistry_open.rdb" ; final String destroyF = "XSimpleRegistry_destroy.rdb" ; final String mergeF = "XSimpleRegistry_merge.rdb" ; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.registry.SimpleRegistry" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index 16c7ad744130..0a1087c0e70e 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -69,7 +69,7 @@ public class SmEditAccessible extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.lang.IllegalArgumentException ex) { @@ -110,7 +110,7 @@ public class SmEditAccessible extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 2735717910bd..511b4d664c10 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -71,7 +71,7 @@ public class SmGraphicAccessible extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.lang.IllegalArgumentException ex) { @@ -112,7 +112,7 @@ public class SmGraphicAccessible extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_sm/SmModel.java b/qadevOOo/tests/java/mod/_sm/SmModel.java index 4d02811eab68..dbcfeba3f1f7 100644 --- a/qadevOOo/tests/java/mod/_sm/SmModel.java +++ b/qadevOOo/tests/java/mod/_sm/SmModel.java @@ -56,7 +56,7 @@ public class SmModel extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.lang.IllegalArgumentException ex) { diff --git a/qadevOOo/tests/java/mod/_sm/XMLExporter.java b/qadevOOo/tests/java/mod/_sm/XMLExporter.java index fe0d31000906..de8b256da454 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLExporter.java @@ -66,7 +66,7 @@ public class XMLExporter extends TestCase { * New math document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a math document" ); @@ -110,7 +110,7 @@ public class XMLExporter extends TestCase { protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String expFormula = "a - b" ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLImporter.java b/qadevOOo/tests/java/mod/_sm/XMLImporter.java index 6a5e38a3a1da..41e21d453f08 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLImporter.java @@ -66,7 +66,7 @@ public class XMLImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.uno.Exception ex) { @@ -106,7 +106,7 @@ public class XMLImporter extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; final String impFormula = "a - b" ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java index c2c1e0584af9..f77da4ca0be4 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java @@ -68,7 +68,7 @@ public class XMLMetaExporter extends TestCase { * New math document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a math document" ); @@ -111,7 +111,7 @@ public class XMLMetaExporter extends TestCase { */ protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String expName = "XMLMetaExporterName" ; final String expValue = "XMLMetaExporterValue" ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java index ebd31ebca4e2..3f5d864c286f 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java @@ -69,7 +69,7 @@ public class XMLMetaImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.uno.Exception ex) { @@ -110,7 +110,7 @@ public class XMLMetaImporter extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; final String impName = "XMLMetaImporter" ; final String impValue = "XMLMetaImporter_Value" ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index d7b2fd42065f..8f3c3464b987 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -66,7 +66,7 @@ public class XMLSettingsExporter extends TestCase { * New math document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a math document" ); @@ -110,7 +110,7 @@ public class XMLSettingsExporter extends TestCase { */ protected TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final short expMargin = 67 ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java index 9860a8609fab..76c71d629a51 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java @@ -65,7 +65,7 @@ public class XMLSettingsImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { xMathDoc = SOF.openDoc("smath","_blank"); } catch (com.sun.star.uno.Exception ex) { @@ -106,7 +106,7 @@ public class XMLSettingsImporter extends TestCase { ( TestParameters Param, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oObj = null; final short impMargin = 67 ; diff --git a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java index 18d649f7b33c..131e70940c4b 100644 --- a/qadevOOo/tests/java/mod/_smgr/OServiceManager.java +++ b/qadevOOo/tests/java/mod/_smgr/OServiceManager.java @@ -95,7 +95,7 @@ public class OServiceManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.stoc.OServiceManager" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java index 641e27679a4e..4c4cf3d43096 100644 --- a/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java +++ b/qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java @@ -80,7 +80,7 @@ public class SimpleSystemMail extends TestCase { isSystemMailExist = "true".equalsIgnoreCase ((String) Param.get("test.system.mail.isExist")) ; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { if (isWinOS) { log.println("The OS is Win : trying to create service"); diff --git a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java index 7914a11339e3..d511d9fb6188 100644 --- a/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java +++ b/qadevOOo/tests/java/mod/_srtrs/SortedDynamicResultSetFactory.java @@ -55,7 +55,7 @@ public class SortedDynamicResultSetFactory extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.ucb.SortedDynamicResultSetFactory"); } diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index e9daab1b73c2..9207381f2647 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -84,7 +84,7 @@ public class DataInputStream extends TestCase { Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance("com.sun.star.io.DataInputStream"); } catch(com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index d939efba379e..46b5e6cec5e7 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -85,7 +85,7 @@ public class DataOutputStream extends TestCase { XMultiServiceFactory xMSF = null ; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.io.DataOutputStream"); oPipe = (XInterface)xMSF.createInstance("com.sun.star.io.Pipe"); diff --git a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java index 80ed2f3d1969..bd91175f8902 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableInputStream.java @@ -83,7 +83,7 @@ public class MarkableInputStream extends TestCase { public TestEnvironment createTestEnvironment( TestParameters Param, PrintWriter log) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 8203db02c8ba..c656580bd62e 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -91,7 +91,7 @@ public class MarkableOutputStream extends TestCase { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object aPipe = null; Object mostream = null; Object mistream = null; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index 220d37ad9c54..9f67ac91b5b8 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -79,7 +79,7 @@ public class ObjectInputStream extends TestCase { * @see com.sun.star.cmp.PersistObject */ public void initialize(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; // test first if object is already registered try { @@ -173,7 +173,7 @@ public class ObjectInputStream extends TestCase { TestParameters Param, PrintWriter log) throws StatusException { System.out.println("create TestEnvironment started."); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object ostream = null; Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index 675de8cdd949..07a4588bd07b 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -76,7 +76,7 @@ public class ObjectOutputStream extends TestCase { * @see com.sun.star.cmp.PersistObject */ public void initialize(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; // test first if object is already registered try { @@ -168,7 +168,7 @@ public class ObjectOutputStream extends TestCase { XObjectOutputStream oStream = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object ostream = null, istream = null; Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_stm/Pipe.java b/qadevOOo/tests/java/mod/_stm/Pipe.java index afdf554e469e..da2ecfaa8a24 100644 --- a/qadevOOo/tests/java/mod/_stm/Pipe.java +++ b/qadevOOo/tests/java/mod/_stm/Pipe.java @@ -65,7 +65,7 @@ public class Pipe extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.io.Pipe" ); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_stm/Pump.java b/qadevOOo/tests/java/mod/_stm/Pump.java index 4dce2e930073..9c6332609685 100644 --- a/qadevOOo/tests/java/mod/_stm/Pump.java +++ b/qadevOOo/tests/java/mod/_stm/Pump.java @@ -70,7 +70,7 @@ public class Pump extends TestCase { TestParameters Param, PrintWriter log) throws StatusException { Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oPipe; // creating an instance of stm.Pump diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java index 63eef1a645b1..eada6b1b4ad6 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java @@ -81,7 +81,7 @@ public class DataInputStream extends TestCase { Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try { oInterface = xMSF.createInstance("com.sun.star.io.DataInputStream"); } catch(com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java index 85cc334414cc..475a84562840 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java @@ -82,7 +82,7 @@ public class DataOutputStream extends TestCase { XMultiServiceFactory xMSF = null ; try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.io.DataOutputStream"); oPipe = (XInterface)xMSF.createInstance("com.sun.star.io.Pipe"); diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java index 8fc218e8acb3..6466d90cb383 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java @@ -80,7 +80,7 @@ public class MarkableInputStream extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java index bfa0341a4c56..cbaa335273e7 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java @@ -88,7 +88,7 @@ public class MarkableOutputStream extends TestCase { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object aPipe = null; Object mostream = null; Object mistream = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java index 528a63031537..24a80aca25b9 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java @@ -77,7 +77,7 @@ public class ObjectInputStream extends TestCase { * @see com.sun.star.cmp.PersistObject */ public void initialize(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; // test first if object is already registered try { @@ -170,7 +170,7 @@ public class ObjectInputStream extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { System.out.println("create TestEnvironment started."); - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object ostream = null; Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java index ff869a3973bd..ffbbf547f8ed 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java @@ -74,7 +74,7 @@ public class ObjectOutputStream extends TestCase { * @see com.sun.star.cmp.PersistObject */ public void initialize(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object oPersObj = null; // test first if object is already registered try { @@ -165,7 +165,7 @@ public class ObjectOutputStream extends TestCase { XObjectOutputStream oStream = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); Object ostream = null, istream = null; Object aPipe = null; Object mostream = null; diff --git a/qadevOOo/tests/java/mod/_streams/uno/Pipe.java b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java index c4260ae00b5b..e7decc3184e6 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/Pipe.java +++ b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java @@ -62,7 +62,7 @@ public class Pipe extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.io.Pipe" ); } catch(com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_streams/uno/Pump.java b/qadevOOo/tests/java/mod/_streams/uno/Pump.java index de5eb1152dc4..3a08a8aed9ef 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/Pump.java +++ b/qadevOOo/tests/java/mod/_streams/uno/Pump.java @@ -67,7 +67,7 @@ public class Pump extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { Object oInterface = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XInterface oPipe; // creating an instance of stm.Pump diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 8b94404e56ac..461327f91f3a 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -54,7 +54,7 @@ public class AccessibleBrowseBox extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory) Param.getMSF())); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); } /** @@ -89,7 +89,7 @@ public class AccessibleBrowseBox extends TestCase { if (xTextDoc != null) { xTextDoc.dispose(); // get a soffice factory object } - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); try { log.println("creating a text document"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index 9820f8091f16..2752bf2828bc 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -75,7 +75,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -119,7 +119,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a text document"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 4b29b8685cfb..f5774f42d365 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -72,7 +72,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF())); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); } /** @@ -119,7 +119,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { if (xTextDoc != null) xTextDoc.dispose(); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a text document" ); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 54cbf533b48a..16577f44a866 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -71,7 +71,7 @@ public class AccessibleBrowseBoxTable extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory)Param.getMSF())); + Param.getMSF())); } /** @@ -119,7 +119,7 @@ public class AccessibleBrowseBoxTable extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory)tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 8f699db8d812..c2018ff1b7b8 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -71,7 +71,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF()) ); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF()) ); } /** @@ -116,7 +116,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { if (xTextDoc != null) xTextDoc.dispose(); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a text document" ); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index ac07154757cd..6e14fbfc6b60 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -82,7 +82,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -139,7 +139,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a text document"); @@ -164,7 +164,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ( (XMultiServiceFactory) tParam.getMSF()) + XInterface transf = (XInterface) tParam.getMSF() .createInstance("com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -190,7 +190,7 @@ public class AccessibleIconChoiceCtrl extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ( (XMultiServiceFactory) tParam.getMSF()) + oObj = (XInterface) tParam.getMSF() .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index 9936a9de0477..33fe25b76716 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -81,7 +81,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF())); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); } /** @@ -143,7 +143,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { if (xTextDoc != null) xTextDoc.dispose(); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a text document" ); @@ -166,7 +166,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface)((XMultiServiceFactory)tParam.getMSF()).createInstance + XInterface transf = (XInterface)tParam.getMSF().createInstance ("com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface (XURLTransformer.class, transf); @@ -189,7 +189,7 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance + oObj = (XInterface) tParam.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index 6dd4e547e8f1..c1bcff99d517 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -79,7 +79,7 @@ public class AccessibleTabBar extends TestCase { closeDoc(xDoc); } - XMultiServiceFactory msf = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory msf = tParam.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(msf); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index eff9de62ebb1..9a73a560a398 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -106,7 +106,7 @@ public class AccessibleTabBarPage extends TestCase { if (xDoc != null) xDoc.dispose(); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a calc document" ); @@ -122,7 +122,7 @@ public class AccessibleTabBarPage extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory)tParam.getMSF()).createInstance + oObj = (XInterface) tParam.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index 1bc50a7b093b..5f07f23b2cbf 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -108,7 +108,7 @@ public class AccessibleTabBarPageList extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a draw document"); @@ -124,7 +124,7 @@ public class AccessibleTabBarPageList extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ( (XMultiServiceFactory) tParam.getMSF()) + oObj = (XInterface) tParam.getMSF() .createInstance("com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index 86523b727f1c..e143b3e3501c 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -77,7 +77,7 @@ public class AccessibleTreeListBox extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface( - XDesktop.class, DesktopTools.createDesktop((XMultiServiceFactory)Param.getMSF())); + XDesktop.class, DesktopTools.createDesktop(Param.getMSF())); } /** @@ -125,7 +125,7 @@ public class AccessibleTreeListBox extends TestCase { if (xTextDoc != null) xTextDoc.dispose(); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a text document" ); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index 596ef3af2af3..953fbc15e4d4 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -87,7 +87,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { the_Desk = UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -143,7 +143,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a text document"); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index ca3ce7494a0e..ad3933843e27 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -47,7 +47,7 @@ public class AccessibleControlShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -81,7 +81,7 @@ public class AccessibleControlShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); utils.shortWait(5000); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 370a439c9086..9d4824fa1983 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -65,7 +65,7 @@ public class AccessibleEditableTextPara extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); @@ -123,7 +123,7 @@ public class AccessibleEditableTextPara extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a spreadsheetdocument"); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index 6a7f8b3317eb..db012c171b05 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -47,7 +47,7 @@ public class AccessibleGraphicShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -78,7 +78,7 @@ public class AccessibleGraphicShape extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); final XShape oShape = SOF.createShape(xDrawDoc, 5000,5000,1500,1000,"GraphicObject"); @@ -87,7 +87,7 @@ public class AccessibleGraphicShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 28c09d1ce59a..eefe241211de 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -48,7 +48,7 @@ public class AccessibleOLEShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -79,7 +79,7 @@ public class AccessibleOLEShape extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); final XShape oShape = SOF.createShape (xDrawDoc,5000,5000,1500,1000,"OLE2"); @@ -108,7 +108,7 @@ public class AccessibleOLEShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index 81d33842120e..e64ee31780fc 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -47,7 +47,7 @@ public class AccessiblePageShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -82,7 +82,7 @@ public class AccessiblePageShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index e9ec38c01e46..fce1477991f8 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -48,7 +48,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -106,7 +106,7 @@ public class AccessiblePresentationGraphicShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); // oObj = at.getAccessibleObjectForRole diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index f7aef39300a5..e92aaabe328d 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -48,7 +48,7 @@ public class AccessiblePresentationOLEShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -114,7 +114,7 @@ public class AccessiblePresentationOLEShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 38b17b62ad0f..02bb0be92f4e 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -48,7 +48,7 @@ public class AccessiblePresentationShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -101,7 +101,7 @@ public class AccessiblePresentationShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 3af68fb0bcd2..85c243c91de5 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -47,7 +47,7 @@ public class AccessibleShape extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -78,7 +78,7 @@ public class AccessibleShape extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); final XShape oShape = SOF.createShape(xDrawDoc, 3000,4500,15000,1000,"Rectangle"); @@ -86,7 +86,7 @@ public class AccessibleShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow (tParam.getMSF(),aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); diff --git a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java index d4d430a8d637..1a09bdcd93aa 100644 --- a/qadevOOo/tests/java/mod/_svx/GraphicExporter.java +++ b/qadevOOo/tests/java/mod/_svx/GraphicExporter.java @@ -75,7 +75,7 @@ public class GraphicExporter extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a drawdoc"); xDrawDoc = DrawTools.createDrawDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -127,7 +127,7 @@ public class GraphicExporter extends TestCase { log.println("creating a test environment"); try { - go = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + go = tParam.getMSF().createInstance( "com.sun.star.drawing.GraphicExportFilter"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't create instance"); @@ -136,7 +136,7 @@ public class GraphicExporter extends TestCase { // create testobject here SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); oShape = SOF.createShape(xDrawDoc, 5000, 5000, 1500, 1000, "GraphicObject"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc, 0)).add(oShape); @@ -171,13 +171,13 @@ public class GraphicExporter extends TestCase { final URL aURL = new URL(); aURL.Complete = util.utils.getOfficeTemp( - (XMultiServiceFactory) tParam.getMSF()) + + tParam.getMSF()) + "picture.jpg"; final XSimpleFileAccess fAcc; try { - Object oFAcc = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object oFAcc = tParam.getMSF().createInstance( "com.sun.star.ucb.SimpleFileAccess"); fAcc = UnoRuntime.queryInterface( XSimpleFileAccess.class, oFAcc); diff --git a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java index f354a453644c..808c0ed8ecfc 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java +++ b/qadevOOo/tests/java/mod/_svx/SvxDrawPage.java @@ -97,7 +97,7 @@ public class SvxDrawPage extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a sheetdocument"); @@ -161,7 +161,7 @@ public class SvxDrawPage extends TestCase { oDP.getByIndex(0)); SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); oShape = SOF.createShape(xComp, 5000, 3500, 7500, 5000, "Rectangle"); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index 541bbf9b50cf..49c07d528040 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -73,7 +73,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ XController xController = aModel.getCurrentController(); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); final XShape oShape = SOF.createShape(xDrawDoc, 5000,5000,1500,1000,"GraphicObject"); @@ -104,7 +104,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ String aSlotID = "slot:10371"; XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, xController ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -121,7 +121,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ try { - oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance + oObj = (XInterface) Param.getMSF().createInstance ("com.sun.star.awt.Toolkit") ; } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -180,7 +180,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ String aSlotID = "slot:10371"; XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, xController ); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -209,7 +209,7 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ */ protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java index f1641f9c1d81..fc37ba104857 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphicObject.java @@ -105,7 +105,7 @@ public class SvxGraphicObject extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } /** @@ -157,7 +157,7 @@ public class SvxGraphicObject extends TestCase { log.println( "creating a test environment" ); // create testobject here - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xDrawDoc,5000,5000,1500,1000,"GraphicObject"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); oObj = oShape; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShape.java b/qadevOOo/tests/java/mod/_svx/SvxShape.java index adbc98dc3dd2..d2428c610103 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShape.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShape.java @@ -119,7 +119,7 @@ public class SvxShape extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -169,7 +169,7 @@ public class SvxShape extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xDrawDoc,3000,4500,15000,1000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); oObj = oShape ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java index 6858a56451db..04dc22e1cdc5 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java @@ -116,7 +116,7 @@ public class SvxShapeCircle extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a drawdoc" ); @@ -167,7 +167,7 @@ public class SvxShapeCircle extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,5000,3000,3000,"Ellipse"); XPropertySet props = UnoRuntime.queryInterface diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java index ae2eabcd5c07..a163838f36b1 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeCollection.java @@ -55,7 +55,7 @@ public class SvxShapeCollection extends TestCase { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -103,8 +103,8 @@ public class SvxShapeCollection extends TestCase { try { // adding some shapes for testing. - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); - Object col = ((XMultiServiceFactory)tParam.getMSF()).createInstance + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); + Object col = tParam.getMSF().createInstance ("com.sun.star.drawing.ShapeCollection"); XShapes shapes = UnoRuntime.queryInterface (XShapes.class,col); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java index 896745894bf1..8ca037bb4976 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeConnector.java @@ -82,7 +82,7 @@ public class SvxShapeConnector extends TestCase { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -145,7 +145,7 @@ public class SvxShapeConnector extends TestCase { TestEnvironment tEnv = new TestEnvironment( oObj ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xDrawDoc,3000,4500,15000,1000,"Ellipse"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java index d7c8dca91b9e..803ab15b7716 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeControl.java @@ -57,7 +57,7 @@ public class SvxShapeControl extends TestCase { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -109,7 +109,7 @@ public class SvxShapeControl extends TestCase { oObj = oShape ; - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java index e486f895cbf6..0ea2a5b40cb2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeDimensioning.java @@ -58,7 +58,7 @@ public class SvxShapeDimensioning extends TestCase { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -105,7 +105,7 @@ public class SvxShapeDimensioning extends TestCase { try { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xDrawDoc,4000,4000,3000,3000,"Measure"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java index 207742c9c6bb..ad14fe37ef7a 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java @@ -62,7 +62,7 @@ public class SvxShapeGroup extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println( "creating a draw document" ); @@ -99,7 +99,7 @@ public class SvxShapeGroup extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); // get the drawpage of drawing here try { diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java index 8eaf4797c62a..7194f1b337a5 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygon.java @@ -127,7 +127,7 @@ public class SvxShapePolyPolygon extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -212,7 +212,7 @@ public class SvxShapePolyPolygon extends TestCase { oObj = oShape ; - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Line"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; } diff --git a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java index a070bfe46d5d..8ab5061436b2 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java +++ b/qadevOOo/tests/java/mod/_svx/SvxShapePolyPolygonBezier.java @@ -129,7 +129,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -182,7 +182,7 @@ public class SvxShapePolyPolygonBezier extends TestCase { try { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); XMultiServiceFactory xMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xDrawDoc) ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java index 5da9c7679330..767f839e484e 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java @@ -40,7 +40,7 @@ public class SvxUnoNumberingRules extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a drawdoc"); xDrawDoc = DrawTools.createDrawDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } protected TestEnvironment createTestEnvironment(TestParameters tParam, diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java index 810721aa3489..f8941b14c172 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoText.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoText.java @@ -58,7 +58,7 @@ public class SvxUnoText extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -110,7 +110,7 @@ public class SvxUnoText extends TestCase { XShape oShape = null; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java index 0d839870f409..1d7734bc6bd0 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java @@ -57,7 +57,7 @@ public class SvxUnoTextContent extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -100,7 +100,7 @@ public class SvxUnoTextContent extends TestCase { XEnumerationAccess xEA = null ; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; XShape oShape = SOF.createShape(xDrawDoc, 5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java index 85b9100eb187..c97f2685dd0f 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java @@ -55,7 +55,7 @@ public class SvxUnoTextContentEnum extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -100,7 +100,7 @@ public class SvxUnoTextContentEnum extends TestCase { XEnumerationAccess xEA = null ; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; XShape oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java index f06a04de24e1..ccddeedcb42b 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextCursor.java @@ -54,7 +54,7 @@ public class SvxUnoTextCursor extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -98,7 +98,7 @@ public class SvxUnoTextCursor extends TestCase { // create testobject here try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; XShape oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java index ab471102d07b..c4be63e1a7b6 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java @@ -64,7 +64,7 @@ public class SvxUnoTextField extends TestCase { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc( (XMultiServiceFactory) tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc( tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -108,7 +108,7 @@ public class SvxUnoTextField extends TestCase { log.println( "creating a test environment" ); try { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); oShape = SOF.createShape(xDrawDoc,5000,3500,7500,5000,"Rectangle"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape); } diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java index 4e4de2de42e4..9b3be5993bba 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRange.java @@ -57,7 +57,7 @@ public class SvxUnoTextRange extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -100,7 +100,7 @@ public class SvxUnoTextRange extends TestCase { XEnumerationAccess xEA = null ; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; XShape oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; diff --git a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java index 7606767158b2..77be51b0fa13 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java +++ b/qadevOOo/tests/java/mod/_svx/SvxUnoTextRangeEnumeration.java @@ -57,7 +57,7 @@ public class SvxUnoTextRangeEnumeration extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { try { log.println( "creating a drawdoc" ); - xDrawDoc = DrawTools.createDrawDoc((XMultiServiceFactory)tParam.getMSF()); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } catch ( Exception e ) { // Some exception occurs.FAILED e.printStackTrace( log ); @@ -100,7 +100,7 @@ public class SvxUnoTextRangeEnumeration extends TestCase { XEnumerationAccess xEA = null ; try { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()) ; + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()) ; XShape oShape = SOF.createShape (xDrawDoc,5000,3500,7500,5000,"Text"); DrawTools.getShapes(DrawTools.getDrawPage(xDrawDoc,0)).add(oShape) ; diff --git a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java index 9a8e900dc6c5..0ba6d0decc3f 100644 --- a/qadevOOo/tests/java/mod/_sw/CharacterStyle.java +++ b/qadevOOo/tests/java/mod/_sw/CharacterStyle.java @@ -52,7 +52,7 @@ public class CharacterStyle extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java index 5d71f1f7bf17..23df9ef54078 100644 --- a/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java @@ -54,7 +54,7 @@ public class ConditionalParagraphStyle extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java index 26f54ec3210b..5a7273eae609 100644 --- a/qadevOOo/tests/java/mod/_sw/DocumentSettings.java +++ b/qadevOOo/tests/java/mod/_sw/DocumentSettings.java @@ -42,7 +42,7 @@ public class DocumentSettings extends TestCase { log.println(" opening xTextDoc "); xTextDoc = - WriterTools.createTextDoc((XMultiServiceFactory) tParam.getMSF()); + WriterTools.createTextDoc(tParam.getMSF()); } /** @@ -59,7 +59,7 @@ public class DocumentSettings extends TestCase ) { SOfficeFactory SOF = - SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory.getFactory(tParam.getMSF()); XInterface oObj = null; log.println("creating a test environment"); diff --git a/qadevOOo/tests/java/mod/_sw/PageStyle.java b/qadevOOo/tests/java/mod/_sw/PageStyle.java index 2955e03500e0..623956b726ac 100644 --- a/qadevOOo/tests/java/mod/_sw/PageStyle.java +++ b/qadevOOo/tests/java/mod/_sw/PageStyle.java @@ -54,7 +54,7 @@ public class PageStyle extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java index 0c9110f521c8..e1e023835d4c 100644 --- a/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java +++ b/qadevOOo/tests/java/mod/_sw/ParagraphStyle.java @@ -54,7 +54,7 @@ public class ParagraphStyle extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index e9c097711f9e..b6f14e2db0cc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -99,7 +99,7 @@ public class SwAccessibleDocumentPageView extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ( (XMultiServiceFactory) Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -118,7 +118,7 @@ public class SwAccessibleDocumentPageView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); @@ -180,6 +180,6 @@ public class SwAccessibleDocumentPageView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc( (XMultiServiceFactory) Param.getMSF()); + xTextDoc = WriterTools.createTextDoc( Param.getMSF()); } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index 714d3c2901ba..fb108b5cc398 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -99,7 +99,7 @@ public class SwAccessibleDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); @@ -169,6 +169,6 @@ public class SwAccessibleDocumentView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index f94515e0be2e..c7b7fc97bebc 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -115,7 +115,7 @@ public class SwAccessibleEndnoteView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); @@ -174,6 +174,6 @@ public class SwAccessibleEndnoteView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 15cb7ddfb635..48172b83c206 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -129,7 +129,7 @@ public class SwAccessibleFooterView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); @@ -178,7 +178,7 @@ public class SwAccessibleFooterView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index af45d5dd3c2f..ad18a53e42c7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -116,7 +116,7 @@ public class SwAccessibleFootnoteView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); @@ -175,6 +175,6 @@ public class SwAccessibleFootnoteView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 7b6dcd44d372..10bd514aaa1a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -119,7 +119,7 @@ public class SwAccessibleHeaderView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); @@ -168,6 +168,6 @@ public class SwAccessibleHeaderView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index fc3e2c6106af..25a045b12172 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -154,7 +154,7 @@ public class SwAccessiblePageView extends TestCase { try { XDispatchProvider xDispProv = UnoRuntime.queryInterface(XDispatchProvider.class, xController); XURLTransformer xParser = UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)Param.getMSF()).createInstance("com.sun.star.util.URLTransformer")); + Param.getMSF().createInstance("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of URL objects. URL[] aParseURL = new URL[1]; aParseURL[0] = new URL(); @@ -173,7 +173,7 @@ public class SwAccessiblePageView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); @@ -250,7 +250,7 @@ public class SwAccessiblePageView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } /** diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index c1928be73673..5b86db7a5db8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -71,7 +71,7 @@ public class SwAccessibleParagraphView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); @@ -121,6 +121,6 @@ public class SwAccessibleParagraphView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc( (XMultiServiceFactory) Param.getMSF()); + xTextDoc = WriterTools.createTextDoc( Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index 9c68878552c5..1ed3a6c35c2b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -68,7 +68,7 @@ public class SwAccessibleTableCellView extends TestCase { XAccessibleContext oObj = null; XTextTable oTable = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { oTable = SOfficeFactory.createTextTable(xTextDoc); @@ -91,7 +91,7 @@ public class SwAccessibleTableCellView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow( Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); @@ -137,6 +137,6 @@ public class SwAccessibleTableCellView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println("creating a text document"); - xTextDoc = WriterTools.createTextDoc( (XMultiServiceFactory) Param.getMSF()); + xTextDoc = WriterTools.createTextDoc( Param.getMSF()); } }
\ No newline at end of file diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index e54a1599f96f..96802c362db1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -71,7 +71,7 @@ public class SwAccessibleTableView extends TestCase { XInterface oObj = null; XTextTable oTable = null; - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { @@ -92,7 +92,7 @@ public class SwAccessibleTableView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); @@ -154,7 +154,7 @@ public class SwAccessibleTableView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index 6d2ef55e278c..6525506f9df2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -70,7 +70,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); @@ -136,7 +136,7 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { log.println( "open a text document" ); String testdoc = utils.getFullTestURL("SwXTextEmbeddedObject.sxw"); log.println(testdoc); - xTextDoc = WriterTools.loadTextDoc((XMultiServiceFactory)Param.getMSF(),testdoc); + xTextDoc = WriterTools.loadTextDoc(Param.getMSF(),testdoc); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 2503d38ef4e2..6e95efb7d936 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -79,7 +79,7 @@ public class SwAccessibleTextFrameView extends TestCase { XTextCursor oCursor = null; // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); // creating Frames log.println( "creating Frames" ); try { @@ -103,7 +103,7 @@ public class SwAccessibleTextFrameView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); @@ -166,7 +166,7 @@ public class SwAccessibleTextFrameView extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index ee63c3dd0e45..f846460d952d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -72,7 +72,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { XInterface oObj = null; - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); Object oGraphObj = SOF.createInstance( xTextDoc, "com.sun.star.text.GraphicObject"); @@ -92,7 +92,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow(Param.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); @@ -156,7 +156,7 @@ public class SwAccessibleTextGraphicObject extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { log.println( "creating a text document" ); - xTextDoc = WriterTools.createTextDoc((XMultiServiceFactory)Param.getMSF()); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); } } diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java index 934616fb2fec..317dbe7bd2e1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java @@ -61,7 +61,7 @@ public class SwXAutoTextContainer extends TestCase { // first we write what we are intend to do to log file log.println("creating a AutoTextContainer"); try { - XMultiServiceFactory myMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory myMSF = Param.getMSF(); Object oInst = myMSF.createInstance ("com.sun.star.text.AutoTextContainer"); oContainer = UnoRuntime.queryInterface diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java index b37512167a85..1ed259c4b5ee 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java @@ -72,7 +72,7 @@ public class SwXAutoTextEntry extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - XMultiServiceFactory msf = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory msf = tParam.getMSF(); SOfficeFactory SOF = SOfficeFactory.getFactory( msf ); try { log.println( "creating a textdocument" ); @@ -124,7 +124,7 @@ public class SwXAutoTextEntry extends TestCase { XInterface oObj = null; log.println( "creating a test environment" ); try { - XMultiServiceFactory myMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory myMSF = Param.getMSF(); Object oInst = myMSF.createInstance ("com.sun.star.text.AutoTextContainer"); oContainer = UnoRuntime.queryInterface(XAutoTextContainer.class,oInst); diff --git a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java index 3f2e802473b2..cd79331ed178 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java +++ b/qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java @@ -70,7 +70,7 @@ public class SwXAutoTextGroup extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -106,7 +106,7 @@ public class SwXAutoTextGroup extends TestCase { log.println( "creating a test environment" ); try { - XMultiServiceFactory myMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory myMSF = Param.getMSF(); Object oInst = myMSF.createInstance("com.sun.star.text.AutoTextContainer"); oContainer = UnoRuntime.queryInterface(XAutoTextContainer.class,oInst); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java index f10a161aa2af..8d954e4f7fd6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBodyText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBodyText.java @@ -74,7 +74,7 @@ public class SwXBodyText extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java index 13543e806a0b..1c71e3633faf 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java @@ -61,7 +61,7 @@ public class SwXBookmark extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -84,7 +84,7 @@ public class SwXBookmark extends TestCase { * a bookmark, it is inserted to the text document. */ protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); XInterface oObj = null; Object instance = null; log.println( "creating a test environment" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java index 5ea99e608709..67cfc87ea4c1 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java @@ -57,7 +57,7 @@ public class SwXBookmarks extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXCell.java b/qadevOOo/tests/java/mod/_sw/SwXCell.java index 257c699aeccf..b4a0a827e059 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCell.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCell.java @@ -55,7 +55,7 @@ public class SwXCell extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -89,7 +89,7 @@ public class SwXCell extends TestCase { XInterface oObj = null; XTextContent oTable = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); log.println( "creating a test environment" ); try { oTable = SOfficeFactory.createTextTable(xTextDoc, 3, 4); diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java index a60f1b56f901..b566c1342f47 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java @@ -57,7 +57,7 @@ public class SwXCellRange extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java index 75b0a49b8285..f11ff4017388 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java +++ b/qadevOOo/tests/java/mod/_sw/SwXChapterNumbering.java @@ -60,7 +60,7 @@ public class SwXChapterNumbering extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java index 8111ea596bf4..b099c3f08641 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java @@ -66,7 +66,7 @@ public class SwXDocumentIndex extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -95,7 +95,7 @@ public class SwXDocumentIndex extends TestCase { XTextContent xTC = null; Object instance = null; - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); log.println( "creating a test environment" ); try { xTC = SOfficeFactory.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java index 0bc8ce938378..235d525544c9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java @@ -66,7 +66,7 @@ public class SwXDocumentIndexMark extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java index d4ff191f42f6..e7b2094a2132 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java @@ -60,7 +60,7 @@ public class SwXDocumentIndexes extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -89,7 +89,7 @@ public class SwXDocumentIndexes extends TestCase { public TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log ) throws StatusException { XInterface oObj = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); log.println( "creating a test environment" ); XTextContent xTC = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java index 45cc2daf6f7c..e5c52186fef8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java @@ -85,7 +85,7 @@ public class SwXDrawPage extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -125,7 +125,7 @@ public class SwXDrawPage extends TestCase { XShapes oShapes = null; log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); XDPSupp = UnoRuntime.queryInterface (XDrawPageSupplier.class, xTextDoc); xDP = XDPSupp.getDrawPage(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java index 87d1dc9aa2b4..0f1ed1efb9be 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java @@ -56,7 +56,7 @@ public class SwXEndnoteProperties extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java index 67f80b319f1c..53ff8d35d029 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java @@ -56,7 +56,7 @@ public class SwXFieldEnumeration extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java index b570ad3d322f..d7387fca274f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFieldMaster.java @@ -54,7 +54,7 @@ public class SwXFieldMaster extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java index c650a67d6d35..7c8fbe05844a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnote.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnote.java @@ -73,7 +73,7 @@ public class SwXFootnote extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java index 4659f0198e93..6b80f52a6683 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java @@ -55,7 +55,7 @@ public class SwXFootnoteProperties extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java index 6c1edcb810a7..edf29d7e8f97 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java @@ -77,7 +77,7 @@ public class SwXFootnoteText extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java index d9a7215b8887..08655a3e42e3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFootnotes.java @@ -58,7 +58,7 @@ public class SwXFootnotes extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXFrames.java b/qadevOOo/tests/java/mod/_sw/SwXFrames.java index 50050ea5c048..7cf813260e15 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXFrames.java +++ b/qadevOOo/tests/java/mod/_sw/SwXFrames.java @@ -61,7 +61,7 @@ public class SwXFrames extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java index 28e111b3c36e..4d5e66854211 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java @@ -80,7 +80,7 @@ public class SwXHeadFootText extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java index ff07a8cfc46e..8ac3c5441021 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java +++ b/qadevOOo/tests/java/mod/_sw/SwXLineNumberingProperties.java @@ -55,7 +55,7 @@ public class SwXLineNumberingProperties extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index efdbeca57011..cfd35362d233 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -78,7 +78,7 @@ public class SwXMailMerge extends TestCase { log.println(" instantiate MailMerge service"); try { - oObj = (XInterface) ( (XMultiServiceFactory) Param.getMSF()).createInstance + oObj = (XInterface) Param.getMSF().createInstance ("com.sun.star.text.MailMerge"); } catch (Exception e) { throw new StatusException("Can't create object environment", e) ; @@ -87,7 +87,7 @@ public class SwXMailMerge extends TestCase { // <set some variables> String cTestDoc = utils.getFullTestURL("MailMerge.sxw"); //cMailMerge_DocumentURL = cTestDoc - String cOutputURL = utils.getOfficeTemp( (XMultiServiceFactory) Param.getMSF()); + String cOutputURL = utils.getOfficeTemp( Param.getMSF()); String cDataSourceName = "Bibliography"; String cDataCommand = "biblio"; Object[] sel = new Object[2]; @@ -99,7 +99,7 @@ public class SwXMailMerge extends TestCase { // <create XResultSet> log.println("create a XResultSet"); try { - oRowSet = (XInterface) ( (XMultiServiceFactory) Param.getMSF()).createInstance + oRowSet = (XInterface) Param.getMSF().createInstance ("com.sun.star.sdb.RowSet"); } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); @@ -233,7 +233,7 @@ public class SwXMailMerge extends TestCase { log.println("create XResultSet"); try { - oRowSet = (XInterface) ( (XMultiServiceFactory) Param.getMSF()).createInstance + oRowSet = (XInterface) Param.getMSF().createInstance ("com.sun.star.sdb.RowSet"); } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); @@ -266,8 +266,7 @@ public class SwXMailMerge extends TestCase { XResultSet oMMXResultSet = null; try { oMMXResultSet = UnoRuntime.queryInterface(XResultSet.class, - ( (XMultiServiceFactory) - Param.getMSF()).createInstance("com.sun.star.sdb.RowSet")); + Param.getMSF().createInstance("com.sun.star.sdb.RowSet")); } catch (Exception e) { throw new StatusException("Can't create com.sun.star.sdb.RowSet", e); @@ -307,17 +306,17 @@ public class SwXMailMerge extends TestCase { int uniqueSuffix = Param.getInt("uniqueSuffix"); try { - xMSF = (XMultiServiceFactory)Param.getMSF(); + xMSF = Param.getMSF(); xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" ); // retrieving temp directory for database - String tmpDatabaseUrl = utils.getOfficeTempDir((XMultiServiceFactory)Param.getMSF()); + String tmpDatabaseUrl = utils.getOfficeTempDir(Param.getMSF()); databaseName = "NewDatabaseSource" + uniqueSuffix ; String tmpDatabaseFile = tmpDatabaseUrl + databaseName + ".odb"; System.out.println("try to delete '"+tmpDatabaseFile+"'"); - utils.deleteFile(((XMultiServiceFactory) Param.getMSF()), tmpDatabaseFile); + utils.deleteFile((Param.getMSF()), tmpDatabaseFile); tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ; @@ -330,7 +329,7 @@ public class SwXMailMerge extends TestCase { xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ; - DBTools dbt = new DBTools( (XMultiServiceFactory)Param.getMSF(), log ); + DBTools dbt = new DBTools( Param.getMSF(), log ); // registering source in DatabaseContext log.println("register database '"+tmpDatabaseUrl+"' as '"+databaseName+"'" ); dbt.reRegisterDB(databaseName, newSource) ; @@ -355,7 +354,7 @@ public class SwXMailMerge extends TestCase { XInterface oDataCont = null; try { - oDataCont = (XInterface)( (XMultiServiceFactory) Param.getMSF()).createInstance + oDataCont = (XInterface)Param.getMSF().createInstance ("com.sun.star.sdb.DatabaseContext"); } catch(Exception e) { throw new StatusException("Couldn't create instance of 'com.sun.star.sdb.DatabaseContext'", e); @@ -388,7 +387,7 @@ public class SwXMailMerge extends TestCase { protected void cleanup(TestParameters Param, PrintWriter log) { log.println("closing connections..."); - XMultiServiceFactory xMsf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMsf = Param.getMSF(); DBTools dbt = new DBTools( xMsf, log ); if (Param.containsKey("uniqueSuffix")){ diff --git a/qadevOOo/tests/java/mod/_sw/SwXModule.java b/qadevOOo/tests/java/mod/_sw/SwXModule.java index 8d848751eba4..15ae811f176f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXModule.java +++ b/qadevOOo/tests/java/mod/_sw/SwXModule.java @@ -56,7 +56,7 @@ public class SwXModule extends TestCase { Object oInterface = null; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance( + oInterface = Param.getMSF().createInstance( "com.sun.star.text.GlobalSettings" ); } catch ( com.sun.star.uno.Exception e ) { log.println("Service not available" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java index d88fc9516c9c..dd5043cf8ffe 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java +++ b/qadevOOo/tests/java/mod/_sw/SwXNumberingRules.java @@ -69,7 +69,7 @@ public class SwXNumberingRules extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java index 7a2e85b3659c..f28cd9a06b2f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java @@ -145,7 +145,7 @@ public class SwXParagraph extends TestCase { log.println("couldn't close document"); } } - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java index ace70b24c369..e9d292666a2f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXParagraphEnumeration.java @@ -55,7 +55,7 @@ public class SwXParagraphEnumeration extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java index 0c08a925bf00..216243102161 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java @@ -51,7 +51,7 @@ public class SwXPrintSettings extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -82,7 +82,7 @@ public class SwXPrintSettings extends TestCase { log.println( "creating a test environment" ); try { - XMultiServiceFactory myMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory myMSF = tParam.getMSF(); oInst = myMSF.createInstance("com.sun.star.text.GlobalSettings"); } catch ( com.sun.star.uno.Exception e ){ log.println("Couldn't create instance!" + e); diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java index 4a2d07e99892..785eb334489a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySet.java @@ -59,7 +59,7 @@ public class SwXPropertySet extends TestCase { TestParameters Param, PrintWriter log ) throws StatusException { log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { log.println( "creating a text document" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java index 1971579eb332..542841cb9ce0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java +++ b/qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java @@ -65,7 +65,7 @@ public class SwXPropertySetInfo extends TestCase { XInterface oObj = null; log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java index c345785dae87..47d82163c98d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java @@ -61,7 +61,7 @@ public class SwXReferenceMark extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java index 273ca44ceb3b..601acd8fd34d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java @@ -62,7 +62,7 @@ public class SwXReferenceMarks extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXShape.java b/qadevOOo/tests/java/mod/_sw/SwXShape.java index dc7ca25d0dcd..a03b76c51a10 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXShape.java +++ b/qadevOOo/tests/java/mod/_sw/SwXShape.java @@ -67,7 +67,7 @@ public class SwXShape extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyle.java b/qadevOOo/tests/java/mod/_sw/SwXStyle.java index 0371ffe866b0..96c8a8d74961 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyle.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyle.java @@ -69,7 +69,7 @@ public class SwXStyle extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java index bd77d4cabe99..44a3037d2a3e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamilies.java @@ -59,7 +59,7 @@ public class SwXStyleFamilies extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java index e2fdb12febd6..4550cec18f08 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java @@ -69,7 +69,7 @@ public class SwXStyleFamily extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -120,7 +120,7 @@ public class SwXStyleFamily extends TestCase { log.println( "Creating Test Environment..." ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); XComponent xComp = UnoRuntime.queryInterface(XComponent.class, xTextDoc); XInterface oInstance = (XInterface) SOF.createInstance(xComp, "com.sun.star.style.CharacterStyle"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java index 700780ee1eac..a279016637be 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java @@ -77,7 +77,7 @@ public class SwXTableCellText extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java index c69741a6ec69..4e9e8b9234e7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java @@ -63,7 +63,7 @@ public class SwXTableColumns extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java index 6bc037557633..e03064d7d483 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java @@ -58,7 +58,7 @@ public class SwXTableRows extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -87,7 +87,7 @@ public class SwXTableRows extends TestCase { XTextTable oTable = null; log.println( "creating a test environment" ); - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java index 7d4746ab1ac3..832aeddc06b6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextColumns.java @@ -64,7 +64,7 @@ public class SwXTextColumns extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java index c175421a1d53..a11470f6b54d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextCursor.java @@ -97,7 +97,7 @@ public class SwXTextCursor extends TestCase { * Creates text document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java index e39a409b98d8..16bedd3c6436 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java @@ -93,7 +93,7 @@ public class SwXTextDefaults extends TestCase { * Creates text document. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java index 829e1d6853d6..84e35edfe4d9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextDocument.java @@ -74,7 +74,7 @@ public class SwXTextDocument extends TestCase { try { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); @@ -208,7 +208,7 @@ public class SwXTextDocument extends TestCase { log.println("creating a second textdocument"); xSecondTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java index c4808493a4c9..9c1745154572 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java @@ -96,7 +96,7 @@ public class SwXTextEmbeddedObject extends TestCase { XInterface oObj = null; // create testobject here - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java index e025bd95a2a9..f1f23365a7e3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObjects.java @@ -52,7 +52,7 @@ public class SwXTextEmbeddedObjects extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { oDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextField.java b/qadevOOo/tests/java/mod/_sw/SwXTextField.java index e4173e485d1e..c2cca418794f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextField.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextField.java @@ -61,7 +61,7 @@ public class SwXTextField extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java index 6629c12052d8..ea9c4154bd9e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldMasters.java @@ -58,7 +58,7 @@ public class SwXTextFieldMasters extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java index bff70af76caa..c21d69916da5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFieldTypes.java @@ -56,7 +56,7 @@ public class SwXTextFieldTypes extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java index 15806946a87c..4acc235dd8a9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java @@ -47,7 +47,7 @@ public class SwXTextFrame extends TestCase { XTextDocument xTextDoc; protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a textdocument"); @@ -82,7 +82,7 @@ public class SwXTextFrame extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); // creating Frames diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index 5282155bb56b..77caca5dbc30 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -53,7 +53,7 @@ public class SwXTextFrameText extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -95,7 +95,7 @@ public class SwXTextFrameText extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); // create testobject here diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index fc9c67c958f3..1b37e78d3bf4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -52,7 +52,7 @@ public class SwXTextGraphicObject extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdoc" ); xTextDoc = SOF.createTextDoc( null ); @@ -97,7 +97,7 @@ public class SwXTextGraphicObject extends TestCase { XInterface oObj = null; Object oGObject = null; Object xTextFrame = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); Object instance = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java index b4897fa82469..91da8efeff85 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java @@ -52,7 +52,7 @@ public class SwXTextGraphicObjects extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdoc" ); xTextDoc = SOF.createTextDoc( null ); @@ -97,7 +97,7 @@ public class SwXTextGraphicObjects extends TestCase { XInterface oObj = null; Object oGObject = null; - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { oGObject = SOF.createInstance diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java index db07f4796d24..522dd5d9a1ad 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java @@ -49,7 +49,7 @@ public class SwXTextPortion extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java index 0a96111a7d74..c1ae07d08d4b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java @@ -49,7 +49,7 @@ public class SwXTextPortionEnumeration extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java index ef2778ac72d9..e25491ff5b4f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRange.java @@ -37,7 +37,7 @@ public class SwXTextRange extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java index 4cc8e8d71bac..a65a79ddc8e8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextRanges.java @@ -47,7 +47,7 @@ public class SwXTextRanges extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java index 135b1e792509..8f1b3298c7e7 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSearch.java @@ -48,7 +48,7 @@ public class SwXTextSearch extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java index 4dd774ea5d8c..dcd5c115039b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSection.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSection.java @@ -57,7 +57,7 @@ public class SwXTextSection extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java index 7786e19243c6..3af9c0c74aa8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextSections.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextSections.java @@ -46,7 +46,7 @@ public class SwXTextSections extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index dfbec2492c74..25f7125344c6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -50,7 +50,7 @@ public class SwXTextTable extends TestCase { XTextDocument xTextDoc; protected void initialize(TestParameters tParam, PrintWriter log) { - SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF()); + SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java index 980765be4fc2..58ecd51dbce5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java @@ -42,7 +42,7 @@ public class SwXTextTableCursor extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -82,7 +82,7 @@ public class SwXTextTableCursor extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); // create testobject here diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java index a7b48cb02eec..2c3398ccc652 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java @@ -44,7 +44,7 @@ public class SwXTextTableRow extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -73,7 +73,7 @@ public class SwXTextTableRow extends TestCase { log.println( "Creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)Param.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); try { log.println("creating a texttable"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java index 1fc75c2d96a1..8e2253c7d5c2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java @@ -45,7 +45,7 @@ public class SwXTextTables extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -87,7 +87,7 @@ public class SwXTextTables extends TestCase { log.println( "creating a test environment" ); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); // create testobject here TestEnvironment tEnv = null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java index 9de15817be2a..30ccf734a105 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java @@ -78,7 +78,7 @@ public class SwXTextView extends TestCase { * */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -133,7 +133,7 @@ public class SwXTextView extends TestCase { util.dbg.getSuppServices(xContr); - SOfficeFactory SOF=SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF=SOfficeFactory.getFactory( tParam.getMSF() ); XTextFrame first =null; XTextFrame second =null; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java index 9c387b6e780e..b59abcac68a9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextViewCursor.java @@ -53,7 +53,7 @@ public class SwXTextViewCursor extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java index 4636a4c05025..b0e86b30e915 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java +++ b/qadevOOo/tests/java/mod/_sw/SwXViewSettings.java @@ -43,7 +43,7 @@ public class SwXViewSettings extends TestCase { XTextDocument xTextDoc; protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java index 6c6ab533c737..30765eea3ec2 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentExporter.java @@ -68,7 +68,7 @@ public class XMLContentExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -113,7 +113,7 @@ public class XMLContentExporter extends TestCase { ( TestParameters tParam, PrintWriter log ) throws StatusException { final String CONTENT = "XMLContentExporter"; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; Filter = new ContentFilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java index 493e990e387b..1e4e812f4160 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLContentImporter.java @@ -64,7 +64,7 @@ public class XMLContentImporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -114,7 +114,7 @@ public class XMLContentImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sw/XMLExporter.java b/qadevOOo/tests/java/mod/_sw/XMLExporter.java index 85000526bf4c..8a380749ee1b 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLExporter.java @@ -68,7 +68,7 @@ public class XMLExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -114,7 +114,7 @@ public class XMLExporter extends TestCase { final String TEST_STR = "XMLExporter"; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; Filter = new FilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_sw/XMLImporter.java b/qadevOOo/tests/java/mod/_sw/XMLImporter.java index cb4fd3f2d8ec..9d04f6e42749 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLImporter.java @@ -65,7 +65,7 @@ public class XMLImporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -106,7 +106,7 @@ public class XMLImporter extends TestCase { public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; try { diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java index 8cea6256add1..d8a67d589152 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java @@ -69,7 +69,7 @@ public class XMLMetaExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); @@ -114,7 +114,7 @@ public class XMLMetaExporter extends TestCase { ( TestParameters tParam, PrintWriter log ) throws StatusException { final String TITLE = "Title for testing of XMLMetaExporter"; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; Filter = new MetaFilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java index 75b5ecac8cce..c8d56fec4a15 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java @@ -66,7 +66,7 @@ public class XMLMetaImporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -117,7 +117,7 @@ public class XMLMetaImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java index b2fc797e717b..8b1f4badffe9 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java @@ -70,7 +70,7 @@ public class XMLSettingsExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -118,7 +118,7 @@ public class XMLSettingsExporter extends TestCase { final short ZOOM = 50; - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; Filter = new SettingsFilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java index ab62e10f5872..d17430c02b27 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java @@ -67,7 +67,7 @@ public class XMLSettingsImporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -117,7 +117,7 @@ public class XMLSettingsImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java index af1f403ed59d..7873a957679a 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java @@ -68,7 +68,7 @@ public class XMLStylesExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -112,7 +112,7 @@ public class XMLStylesExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment ( TestParameters tParam, PrintWriter log ) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log) ; Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java index bf3daa24f604..e1cdafae68c1 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java @@ -66,7 +66,7 @@ public class XMLStylesImporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); try { log.println( "creating a textdocument" ); @@ -117,7 +117,7 @@ public class XMLStylesImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java index 0c3a5cd5dd5d..a0e68953c4da 100644 --- a/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java +++ b/qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java @@ -33,7 +33,7 @@ public class SystemClipboard extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java index aca67c592e8d..54a0b8164761 100644 --- a/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java +++ b/qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java @@ -33,7 +33,7 @@ public class SystemShellExecute extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java index fab6e77ac28d..10ce9c07d70d 100644 --- a/qadevOOo/tests/java/mod/_tcv/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_tcv/TypeConverter.java @@ -44,7 +44,7 @@ public class TypeConverter extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.script.Converter" ); } catch( Exception e ) { diff --git a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java index bde66fc4d2c0..f01c53603b65 100644 --- a/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_tdmgr/TypeDescriptionManager.java @@ -47,7 +47,7 @@ public class TypeDescriptionManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context diff --git a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java index fe0664217e75..3032d31647d3 100644 --- a/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java +++ b/qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java @@ -54,7 +54,7 @@ public class DefaultNumberingProvider extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ("com.sun.star.text.DefaultNumberingProvider" ); } diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index 79f8199e5723..3966b14bcfe7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -86,7 +86,7 @@ public class AccessibleButton extends lib.TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory msf = Param.getMSF(); try { oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit"); @@ -178,7 +178,7 @@ public class AccessibleButton extends lib.TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index 7460dd19ca56..c9a4aaa2d77c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -90,7 +90,7 @@ public class AccessibleCheckBox extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory msf = Param.getMSF(); log.println("Creating text document"); if (xTextDoc == null) { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index 2898aac4f102..d5dbf0436602 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -82,7 +82,7 @@ public class AccessibleComboBox extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -94,7 +94,7 @@ public class AccessibleComboBox extends TestCase { XExtendedToolkit.class, oObj); DiagThread psDiag = new DiagThread(xTextDoc, - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); psDiag.start(); util.utils.shortWait(Param.getInt("ShortWait")); @@ -179,7 +179,7 @@ public class AccessibleComboBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index 4eac734ec462..32209be9fa62 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -77,7 +77,7 @@ public class AccessibleDropDownComboBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - (XMultiServiceFactory) Param.getMSF(), + Param.getMSF(), xTextDoc); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); @@ -113,7 +113,7 @@ public class AccessibleDropDownComboBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index c53199768c28..6b3cc92030d7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -78,7 +78,7 @@ public class AccessibleDropDownListBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) Param.getMSF(), + Param.getMSF(), xTextDoc); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); @@ -114,8 +114,8 @@ public class AccessibleDropDownListBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); - DesktopTools.dockStylist((XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); + DesktopTools.dockStylist(Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index 5d6730751fdd..dd4e360eca65 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -91,7 +91,7 @@ public class AccessibleEdit extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -114,7 +114,7 @@ public class AccessibleEdit extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + XInterface transf = (XInterface) Param.getMSF().createInstance( "com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -204,7 +204,7 @@ public class AccessibleEdit extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index ec26349940b6..6abc0f619970 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -76,7 +76,7 @@ public class AccessibleFixedText extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XControlModel dlgModel = null; XControl txtControl = null; @@ -128,7 +128,7 @@ public class AccessibleFixedText extends TestCase { } try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java index d10248760bd7..aa054c0ea991 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java @@ -204,7 +204,7 @@ public class AccessibleList extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { try { - msf = (XMultiServiceFactory) Param.getMSF(); + msf = Param.getMSF(); SOfficeFactory SOF = SOfficeFactory.getFactory(msf); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java index 142a42a238f6..51567c2d441b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java @@ -90,7 +90,7 @@ public class AccessibleListBox extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); @@ -115,7 +115,7 @@ public class AccessibleListBox extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + XInterface transf = (XInterface) Param.getMSF().createInstance( "com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -219,7 +219,7 @@ public class AccessibleListBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java index 12dbf443917b..31a89a3f9850 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java @@ -85,7 +85,7 @@ public class AccessibleListItem extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory msf = Param.getMSF(); try { oObj = (XInterface) msf.createInstance("com.sun.star.awt.Toolkit"); @@ -210,7 +210,7 @@ public class AccessibleListItem extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index 7d943d0039af..e2ce312261a3 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -82,7 +82,7 @@ public class AccessibleMenu extends TestCase { */ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { - XMultiServiceFactory msf = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory msf = Param.getMSF(); try { SOfficeFactory SOF = SOfficeFactory.getFactory(msf); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index f894aaf4c138..bae88846146a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -115,7 +115,7 @@ public class AccessibleMenuBar extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { try { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); xTextDoc = SOF.createTextDoc(null); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create document", e); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index 2d0d3de63373..05cad8843257 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -162,7 +162,7 @@ public class AccessibleMenuItem extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { try { - msf = (XMultiServiceFactory) Param.getMSF(); + msf = Param.getMSF(); SOfficeFactory SOF = SOfficeFactory.getFactory(msf); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index 5a4862999caa..b2c6e10046da 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -128,7 +128,7 @@ public class AccessibleMenuSeparator extends TestCase { */ protected void initialize(TestParameters Param, PrintWriter log) { try { - msf = (XMultiServiceFactory) Param.getMSF(); + msf = Param.getMSF(); SOfficeFactory SOF = SOfficeFactory.getFactory(msf); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index 1a1512e76fba..7d0cf42cd83c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -57,7 +57,7 @@ public class AccessiblePopupMenu extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -118,14 +118,14 @@ public class AccessiblePopupMenu extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); XInterface toolkit = null; try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); - toolkit = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + toolkit = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED @@ -143,7 +143,7 @@ public class AccessiblePopupMenu extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index aabae23a0dd7..2a0a16cb6a0e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -94,7 +94,7 @@ public class AccessibleRadioButton extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -155,7 +155,7 @@ public class AccessibleRadioButton extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -180,7 +180,7 @@ public class AccessibleRadioButton extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + XInterface transf = (XInterface) tParam.getMSF().createInstance( "com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -206,7 +206,7 @@ public class AccessibleRadioButton extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + oObj = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index 321a9d6be4e5..4d7e2c1f3c93 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -81,7 +81,7 @@ public class AccessibleScrollBar extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -125,7 +125,7 @@ public class AccessibleScrollBar extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -143,7 +143,7 @@ public class AccessibleScrollBar extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index ba8f8114499b..b1e1c3117722 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -116,14 +116,14 @@ public class AccessibleStatusBar extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); XInterface toolkit = null; try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); - toolkit = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + toolkit = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index ee55d7b4fb6c..ddc3188d0ce0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -81,7 +81,7 @@ public class AccessibleStatusBarItem extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -125,7 +125,7 @@ public class AccessibleStatusBarItem extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -145,7 +145,7 @@ public class AccessibleStatusBarItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index e32fe9405b23..ddbb04ee4606 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -88,7 +88,7 @@ public class AccessibleTabControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -147,7 +147,7 @@ public class AccessibleTabControl extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -172,7 +172,7 @@ public class AccessibleTabControl extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + XInterface transf = (XInterface) tParam.getMSF().createInstance( "com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -198,7 +198,7 @@ public class AccessibleTabControl extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + oObj = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index 9d09508b5f97..4188d567b2ea 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -84,7 +84,7 @@ public class AccessibleTabPage extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -154,7 +154,7 @@ public class AccessibleTabPage extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -179,7 +179,7 @@ public class AccessibleTabPage extends TestCase { XURLTransformer urlTransf = null; try { - XInterface transf = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + XInterface transf = (XInterface) tParam.getMSF().createInstance( "com.sun.star.util.URLTransformer"); urlTransf = UnoRuntime.queryInterface( XURLTransformer.class, transf); @@ -205,7 +205,7 @@ public class AccessibleTabPage extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + oObj = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index a034ab9ee6c8..b37fcea12f5e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -71,7 +71,7 @@ public class AccessibleToolBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -114,7 +114,7 @@ public class AccessibleToolBox extends TestCase { util.DesktopTools.closeDoc(xTextDoc); } - XMultiServiceFactory msf = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory msf = tParam.getMSF(); // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory(msf); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index 3bf80fa2c669..3ab1bbb7e79f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -85,7 +85,7 @@ public class AccessibleToolBoxItem extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -133,7 +133,7 @@ public class AccessibleToolBoxItem extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a text document"); @@ -152,7 +152,7 @@ public class AccessibleToolBoxItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index 6f0f88730596..d765bc931d9e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -87,7 +87,7 @@ public class AccessibleWindow extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { UnoRuntime.queryInterface(XDesktop.class, DesktopTools.createDesktop( - (XMultiServiceFactory) Param.getMSF())); + Param.getMSF())); } /** @@ -135,14 +135,14 @@ public class AccessibleWindow extends TestCase { // get a soffice factory object SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); XInterface toolkit = null; try { log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); - toolkit = (XInterface) ((XMultiServiceFactory) tParam.getMSF()).createInstance( + toolkit = (XInterface) tParam.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED @@ -158,7 +158,7 @@ public class AccessibleWindow extends TestCase { AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = AccessibilityTools.getCurrentWindow( - (XMultiServiceFactory) tParam.getMSF(), + tParam.getMSF(), aModel); XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java index 778970733c52..687c1244f703 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeDataModel.java @@ -44,7 +44,7 @@ public class MutableTreeDataModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -60,7 +60,7 @@ public class MutableTreeDataModel extends TestCase { PrintWriter log) { try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.tree.MutableTreeDataModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java index 6a9cf9376398..92e341886727 100644 --- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java +++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java @@ -47,7 +47,7 @@ public class MutableTreeNode extends TestCase { * Creates StarOffice Writer document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - mxMSF = (XMultiServiceFactory) tParam.getMSF(); + mxMSF = tParam.getMSF(); // log.println("creating a textdocument"); // xTextDoc = WriterTools.createTextDoc(mxMSF); } diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java index b7029193df79..dcd010439514 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabController.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java @@ -50,7 +50,7 @@ public class TabController extends TestCase { try { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) param.getMSF()); + param.getMSF()); } catch (Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); @@ -114,7 +114,7 @@ public class TabController extends TestCase { // create object try { - oObj = (XInterface) ((XMultiServiceFactory) param.getMSF()).createInstance( + oObj = (XInterface) param.getMSF().createInstance( "com.sun.star.awt.TabController"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java index 648f0726a4bd..ead5a1d6a1da 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java @@ -41,7 +41,7 @@ public class TabControllerModel extends TestCase { try { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) param.getMSF()); + param.getMSF()); } catch (Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create document", e); @@ -67,7 +67,7 @@ public class TabControllerModel extends TestCase { "TextField"); try { - oObj = (XInterface) ((XMultiServiceFactory) param.getMSF()).createInstance( + oObj = (XInterface) param.getMSF().createInstance( "com.sun.star.awt.TabControllerModel"); } catch (Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java index eabaa0ac69f6..d7f92dadf313 100644 --- a/qadevOOo/tests/java/mod/_toolkit/Toolkit.java +++ b/qadevOOo/tests/java/mod/_toolkit/Toolkit.java @@ -50,7 +50,7 @@ public class Toolkit extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); @@ -102,7 +102,7 @@ public class Toolkit extends TestCase { //win = (XWindow) UnoRuntime.queryInterface(XWindow.class, ctrl) ; the_win = the_access.getControl(the_Model).getPeer(); - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.Toolkit"); } catch (com.sun.star.uno.Exception e) { log.println("Couldn't get toolkit"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java index b75f8f6339df..73fd63af34be 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java @@ -51,13 +51,13 @@ public class UnoControlButton extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); xTD2 = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java index 25d78f6bd99d..2a1569992a02 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java @@ -41,7 +41,7 @@ public class UnoControlButtonModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -58,7 +58,7 @@ public class UnoControlButtonModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlButtonModel"); } catch (Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java index 50100244a6b5..603be5d99557 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java @@ -52,13 +52,13 @@ public class UnoControlCheckBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); xTD2 = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java index 7ee215cc7899..239ca24dd6e0 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java @@ -41,7 +41,7 @@ public class UnoControlCheckBoxModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -58,7 +58,7 @@ public class UnoControlCheckBoxModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlCheckBoxModel"); } catch (Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java index 8a969e872954..d610a913b088 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java @@ -48,7 +48,7 @@ public class UnoControlComboBox extends TestCase { private static XTextDocument xTextDoc; protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java index d0e9f3647786..975eca84c843 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlComboBoxModel.java @@ -40,7 +40,7 @@ public class UnoControlComboBoxModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlComboBoxModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlComboBoxModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java index fdee3047166f..394bcf0ae6a8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java @@ -59,9 +59,9 @@ public class UnoControlContainer extends TestCase { try { log.println("creating a textdocument"); xTD2 = WriterTools.createTextDoc( - (XMultiServiceFactory) param.getMSF()); + param.getMSF()); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) param.getMSF()); + param.getMSF()); } catch (Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); @@ -184,7 +184,7 @@ public class UnoControlContainer extends TestCase { // finished create Object Relations ----------------------------------- // create the UnoControlContainer try { - oObj = (XInterface) ((XMultiServiceFactory) param.getMSF()).createInstance( + oObj = (XInterface) param.getMSF().createInstance( "com.sun.star.awt.UnoControlContainer"); XControl xCtrl = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java index 5a84d7354635..e5aa0a75dbce 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java @@ -36,7 +36,7 @@ public class UnoControlContainerModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) param.getMSF()).createInstance( + oObj = (XInterface) param.getMSF().createInstance( "com.sun.star.awt.UnoControlContainerModel"); } catch (Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java index 1a484c815897..903f5e3180c8 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java @@ -50,7 +50,7 @@ public class UnoControlCurrencyField extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java index a8c551309553..ec44c593c6dc 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyFieldModel.java @@ -40,7 +40,7 @@ public class UnoControlCurrencyFieldModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlCurrencyFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlCurrencyFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java index 45b22e05b17b..04b5849e562e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java @@ -52,13 +52,13 @@ public class UnoControlDateField extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); xTD2 = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); } catch (com.sun.star.uno.Exception e) { // Some exception occurs.FAILED e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java index ae9b77713923..5cd94d60e84f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDateFieldModel.java @@ -40,7 +40,7 @@ public class UnoControlDateFieldModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlDateFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlDateFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java index 51c3034512a3..edcfe8ec1ea1 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialog.java @@ -85,7 +85,7 @@ public class UnoControlDialog extends TestCase { public synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XControlModel dlgModel = null; XWindowPeer the_win = null; @@ -231,7 +231,7 @@ public class UnoControlDialog extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index 8c2fc3182c38..32fc7c71cac2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -80,7 +80,7 @@ public class UnoControlDialogModel extends TestCase { XMultiServiceFactory xMultiServiceFactory = null; try { - dialogModel = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + dialogModel = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlDialogModel"); // create the dialog model and set the properties @@ -133,7 +133,7 @@ public class UnoControlDialogModel extends TestCase { // create the dialog control and set the model XControl dialog = UnoRuntime.queryInterface( XControl.class, - ((XMultiServiceFactory) Param.getMSF()).createInstance( + Param.getMSF().createInstance( "com.sun.star.awt.UnoControlDialog")); XControl xControl = UnoRuntime.queryInterface( XControl.class, dialog); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java index 9702a7ecaf12..ffc5a94981fa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java @@ -50,7 +50,7 @@ public class UnoControlEdit extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java index b73a29d60d8f..ddb835448920 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlEditModel.java @@ -40,7 +40,7 @@ public class UnoControlEditModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlEditModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlEditModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java index b96ea9f55305..bc7e4fcd710f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java @@ -50,7 +50,7 @@ public class UnoControlFileControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java index a45cfa773f09..58df74c102e7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFileControlModel.java @@ -40,7 +40,7 @@ public class UnoControlFileControlModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlFileControlModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlFileControlModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java index ee5e18a64649..988c9dc99db7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedLineModel.java @@ -71,7 +71,7 @@ public class UnoControlFixedLineModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlFixedLineModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java index 54841d9c34ec..1abe11d58768 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java @@ -49,7 +49,7 @@ public class UnoControlFixedText extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java index 9c2d3ca3c791..e263f41ad14e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFixedTextModel.java @@ -40,7 +40,7 @@ public class UnoControlFixedTextModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlFixedTextModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlFixedTextModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java index aa50e0e8546d..ed67e69a96af 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java @@ -51,7 +51,7 @@ public class UnoControlFormattedField extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java index 1e0c1178df2d..4e0ae1e044f2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedFieldModel.java @@ -40,7 +40,7 @@ public class UnoControlFormattedFieldModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlFormattedFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlFormattedFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java index 76550a5a4631..78ddbd805fb2 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java @@ -49,7 +49,7 @@ public class UnoControlGroupBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java index 7995b9a76b1e..3d118cdb4bd6 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBoxModel.java @@ -40,7 +40,7 @@ public class UnoControlGroupBoxModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlGroupBoxModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlGroupBoxModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java index 94592c33acc2..da1c9aec7fe4 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java @@ -50,7 +50,7 @@ public class UnoControlImageControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java index da7efd78ec0d..b4091b1c0cd5 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlImageControlModel.java @@ -35,7 +35,7 @@ public class UnoControlImageControlModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlImageControlModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java index 6122ea6e5113..cfcacd8f4812 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java @@ -50,7 +50,7 @@ public class UnoControlListBox extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java index c7594d8f226b..bbf80fdd9f8c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlListBoxModel.java @@ -40,7 +40,7 @@ public class UnoControlListBoxModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlListBoxModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlListBoxModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java index cd9d689c0b07..afd9d717b761 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java @@ -49,7 +49,7 @@ public class UnoControlNumericField extends TestCase { private static XTextDocument xTextDoc; protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java index 51f9eae87199..ad6a5f6990b9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlNumericFieldModel.java @@ -40,7 +40,7 @@ public class UnoControlNumericFieldModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoControlNumericFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlNumericFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java index 023ecc455376..30e359024a7b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java @@ -50,7 +50,7 @@ public class UnoControlPatternField extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java index ee1f785f61fd..31d19268d05f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlPatternFieldModel.java @@ -35,7 +35,7 @@ public class UnoControlPatternFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlPatternFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java index edace2accb30..4cd62570d57b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlProgressBarModel.java @@ -69,7 +69,7 @@ public class UnoControlProgressBarModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlProgressBarModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java index ff0132a7ee13..b4c985b0936c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java @@ -49,7 +49,7 @@ public class UnoControlRadioButton extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java index 2cb60c441fca..20562bd8356f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButtonModel.java @@ -35,7 +35,7 @@ public class UnoControlRadioButtonModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlRadioButtonModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java index be9902855647..99a900aba75f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlScrollBarModel.java @@ -71,7 +71,7 @@ public class UnoControlScrollBarModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlScrollBarModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java index b9e0d0b02c65..0dc35968579d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java @@ -50,7 +50,7 @@ public class UnoControlTimeField extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java index e9b0fe5caaf1..59c6ae391990 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlTimeFieldModel.java @@ -35,7 +35,7 @@ public class UnoControlTimeFieldModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlTimeFieldModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java index 00ba9b8160d1..2a14d693f440 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java @@ -54,7 +54,7 @@ public class UnoScrollBarControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java index ffd66a943f7b..2e8ca3d81e53 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java @@ -49,7 +49,7 @@ public class UnoSpinButtonControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); } protected void cleanup(TestParameters tParam, PrintWriter log) { diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java index 11a59a38627e..a3f1bff37041 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel.java @@ -42,7 +42,7 @@ public class UnoSpinButtonControlModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.UnoControlSpinButtonModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index bc2c0ba2bab7..87d632cf0bfd 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -53,7 +53,7 @@ public class UnoTreeControl extends TestCase { protected void initialize(TestParameters Param, PrintWriter log) { SOfficeFactory SOF = SOfficeFactory.getFactory( - (XMultiServiceFactory) Param.getMSF()); + Param.getMSF()); try { log.println("creating a textdocument"); @@ -74,7 +74,7 @@ public class UnoTreeControl extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) { String sTreeControlName = "UnoTreeControl-Test"; - mxMSF = (XMultiServiceFactory) Param.getMSF(); + mxMSF = Param.getMSF(); XInterface oObj = null; XMutableTreeNode xNode = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java index d140ca7a3e49..696692bdba80 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeModel.java @@ -40,7 +40,7 @@ public class UnoTreeModel extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); xTextDoc = WriterTools.createTextDoc( - (XMultiServiceFactory) tParam.getMSF()); + tParam.getMSF()); } /** @@ -57,7 +57,7 @@ public class UnoTreeModel extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory) Param.getMSF()).createInstance( + oObj = (XInterface) Param.getMSF().createInstance( "com.sun.star.awt.tree.TreeControlModel"); } catch (Exception e) { } diff --git a/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java index 986adef66d40..48d8da811fb8 100644 --- a/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java +++ b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java @@ -39,7 +39,7 @@ public class TypeConverter extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.script.Converter" ); } catch( Exception e ) { diff --git a/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java index 57b45152453b..d3291073e13a 100644 --- a/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java +++ b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java @@ -42,7 +42,7 @@ public class TypeDescriptionManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context diff --git a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java index 5beab9add447..5f57465c196a 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java @@ -46,7 +46,7 @@ public class UcbContentProviderProxyFactory extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java index 31343e823a3a..d0cfab324884 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java @@ -37,7 +37,7 @@ public class UcbPropertiesManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.UcbPropertiesManager" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_ucb/UcbStore.java b/qadevOOo/tests/java/mod/_ucb/UcbStore.java index 828866ad03a7..4faef44df613 100644 --- a/qadevOOo/tests/java/mod/_ucb/UcbStore.java +++ b/qadevOOo/tests/java/mod/_ucb/UcbStore.java @@ -46,7 +46,7 @@ public class UcbStore extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.comp.ucb.UcbStore" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java index 25e33f88769d..6548c25f14e1 100644 --- a/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java +++ b/qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java @@ -48,7 +48,7 @@ public class UniversalContentBroker extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.UniversalContentBroker" ); } catch( com.sun.star.uno.Exception e ) { diff --git a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java index 91a49cfe2738..0904f2a1ca09 100644 --- a/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java @@ -40,7 +40,7 @@ public class CHelpContentProvider extends TestCase { Object aUCB = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.ucb.HelpContentProvider" ); aUCB = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java index cdd9b2a5e102..dab69a2dbfcc 100644 --- a/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java @@ -42,7 +42,7 @@ public class WebDAVContentProvider extends TestCase { */ public TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface xInt; log.println("creating WebDAVContentProvider instance"); diff --git a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java index 3a69920f01ad..3958666f7d46 100644 --- a/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java +++ b/qadevOOo/tests/java/mod/_ucpfile/FileProvider.java @@ -39,7 +39,7 @@ public class FileProvider extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.FileProvider" ); } catch( com.sun.star.uno.Exception e ) { @@ -58,7 +58,7 @@ public class FileProvider extends TestCase { //Adding ObjRelation for XContentProvider tEnv.addObjRelation("FACTORY",CIF); tEnv.addObjRelation("CONTENT1", - util.utils.getOfficeTemp((XMultiServiceFactory)Param.getMSF())); + util.utils.getOfficeTemp(Param.getMSF())); tEnv.addObjRelation("CONTENT2", util.utils.getFullTestURL("SwXTextEmbeddedObject.sdw")); diff --git a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java index 2e0dd6743a5c..c7a484efe285 100644 --- a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java @@ -40,7 +40,7 @@ public class FTPContentProvider extends TestCase { Object aUCB = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.ucb.FTPContentProvider" ); aUCB = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java index cc5771b16f7a..6a298cede86a 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java @@ -40,7 +40,7 @@ public class HierarchyContentProvider extends TestCase { Object ucb = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.HierarchyContentProvider" ); ucb = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java index af36d1b52ee8..fc478c770590 100644 --- a/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java +++ b/qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource.java @@ -40,7 +40,7 @@ public class HierarchyDataSource extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); oInterface = xMSF.createInstance( "com.sun.star.ucb.DefaultHierarchyDataSource"); } diff --git a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java index 08868472b295..b0905ea7e49c 100644 --- a/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java @@ -40,7 +40,7 @@ public class PackageContentProvider extends TestCase { Object ucb = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.comp.ucb.PackageContentProvider" ); ucb = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java index 0d6736158a72..e4d4ef97341a 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java @@ -75,7 +75,7 @@ public class ContentProvider extends TestCase { public TestEnvironment createTestEnvironment (TestParameters Param, PrintWriter log ) { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XContentIdentifierFactory cntIDFac = null ; try { diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java index 6d677ca8518f..7d1bfaa2406c 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java @@ -39,7 +39,7 @@ public class ProviderAcceptor extends TestCase { Object oInterface = null; try { - oInterface = ((XMultiServiceFactory)Param.getMSF()).createInstance + oInterface = Param.getMSF().createInstance ("com.sun.star.ucb.RemoteContentProviderAcceptor"); } catch( com.sun.star.uno.Exception e ) { log.println("Can't create an object." ); diff --git a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java index c8aa65ab3479..4305317ad5df 100644 --- a/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java +++ b/qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java @@ -37,7 +37,7 @@ public class ProxyProvider extends TestCase { ( TestParameters Param, PrintWriter log ) { XInterface oObj = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XContentIdentifierFactory cntIDFac = null ; try { diff --git a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java index 8d84973cd058..e3eedf3ff6ed 100644 --- a/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java +++ b/qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java @@ -53,7 +53,7 @@ public class UUIInteractionHandler extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); oInterface = xMSF.createInstance ( "com.sun.star.uui.InteractionHandler" ); } diff --git a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java index 29c7c393ee64..715520cee7fb 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java @@ -34,7 +34,7 @@ public class UnoUrlResolver extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java index 75f5ae5df9fc..1d56dddf4c2f 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java @@ -32,7 +32,7 @@ public class UnoUrlResolver extends TestCase { protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); try { XInterface xInt = (XInterface)xMSF.createInstance( diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index cb091dccaabb..c04e7dc39fbd 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -69,7 +69,7 @@ public class XMLContentExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -115,7 +115,7 @@ public class XMLContentExporter extends TestCase { */ protected synchronized TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String exportStr = "XMLContentExporter" ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 67ff818d385f..4365ed9525df 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -67,7 +67,7 @@ public class XMLContentImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -123,7 +123,7 @@ public class XMLContentImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; final XPropertySet xTitleProp ; try { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index cc9d5dbb7a60..c24c9a5edb3f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -69,7 +69,7 @@ public class XMLExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -116,7 +116,7 @@ public class XMLExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String exportStr = "XMLExporter test." ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index 20781cc72868..f18cd3bad74a 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -67,7 +67,7 @@ public class XMLImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -123,7 +123,7 @@ public class XMLImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; final XPropertySet xTitleProp ; try { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index c9ad9930c328..4a61f37d3415 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -68,7 +68,7 @@ public class XMLStylesExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -112,7 +112,7 @@ public class XMLStylesExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index 9bd6d3b3ab40..99e6907e3296 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -65,7 +65,7 @@ public class XMLStylesImporter extends TestCase { */ protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a chartdocument" ); @@ -117,7 +117,7 @@ public class XMLStylesImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java index 095ae6c71a5b..8e1cddef4767 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java @@ -70,7 +70,7 @@ public class XMLContentExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -114,7 +114,7 @@ public class XMLContentExporter extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java index cf36ffefaeab..06ba7832d3db 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java @@ -68,7 +68,7 @@ public class XMLContentImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -117,7 +117,7 @@ public class XMLContentImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java index 1bc95d63bbea..733fbf2b5e72 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java @@ -72,7 +72,7 @@ public class XMLExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -116,7 +116,7 @@ public class XMLExporter extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java index 4d9cc9041b45..c777933c9ff9 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java @@ -68,7 +68,7 @@ public class XMLImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -117,7 +117,7 @@ public class XMLImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance("com.sun.star.comp.Draw.XMLImporter") ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java index e398cc94f4b2..0f2b9206a620 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java @@ -70,7 +70,7 @@ public class XMLMetaExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -114,7 +114,7 @@ public class XMLMetaExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String TITLE = "XMLMetaExporter"; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java index 757d48f1ead4..62780d13661a 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java @@ -67,7 +67,7 @@ public class XMLMetaImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -116,7 +116,7 @@ public class XMLMetaImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance("com.sun.star.comp.Draw.XMLMetaImporter") ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java index 1b2334e1b54d..5792ce07234b 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java @@ -71,7 +71,7 @@ public class XMLSettingsExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -115,7 +115,7 @@ public class XMLSettingsExporter extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log) ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java index e94f21276f46..1940b61622d1 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java @@ -68,7 +68,7 @@ public class XMLSettingsImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -118,7 +118,7 @@ public class XMLSettingsImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java index 9c63e7d73aa9..10cf2af86323 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java @@ -73,7 +73,7 @@ public class XMLStylesExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -117,8 +117,8 @@ public class XMLStylesExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment( TestParameters tParam, PrintWriter log) throws StatusException { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log) ; Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java index b4373c030763..04f7eae5c6c2 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java @@ -68,7 +68,7 @@ public class XMLStylesImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating a drawdocument" ); @@ -118,7 +118,7 @@ public class XMLStylesImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java index b14baa62116c..b19b30f2089c 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java @@ -71,7 +71,7 @@ public class XMLContentExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -115,7 +115,7 @@ public class XMLContentExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; final String expPageName = "XMLContentExporter" ; diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java index be23e1fbcc54..8f9400c03d7e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java @@ -68,7 +68,7 @@ public class XMLContentImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -118,7 +118,7 @@ public class XMLContentImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java index 3b5e4d17ed1e..53aebf752dfc 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java @@ -72,7 +72,7 @@ public class XMLExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -116,7 +116,7 @@ public class XMLExporter extends TestCase { protected synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker Filter = new FilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java index 7bb2003ecf83..bebf287a2c94 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java @@ -68,7 +68,7 @@ public class XMLImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -117,7 +117,7 @@ public class XMLImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java index 0b01d370cd6c..2bb7dbfd0fd7 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java @@ -70,7 +70,7 @@ public class XMLMetaExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -114,7 +114,7 @@ public class XMLMetaExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java index ccbbb4c27ec6..0e31de46438a 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java @@ -67,7 +67,7 @@ public class XMLMetaImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -117,7 +117,7 @@ public class XMLMetaImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java index ae0537ac7ecd..ffdebd848a1e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java @@ -69,7 +69,7 @@ public class XMLSettingsExporter extends TestCase { * New text document created. */ protected void initialize( TestParameters tParam, PrintWriter log ) { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -112,7 +112,7 @@ public class XMLSettingsExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log ) throws StatusException { - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java index ddb3fd2b81ab..96cdd54b309e 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java @@ -69,7 +69,7 @@ public class XMLSettingsImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -118,7 +118,7 @@ public class XMLSettingsImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java index b2ed830c0740..52c0db40a40d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java @@ -73,7 +73,7 @@ public class XMLStylesExporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -117,8 +117,8 @@ public class XMLStylesExporter extends TestCase { public synchronized TestEnvironment createTestEnvironment (TestParameters tParam, PrintWriter log) throws StatusException { - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); + XMultiServiceFactory xMSF = tParam.getMSF() ; XInterface oObj = null; FilterChecker filter = new FilterChecker(log); Any arg = new Any(new Type(XDocumentHandler.class),filter); diff --git a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java index 81440099f19c..e3d36c6fd858 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java @@ -68,7 +68,7 @@ public class XMLStylesImporter extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) { // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF()); try { log.println( "creating an impress document" ); @@ -118,7 +118,7 @@ public class XMLStylesImporter extends TestCase { // first we write what we are intend to do to log file log.println( "creating a test environment" ); - XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF() ; + XMultiServiceFactory xMSF = tParam.getMSF() ; try { oInt = xMSF.createInstance diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java index 765936a72584..077e570956cd 100644 --- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java +++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java @@ -186,7 +186,7 @@ public class _XScriptInfoAccess extends MultiMethodTest { log.println(testdata.get("description")); Object obj = ScriptingUtils.getDefault().getScriptStorage( - (XMultiServiceFactory) tParam.getMSF(), location); + tParam.getMSF(), location); XScriptInfoAccess access = UnoRuntime.queryInterface(XScriptInfoAccess.class, obj); diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java index 38863de54397..59f263e13bd0 100644 --- a/scripting/workben/ifc/scripting/_XScriptInvocation.java +++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java @@ -181,7 +181,7 @@ public class _XScriptInvocation extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object fa = tParam.getMSF().createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa); @@ -194,7 +194,7 @@ public class _XScriptInvocation extends MultiMethodTest { private XModel loadDocument(String name) { XModel model = null; - SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF()); String fullname = util.utils.getFullTestURL(name); diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java index fcee4802c5d4..030b37d91aa1 100644 --- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java +++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java @@ -161,7 +161,7 @@ public class _XScriptNameResolver extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object fa = tParam.getMSF().createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa); diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java index de4ca0b693cf..9fb261aa879e 100644 --- a/scripting/workben/ifc/scripting/_XScriptSecurity.java +++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java @@ -145,7 +145,7 @@ public class _XScriptSecurity extends MultiMethodTest { { checkBox = true; } - new SecurityDialogUtil( (XMultiServiceFactory) tParam.getMSF(), buttonName, checkBox ).start(); + new SecurityDialogUtil( tParam.getMSF(), buttonName, checkBox ).start(); } // need to set up dialog utils thread first int storageId = getStorageId(location); @@ -200,7 +200,7 @@ public class _XScriptSecurity extends MultiMethodTest { { String result = ""; try { - Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object oProv = tParam.getMSF().createInstance( "com.sun.star.configuration.ConfigurationProvider" ); XMultiServiceFactory xProv = UnoRuntime.queryInterface(XMultiServiceFactory.class, oProv); @@ -241,7 +241,7 @@ public class _XScriptSecurity extends MultiMethodTest { { boolean success=false; try { - Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object oProv = tParam.getMSF().createInstance( "com.sun.star.configuration.ConfigurationProvider" ); XMultiServiceFactory xProv = UnoRuntime.queryInterface(XMultiServiceFactory.class, oProv); @@ -351,7 +351,7 @@ public class _XScriptSecurity extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = ((XMultiServiceFactory)tParam.getMSF()).createInstance( + Object fa = tParam.getMSF().createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa); @@ -364,7 +364,7 @@ public class _XScriptSecurity extends MultiMethodTest { private XModel loadDocument(String name) { XModel model = null; - SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) tParam.getMSF()); + SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF()); String fullname = util.utils.getFullTestURL(name); diff --git a/scripting/workben/ifc/scripting/_XScriptStorageManager.java b/scripting/workben/ifc/scripting/_XScriptStorageManager.java index ea2b483010bd..cac901fd5c09 100644 --- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java +++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java @@ -241,7 +241,7 @@ public class _XScriptStorageManager extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( + Object fa = tParam.getMSF().createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = UnoRuntime.queryInterface(XSimpleFileAccess.class, fa); diff --git a/scripting/workben/mod/_scripting/Dispatch.java b/scripting/workben/mod/_scripting/Dispatch.java index f23a64fccdba..0da82a410b28 100644 --- a/scripting/workben/mod/_scripting/Dispatch.java +++ b/scripting/workben/mod/_scripting/Dispatch.java @@ -53,7 +53,7 @@ public class Dispatch extends TestCase { URL dispatchURL = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); String docPath = util.utils.getFullTestURL( "ExampleSpreadSheetLatest.sxc" ); @@ -64,7 +64,7 @@ public class Dispatch extends TestCase { oObj = ( XInterface )xMSF.createInstanceWithArguments( "com.sun.star.comp.ScriptProtocolHandler", new Object[] { frame } ); XURLTransformer xParser=UnoRuntime.queryInterface(XURLTransformer.class, - ((XMultiServiceFactory)tParam.getMSF()).createInstance + tParam.getMSF().createInstance ("com.sun.star.util.URLTransformer")); // Because it's an in/out parameter we must use an array of // URL objects. diff --git a/scripting/workben/mod/_scripting/Function.java b/scripting/workben/mod/_scripting/Function.java index ef697a916825..5b1d857c6fe0 100644 --- a/scripting/workben/mod/_scripting/Function.java +++ b/scripting/workben/mod/_scripting/Function.java @@ -48,7 +48,7 @@ public class Function extends TestCase { log.println("creating test environment"); try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); SOfficeFactory SOF = null; SOF = SOfficeFactory.getFactory( xMSF ); String docPath = util.utils.getFullTestURL(doc); diff --git a/scripting/workben/mod/_scripting/FunctionProvider.java b/scripting/workben/mod/_scripting/FunctionProvider.java index 4c5cd0bcfff5..a5ae0ef3c6a5 100644 --- a/scripting/workben/mod/_scripting/FunctionProvider.java +++ b/scripting/workben/mod/_scripting/FunctionProvider.java @@ -42,7 +42,7 @@ public class FunctionProvider extends TestCase { log.println("creating test environment"); try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object xInterface = xMSF.createInstance( "com.sun.star.frame.Desktop" ); XDesktop dtop = UnoRuntime.queryInterface( XDesktop.class, diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java index f822fd5cb329..344e990ae65f 100644 --- a/scripting/workben/mod/_scripting/ScriptInfo.java +++ b/scripting/workben/mod/_scripting/ScriptInfo.java @@ -69,7 +69,7 @@ public class ScriptInfo extends TestCase { XInterface oObj = null; XSimpleFileAccess access = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object xInterface = xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" ); access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface ); diff --git a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java index 48946738b614..f288e7bcfeb9 100644 --- a/scripting/workben/mod/_scripting/ScriptRuntimeManager.java +++ b/scripting/workben/mod/_scripting/ScriptRuntimeManager.java @@ -39,7 +39,7 @@ public class ScriptRuntimeManager extends TestCase { XInterface oObj = null; try { - oObj = (XInterface) ((XMultiServiceFactory)Param.getMSF()).createInstance + oObj = (XInterface) Param.getMSF().createInstance ("drafts.com.sun.star.script.framework.runtime.ScriptRuntimeManager"); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java index 3cdff81f4562..3666a187992a 100644 --- a/scripting/workben/mod/_scripting/ScriptStorage.java +++ b/scripting/workben/mod/_scripting/ScriptStorage.java @@ -66,7 +66,7 @@ public class ScriptStorage extends TestCase { XInterface oObj = null; XSimpleFileAccess access = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) tParam.getMSF(); + XMultiServiceFactory xMSF = tParam.getMSF(); Object xInterface = xMSF.createInstance( "com.sun.star.ucb.SimpleFileAccess" ); access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface ); diff --git a/scripting/workben/mod/_scripting/ScriptStorageManager.java b/scripting/workben/mod/_scripting/ScriptStorageManager.java index aa7843a758e0..596fe4133b52 100644 --- a/scripting/workben/mod/_scripting/ScriptStorageManager.java +++ b/scripting/workben/mod/_scripting/ScriptStorageManager.java @@ -41,7 +41,7 @@ public class ScriptStorageManager extends TestCase { Object oInterface = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); XPropertySet xProp = UnoRuntime.queryInterface( XPropertySet.class, xMSF); // get context diff --git a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java index 2ac0497d952c..b353fbd1225e 100644 --- a/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java +++ b/ucb/test/com/sun/star/comp/ucb/GlobalTransfer_Test.java @@ -61,7 +61,7 @@ public final class GlobalTransfer_Test extends ComplexTestCase { public void testNameClashASK() throws Exception { Object oObj = null; try { - XMultiServiceFactory xMSF = (XMultiServiceFactory)param.getMSF(); + XMultiServiceFactory xMSF = param.getMSF(); oObj = xMSF.createInstance( "com.sun.star.ucb.UniversalContentBroker" ); // unconfigured instance |