diff options
3 files changed, 22 insertions, 19 deletions
diff --git a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java index 07a9fb8f69bc..ab00619afb78 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java @@ -2,9 +2,9 @@ * * $RCSfile: _XDispatchRecorder.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change:$Date: 2003-01-27 18:10:22 $ + * last change:$Date: 2003-05-27 12:25:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ import com.sun.star.frame.XDispatch; import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XDispatchRecorder; import com.sun.star.frame.XFrame; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.URL; import lib.MultiMethodTest; @@ -110,7 +111,7 @@ public class _XDispatchRecorder extends MultiMethodTest { public void _endRecording() { requiredMethod("startRecording()"); - dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; @@ -145,7 +146,7 @@ public class _XDispatchRecorder extends MultiMethodTest { public void _recordDispatch() { executeMethod("endRecording()"); - dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); PropertyValue prop = new PropertyValue(); prop.Name = "Text"; @@ -172,7 +173,7 @@ public class _XDispatchRecorder extends MultiMethodTest { public void _recordDispatchAsComment() { executeMethod("endRecording()"); - dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); + dispURL = utils.parseURL((XMultiServiceFactory)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 100bdd1d6dd5..0e2cbf136fb7 100644 --- a/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java +++ b/qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java @@ -2,9 +2,9 @@ * * $RCSfile: _XDispatchRecorderSupplier.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change:$Date: 2003-01-27 18:10:21 $ + * last change:$Date: 2003-05-27 12:26:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,7 @@ package ifc.frame; import com.sun.star.beans.PropertyValue; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.frame.XDesktop; import com.sun.star.frame.XDispatch; import com.sun.star.frame.XDispatchProvider; @@ -116,14 +117,14 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { * service created for obtaining document's frame. */ protected void before() { - SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()); try { log.println( "creating a text document" ); xTextDoc = SOF.createTextDoc(null); - Object inst = (XInterface)tParam.getMSF().createInstance - ("com.sun.star.frame.Desktop"); + Object inst = (XInterface)((XMultiServiceFactory)tParam.getMSF()) + .createInstance("com.sun.star.frame.Desktop"); desktop = (XDesktop) UnoRuntime.queryInterface (XDesktop.class, inst); } catch ( com.sun.star.uno.Exception e ) { @@ -205,7 +206,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { boolean res = true; if (recorder == null) { try { - Object inst = tParam.getMSF().createInstance + Object inst = ((XMultiServiceFactory)tParam.getMSF()).createInstance ("com.sun.star.comp.framework.DispatchRecorder"); recorder = (XDispatchRecorder) UnoRuntime.queryInterface (XDispatchRecorder.class, inst); @@ -223,7 +224,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, fr); - URL dispURL = utils.parseURL(tParam.getMSF(), ".uno:InsertText"); + URL dispURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:InsertText"); XDispatch xDisp = xDispProv.queryDispatch(dispURL,"",0); PropertyValue[] args = new PropertyValue[1]; @@ -244,7 +245,7 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { log.println("Recorder macro :\n" + macro); log.print("Trying to dispatch with invalid URL ..."); - URL badURL = utils.parseURL(tParam.getMSF(), ".uno:AbraCadabra"); + URL badURL = utils.parseURL((XMultiServiceFactory)tParam.getMSF(), ".uno:AbraCadabra"); oObj.dispatchAndRecord(badURL, args, xDisp); macro = recorder.getRecordedMacro(); locRes &= macro != null && macro.indexOf(".uno:AbraCadabra")==-1; @@ -281,4 +282,4 @@ public class _XDispatchRecorderSupplier extends MultiMethodTest { protected void after() { xTextDoc.dispose(); } -}
\ No newline at end of file +} diff --git a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java index e0f03bd19053..6ce2f10a5652 100644 --- a/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XFrameLoader.java @@ -2,9 +2,9 @@ * * $RCSfile: _XFrameLoader.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change:$Date: 2003-01-27 18:10:19 $ + * last change:$Date: 2003-05-27 12:26:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,7 @@ package ifc.frame; import com.sun.star.beans.PropertyValue; +import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.frame.XDesktop; import com.sun.star.frame.XFrame; import com.sun.star.frame.XFrameLoader; @@ -135,14 +136,14 @@ public class _XFrameLoader extends MultiMethodTest { frame = (XFrame) tEnv.getObjRelation("FrameLoader.Frame") ; if (frame == null) { - SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); try { log.println( "creating a textdocument" ); frameSup = SOF.createTextDoc( null ); - Object oDsk = tParam.getMSF().createInstance - ("com.sun.star.frame.Desktop") ; + Object oDsk = ((XMultiServiceFactory)tParam.getMSF()) + .createInstance("com.sun.star.frame.Desktop") ; XDesktop dsk = (XDesktop) UnoRuntime.queryInterface(XDesktop.class, oDsk) ; |