summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-07-23 13:54:33 +0000
committerRüdiger Timm <rt@openoffice.org>2004-07-23 13:54:33 +0000
commit7c0d68c8535af2a55995f2016dbb7b0eab1f5f6d (patch)
tree21d54991141a0739d2f7b6d6ee3dbd45b865872f
parenta373124b5a751ce1fcefe4ce646ab32111643702 (diff)
INTEGRATION: CWS sb20 (1.2.34); FILE MERGED
2004/07/09 12:43:45 sb 1.2.34.1: #i29741# Retrofitted existing services as single-interface--based ones.
-rw-r--r--scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
index c8697604ff6a..e35d7be99c0a 100644
--- a/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
+++ b/scripting/java/org/openoffice/idesupport/localoffice/LocalOfficeImpl.java
@@ -2,9 +2,9 @@
*
* $RCSfile: LocalOfficeImpl.java,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: toconnor $ $Date: 2002-11-13 17:44:10 $
+ * last change: $Author: rt $ $Date: 2004-07-23 14:54:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -66,6 +66,7 @@ import java.net.ConnectException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.lang.XComponent;
+import com.sun.star.bridge.UnoUrlResolver;
import com.sun.star.bridge.XUnoUrlResolver;
import com.sun.star.beans.XPropertySet;
import com.sun.star.comp.helper.Bootstrap;
@@ -170,12 +171,7 @@ System.out.println("*** LocalOfficeImpl.refreshStorage: DONE");
{
Object object;
mComponentContext = Bootstrap.createInitialComponentContext(null);
- mComponentFactory = mComponentContext.getServiceManager();
- object = mComponentFactory.createInstanceWithContext(
- "com.sun.star.bridge.UnoUrlResolver", mComponentContext);
- XUnoUrlResolver urlresolver;
- urlresolver = (XUnoUrlResolver)UnoRuntime.queryInterface(
- XUnoUrlResolver.class, object);
+ XUnoUrlResolver urlresolver = UnoUrlResolver.create(mComponentContext);
object = urlresolver.resolve(
"uno:socket,host=localhost,port=" +
port +