diff options
author | Michael Hönnig <mi@openoffice.org> | 2004-10-18 06:17:33 +0000 |
---|---|---|
committer | Michael Hönnig <mi@openoffice.org> | 2004-10-18 06:17:33 +0000 |
commit | 0f1804d788cef94b54092fa904af0d947f3da284 (patch) | |
tree | fad84973b80d156d1238cbf7041716ca2a52b5c3 /bean/com/sun/star/comp/beans/LocalOfficeConnection.java | |
parent | 821f00019c6dcf54e801bedc38ff65899c844b1f (diff) |
SO7 compatibility
Diffstat (limited to 'bean/com/sun/star/comp/beans/LocalOfficeConnection.java')
-rw-r--r-- | bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 926caf34069f..e7d2934847ae 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -2,9 +2,9 @@ * * $RCSfile: LocalOfficeConnection.java,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ + * last change: $Author: mi $ $Date: 2004-10-18 07:15:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,6 @@ public class LocalOfficeConnection // load libofficebean.so/officebean.dll String aSharedLibName = getProgramPath() + java.io.File.separator + System.mapLibraryName(OFFICE_LIB_NAME); -dbgPrint( "System.load( libofficebean.so )" ); System.load( aSharedLibName ); } @@ -280,16 +279,13 @@ dbgPrint( "System.load( libofficebean.so )" ); try { // create default local component context -dbgPrint( "create initial component context" ); XComponentContext xLocalContext = com.sun.star.comp.helper.Bootstrap.createInitialComponentContext(null); // initial serviceManager -dbgPrint( "get local service manager" ); XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager(); // create a urlresolver -dbgPrint( "get local service manager" ); Object urlResolver = xLocalServiceManager.createInstanceWithContext( "com.sun.star.bridge.UnoUrlResolver", xLocalContext ); @@ -301,9 +297,7 @@ dbgPrint( "get local service manager" ); Object aInitialObject = null; try { -dbgPrint( "xUrlResolver.resolve( " + mURL + " )" ); aInitialObject = xUrlResolver.resolve( mURL ); -dbgPrint( "xUrlResolver.resolve() - done" ); } catch( com.sun.star.connection.NoConnectException e ) { @@ -664,7 +658,6 @@ dbgPrint( "xUrlResolver.resolve() - done" ); throw new java.io.IOException( "not connection specified" ); // start process -dbgPrint( "exec" + cmdArray[0] + " " + cmdArray[1] + " " + cmdArray[2] + " " + cmdArray[3] ); mProcess = Runtime.getRuntime().exec(cmdArray); if ( mProcess == null ) throw new RuntimeException( "cannot start soffice: " + cmdArray ); |