From bc6a9e9b47d90f550452c5c4a9cd093b1b60bbe6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 3 Sep 2012 10:40:41 +0200 Subject: Java cleanup, fix compile errors Change-Id: I2620ccf17a24572b4bd6a79f2410c4b746164b9a --- scripting/workben/ifc/scripting/SecurityDialogUtil.java | 4 ++-- scripting/workben/ifc/scripting/_XScriptInfoAccess.java | 2 +- scripting/workben/ifc/scripting/_XScriptInvocation.java | 4 ++-- scripting/workben/ifc/scripting/_XScriptNameResolver.java | 2 +- scripting/workben/ifc/scripting/_XScriptSecurity.java | 10 +++++----- scripting/workben/ifc/scripting/_XScriptStorageManager.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'scripting') diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java index 90bb94a9ef87..2c8ee117e720 100644 --- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java +++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java @@ -22,8 +22,8 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; -import drafts.com.sun.star.accessibility.*; -import drafts.com.sun.star.awt.XExtendedToolkit; +import com.sun.star.accessibility.*; +import com.sun.star.awt.XExtendedToolkit; // Jsuite classes import util.AccessibilityTools; diff --git a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java index 31cc4113641c..cd7c3c083513 100644 --- a/scripting/workben/ifc/scripting/_XScriptInfoAccess.java +++ b/scripting/workben/ifc/scripting/_XScriptInfoAccess.java @@ -192,7 +192,7 @@ public class _XScriptInfoAccess extends MultiMethodTest { log.println(testdata.get("description")); Object obj = ScriptingUtils.getDefault().getScriptStorage( - tParam.getMSF(), location); + (XMultiServiceFactory) tParam.getMSF(), location); XScriptInfoAccess access = (XScriptInfoAccess) UnoRuntime.queryInterface(XScriptInfoAccess.class, obj); diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java index 09bde39c43ae..ec13d4d139db 100644 --- a/scripting/workben/ifc/scripting/_XScriptInvocation.java +++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java @@ -183,7 +183,7 @@ public class _XScriptInvocation extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = tParam.getMSF().createInstance( + Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = (XSimpleFileAccess) @@ -197,7 +197,7 @@ public class _XScriptInvocation extends MultiMethodTest { private XModel loadDocument(String name) { XModel model = null; - SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF()); + SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) 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 a67148c3538b..0a77a3f74608 100644 --- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java +++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java @@ -163,7 +163,7 @@ public class _XScriptNameResolver extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = tParam.getMSF().createInstance( + Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = (XSimpleFileAccess) diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java index 2ee623392d9e..d2b6b21b57fc 100644 --- a/scripting/workben/ifc/scripting/_XScriptSecurity.java +++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java @@ -148,7 +148,7 @@ public class _XScriptSecurity extends MultiMethodTest { { checkBox = true; } - new SecurityDialogUtil( tParam.getMSF(), buttonName, checkBox ).start(); + new SecurityDialogUtil( (XMultiServiceFactory) tParam.getMSF(), buttonName, checkBox ).start(); } // need to set up dialog utils thread first int storageId = getStorageId(location); @@ -203,7 +203,7 @@ public class _XScriptSecurity extends MultiMethodTest { { String result = ""; try { - Object oProv = tParam.getMSF().createInstance( + Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.configuration.ConfigurationProvider" ); XMultiServiceFactory xProv = (XMultiServiceFactory) @@ -245,7 +245,7 @@ public class _XScriptSecurity extends MultiMethodTest { { boolean success=false; try { - Object oProv = tParam.getMSF().createInstance( + Object oProv = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.configuration.ConfigurationProvider" ); XMultiServiceFactory xProv = (XMultiServiceFactory) @@ -358,7 +358,7 @@ public class _XScriptSecurity extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = tParam.getMSF().createInstance( + Object fa = ((XMultiServiceFactory)tParam.getMSF()).createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = (XSimpleFileAccess) @@ -372,7 +372,7 @@ public class _XScriptSecurity extends MultiMethodTest { private XModel loadDocument(String name) { XModel model = null; - SOfficeFactory factory = SOfficeFactory.getFactory(tParam.getMSF()); + SOfficeFactory factory = SOfficeFactory.getFactory((XMultiServiceFactory) 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 6ec3b5cb2851..1703ea7d7007 100644 --- a/scripting/workben/ifc/scripting/_XScriptStorageManager.java +++ b/scripting/workben/ifc/scripting/_XScriptStorageManager.java @@ -244,7 +244,7 @@ public class _XScriptStorageManager extends MultiMethodTest { XSimpleFileAccess access = null; try { - Object fa = tParam.getMSF().createInstance( + Object fa = ((XMultiServiceFactory) tParam.getMSF()).createInstance( "com.sun.star.ucb.SimpleFileAccess"); access = (XSimpleFileAccess) -- cgit