diff options
20 files changed, 195 insertions, 91 deletions
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/com/sun/star/comp/beans/ContainerFactory.java index 70a948b25c3d..39acdf7dd27b 100644 --- a/bean/com/sun/star/comp/beans/ContainerFactory.java +++ b/bean/com/sun/star/comp/beans/ContainerFactory.java @@ -2,9 +2,9 @@ * * $RCSfile: ContainerFactory.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:30 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,7 @@ import java.awt.Container; * This interface reprecents an AWT container factory. * * @see OfficeBean + * @since OOo 2.0.0 */ public interface ContainerFactory diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/com/sun/star/comp/beans/Controller.java index 2978251b45a6..9c37f88ba6e0 100644 --- a/bean/com/sun/star/comp/beans/Controller.java +++ b/bean/com/sun/star/comp/beans/Controller.java @@ -2,9 +2,9 @@ * * $RCSfile: Controller.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:31 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,11 @@ package com.sun.star.comp.beans; import com.sun.star.uno.UnoRuntime; -class Controller +/** Wrapper class for a com.sun.star.frame.XController. + * + * @since OOo 2.0.0 + */ +public class Controller extends Wrapper implements com.sun.star.frame.XController diff --git a/bean/com/sun/star/comp/beans/Frame.java b/bean/com/sun/star/comp/beans/Frame.java index 4056cfd0ced4..72e8f6595f76 100644 --- a/bean/com/sun/star/comp/beans/Frame.java +++ b/bean/com/sun/star/comp/beans/Frame.java @@ -2,9 +2,9 @@ * * $RCSfile: Frame.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:31 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,11 @@ package com.sun.star.comp.beans; import com.sun.star.uno.UnoRuntime; -class Frame +/** Wrapper class for a com.sun.star.frame.XFrame. + * + * @since OOo 2.0.0 + */ +public class Frame extends Wrapper implements com.sun.star.frame.XFrame, diff --git a/bean/com/sun/star/comp/beans/HasConnectionException.java b/bean/com/sun/star/comp/beans/HasConnectionException.java index 589fb10610de..285cfabbd200 100644 --- a/bean/com/sun/star/comp/beans/HasConnectionException.java +++ b/bean/com/sun/star/comp/beans/HasConnectionException.java @@ -2,9 +2,9 @@ * * $RCSfile: HasConnectionException.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:31 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,8 @@ package com.sun.star.comp.beans; /** This expception is thrown when a method is called which is only defined for not already having an established connection. + + @since OOo 2.0.0 */ public class HasConnectionException extends Exception { diff --git a/bean/com/sun/star/comp/beans/InvalidArgumentException.java b/bean/com/sun/star/comp/beans/InvalidArgumentException.java index c6d3a7d4dfd7..46ad626c7ca5 100644 --- a/bean/com/sun/star/comp/beans/InvalidArgumentException.java +++ b/bean/com/sun/star/comp/beans/InvalidArgumentException.java @@ -2,9 +2,9 @@ * * $RCSfile: InvalidArgumentException.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:32 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,10 @@ package com.sun.star.comp.beans; +/** indicates an invalid argument in a function call. + * + * @since OOo 2.0.0 + */ public class InvalidArgumentException extends Exception { }; diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java index 8ae139c7ab4c..175a5629d7e8 100644 --- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java +++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java @@ -2,9 +2,9 @@ * * $RCSfile: JavaWindowPeerFake.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:32 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,8 @@ import com.sun.star.beans.*; import com.sun.star.container.*; /** <p>Class to pass the system window handle to the OpenOffice.org toolkit.</p> + * + * @since OOo 2.0.0 */ /* package */ class JavaWindowPeerFake implements XSystemDependentWindowPeer, XWindowPeer diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 3054ad3da756..926caf34069f 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mi $ $Date: 2004-09-14 15:07:23 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,8 @@ import com.sun.star.lib.util.NativeLibraryLoader; /** * This class reprecents a connection to the local office application. + * + * @since OOo 2.0.0 */ public class LocalOfficeConnection implements OfficeConnection @@ -595,14 +597,32 @@ dbgPrint( "xUrlResolver.resolve() - done" ); mPipe = pipe; } + /* replaces each substring aSearch in aString by aReplace. + + StringBuffer.replaceAll() is not avaialable in Java 1.3.x. + */ + private static String replaceAll(String aString, String aSearch, String aReplace ) + { + StringBuffer aBuffer = new StringBuffer(aString); + + int nPos = aString.length(); + int nOfs = aSearch.length(); + + while ( ( nPos = aString.lastIndexOf( aSearch, nPos - 1 ) ) > -1 ) + aBuffer.replace( nPos, nPos+nOfs, aReplace ); + + return aBuffer.toString(); + } + + /** creates a unique pipe name. */ static String getPipeName() { // turn user name into a URL and file system safe name (% chars will not work) String aPipeName = System.getProperty("user.name") + OFFICE_ID_SUFFIX; - aPipeName = aPipeName.replaceAll( "_", "%B7" ); - return java.net.URLEncoder.encode(aPipeName).replaceAll( "\\+", "%20" ).replaceAll( "%", "_" ); + aPipeName = replaceAll( aPipeName, "_", "%B7" ); + return replaceAll( replaceAll( java.net.URLEncoder.encode(aPipeName), "\\+", "%20" ), "%", "_" ); } /** diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index 29ea22613c7f..6d9b9d2054d8 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -2,9 +2,9 @@ * * $RCSfile: LocalOfficeWindow.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:33 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,8 @@ import com.sun.star.uno.Exception; /** * This class represents a local office window. + * + * @since OOo 2.0.0 */ public class LocalOfficeWindow extends java.awt.Canvas @@ -100,7 +102,7 @@ public class LocalOfficeWindow * @param connection The office connection object the window * belongs to. */ - /* package */ LocalOfficeWindow(OfficeConnection connection) + protected LocalOfficeWindow(OfficeConnection connection) { mConnection = connection; mConnection.addEventListener((XEventListener)this); diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java b/bean/com/sun/star/comp/beans/NativeConnection.java index 9d2f431c64e6..fc4a77b5edb3 100644 --- a/bean/com/sun/star/comp/beans/NativeConnection.java +++ b/bean/com/sun/star/comp/beans/NativeConnection.java @@ -2,9 +2,9 @@ * * $RCSfile: NativeConnection.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:33 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,10 @@ package com.sun.star.comp.beans; import com.sun.star.connection.XConnection; +/* Connection to a locally running OOo instance. + * + * @since OOo 2.0.0 + */ /* package */ class NativeConnection implements XConnection { diff --git a/bean/com/sun/star/comp/beans/NativeService.java b/bean/com/sun/star/comp/beans/NativeService.java index 04a70aa6ab1f..eb6a774ae0fb 100644 --- a/bean/com/sun/star/comp/beans/NativeService.java +++ b/bean/com/sun/star/comp/beans/NativeService.java @@ -2,9 +2,9 @@ * * $RCSfile: NativeService.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:33 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,9 @@ package com.sun.star.comp.beans; - +/* + * @since OOo 2.0.0 + */ /* package */ interface NativeService { public String getIdentifier(); public void startupService() throws java.io.IOException; diff --git a/bean/com/sun/star/comp/beans/NoConnectionException.java b/bean/com/sun/star/comp/beans/NoConnectionException.java index db5c454967f3..8b9f5ada8f42 100644 --- a/bean/com/sun/star/comp/beans/NoConnectionException.java +++ b/bean/com/sun/star/comp/beans/NoConnectionException.java @@ -2,9 +2,9 @@ * * $RCSfile: NoConnectionException.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:33 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,8 @@ package com.sun.star.comp.beans; /** This exception is called when a method is called which needs an established connection but no connection is established yet or anymore. + + @since OOo 2.0.0 */ public class NoConnectionException extends Exception { diff --git a/bean/com/sun/star/comp/beans/NoDocumentException.java b/bean/com/sun/star/comp/beans/NoDocumentException.java index 964cc9d3abbb..1177c220accf 100644 --- a/bean/com/sun/star/comp/beans/NoDocumentException.java +++ b/bean/com/sun/star/comp/beans/NoDocumentException.java @@ -2,9 +2,9 @@ * * $RCSfile: NoDocumentException.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:34 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,10 @@ package com.sun.star.comp.beans; +/** indicates that an operation needed a document, but no document was loaded. + + @since OOo 2.0.0 + */ public class NoDocumentException extends Exception { }; diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 11e79cc3af2c..5dd247c4c7be 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -2,9 +2,9 @@ * * $RCSfile: OOoBean.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mi $ $Date: 2004-09-27 14:17:46 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,8 @@ import com.sun.star.uno.UnoRuntime; @requirement FUNC.RES.OTH/0.2 No other resources are needed yet. + + @since OOo 2.0.0 */ public class OOoBean @@ -127,7 +129,7 @@ public class OOoBean // debugging method private void dbgPrint( String aMessage ) { - // System.err.println( aMessage ); + // System.err.println( "OOoBean: " + aMessage ); } //------------------------------------------------------------------------- @@ -219,9 +221,8 @@ public class OOoBean // get notified when connection dies if ( xConnectionListener != null ) - xConnectionListener.stop(); + xConnectionListener.end(); xConnectionListener = this.new EventListener("setOOoConnection"); - dbgPrint( "new EventListener()" ); } //------------------------------------------------------------------------- @@ -265,7 +266,10 @@ public class OOoBean OfficeConnection iExConnection = iConnection; if ( iConnection != null ) { - xConnectionListener = null; + if ( xConnectionListener != null ) + { + xConnectionListener.end(); + } iConnection = null; iExConnection.dispose(); } @@ -380,6 +384,8 @@ public class OOoBean public synchronized void clear() throws java.lang.InterruptedException { + dbgPrint( "clear()" ); + CallWatchThread aCallWatchThread = new CallWatchThread( nOOoCallTimeOut, "clear" ); aDocument = null; @@ -589,7 +595,12 @@ public class OOoBean { if ( aFrame != null && xOldController != null ) xOldController.suspend(true); - aDocument.setModified(false); + if ( aDocument != null ) + try { + // can be disposed if user closed document via UI + aDocument.setModified(false); + } + catch ( com.sun.star.lang.DisposedException aExc ) {} } catch (java.lang.IllegalStateException exp) {} @@ -601,8 +612,9 @@ public class OOoBean "MacroExecutionMode", -1, new Short( com.sun.star.document.MacroExecMode.USE_CONFIG ), com.sun.star.beans.PropertyState.DIRECT_VALUE ) ); + //String fn = aFRame.getName(); com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL( - aURL, aFrame.getName(), com.sun.star.frame.FrameSearchFlag.ALL, aArgs ); + aURL, /*aFrame.getName()*/"_self", com.sun.star.frame.FrameSearchFlag.ALL, aArgs ); // nothing loaded? if ( xComponent == null && aDocument != null ) @@ -672,9 +684,32 @@ public class OOoBean { // wrap Java stream into UNO stream + /* com.sun.star.io.XInputStream xStream = new com.sun.star.lib.uno.adapter.InputStreamToXInputStreamAdapter( iInStream ); + */ + // copy stream.... + + int s = 4096; + int r=0 ,n = 0; + byte[] buffer = new byte[s]; + byte[] newBuffer = null; + while ((r = iInStream.read(buffer, n, buffer.length-n))>0) { + n += r; + if (iInStream.available() > buffer.length - n) { + newBuffer = new byte[buffer.length*2]; + System.arraycopy(buffer, 0, newBuffer, 0, n); + buffer = newBuffer; + } + } + if (buffer.length != n) { + newBuffer = new byte[n]; + System.arraycopy(buffer, 0, newBuffer, 0, n); + buffer = newBuffer; + } + com.sun.star.io.XInputStream xStream = + new com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter(buffer); // add stream to arguments com.sun.star.beans.PropertyValue[] aExtendedArguments = @@ -993,18 +1028,6 @@ public class OOoBean xLayoutManager.showElement( aResourceURL ); else xLayoutManager.hideElement( aResourceURL ); -/* - System.err.println( "ResourceURLs:" ); - for ( int n = 0; n < xLayoutManager.getElements().length; ++n ) - { - com.sun.star.beans.XPropertySet xElementPropSet = - (com.sun.star.beans.XPropertySet) UnoRuntime.queryInterface( - com.sun.star.beans.XPropertySet.class, - xLayoutManager.getElements()[n] ); - System.err.println( xElementPropSet.getPropertyValue("ResourceURL") ); - } - System.err.println( "" ); -*/ } catch ( com.sun.star.beans.UnknownPropertyException aExc ) { @@ -1253,7 +1276,7 @@ public class OOoBean // listen on a dying connection iConnection.addEventListener( this ); - // listen on a dying OOo + // listen on a terminating OOo getOOoDesktop().addTerminateListener( this ); // start this thread as a daemon @@ -1261,6 +1284,24 @@ public class OOoBean start(); } + public void end() + { + // do not listen on a dying connection anymore + try { + iConnection.removeEventListener( this ); + } + catch ( Throwable aExc ) {}; + + // do not listen on a terminating OOo anymore + try { + getOOoDesktop().removeTerminateListener( this ); + } + catch ( Throwable aExc ) {}; + + // stop thread + super.stop(); + } + /// gets called when the connection dies public void disposing( /*IN*/ com.sun.star.lang.EventObject Source ) { diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/com/sun/star/comp/beans/OfficeConnection.java index d9fb6c8c50e2..fb6e346928db 100644 --- a/bean/com/sun/star/comp/beans/OfficeConnection.java +++ b/bean/com/sun/star/comp/beans/OfficeConnection.java @@ -2,9 +2,9 @@ * * $RCSfile: OfficeConnection.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:35 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,6 +70,8 @@ import com.sun.star.uno.XComponentContext; /** * This abstract class reprecents a connection to the office * application. + + @since OOo 2.0.0 */ public interface OfficeConnection extends XComponent diff --git a/bean/com/sun/star/comp/beans/OfficeDocument.java b/bean/com/sun/star/comp/beans/OfficeDocument.java index b93fc5677b1c..29a731ec6021 100644 --- a/bean/com/sun/star/comp/beans/OfficeDocument.java +++ b/bean/com/sun/star/comp/beans/OfficeDocument.java @@ -2,9 +2,9 @@ * * $RCSfile: OfficeDocument.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:35 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,10 @@ import com.sun.star.uno.UnoRuntime; See further information on the wrapping and compatibility limitations in the base class Wrapper. + + @since OOo 2.0.0 */ -class OfficeDocument extends Wrapper +public class OfficeDocument extends Wrapper implements com.sun.star.frame.XModel, com.sun.star.util.XModifiable, diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java b/bean/com/sun/star/comp/beans/OfficeWindow.java index f14f0c82d71c..1446bbea81b7 100644 --- a/bean/com/sun/star/comp/beans/OfficeWindow.java +++ b/bean/com/sun/star/comp/beans/OfficeWindow.java @@ -2,9 +2,9 @@ * * $RCSfile: OfficeWindow.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:35 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,8 @@ import com.sun.star.awt.XWindowPeer; * The concreate implementation of the OfficeWindow extends an * approperate type of visual component (java.awt.Canvas for local * and java.awt.Container for remote). + + @since OOo 2.0.0 */ public interface OfficeWindow { diff --git a/bean/com/sun/star/comp/beans/SystemWindowException.java b/bean/com/sun/star/comp/beans/SystemWindowException.java index 2e1e96a23fbc..e5882e792de9 100644 --- a/bean/com/sun/star/comp/beans/SystemWindowException.java +++ b/bean/com/sun/star/comp/beans/SystemWindowException.java @@ -2,9 +2,9 @@ * * $RCSfile: SystemWindowException.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:36 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,13 @@ package com.sun.star.comp.beans; +/** indicates that an operation needed a system window, + but no system window was aquired yet. + + @see com.sun.star.comp.beans.OOoBean.aquireSystemWindow + + @since OOo 2.0.0 +*/ public class SystemWindowException extends Exception { }; diff --git a/bean/com/sun/star/comp/beans/Wrapper.java b/bean/com/sun/star/comp/beans/Wrapper.java index fe8a2952a297..a7a64266e89f 100644 --- a/bean/com/sun/star/comp/beans/Wrapper.java +++ b/bean/com/sun/star/comp/beans/Wrapper.java @@ -2,9 +2,9 @@ * * $RCSfile: Wrapper.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mi $ $Date: 2004-09-06 15:11:37 $ + * last change: $Author: mi $ $Date: 2004-10-14 10:37:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,8 @@ import com.sun.star.uno.UnoRuntime; This wrapper will only work for UNO objects via a bridge, not for direct Java objects. + + @since OOo 2.0.0 */ class Wrapper implements diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/com/sun/star/comp/beans/makefile.mk index d93ccd4cd708..e3d473b2e72b 100644 --- a/bean/com/sun/star/comp/beans/makefile.mk +++ b/bean/com/sun/star/comp/beans/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: mi $ $Date: 2004-09-23 14:56:58 $ +# last change: $Author: mi $ $Date: 2004-10-14 10:37:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -62,7 +62,7 @@ PRJ = ..$/..$/..$/..$/.. PRJNAME = beans -TARGET = officebean +TARGET = com_sun_star_comp_beans PACKAGE = com$/sun$/star$/comp$/beans # --- Settings ----------------------------------------------------- @@ -76,33 +76,30 @@ dummy: .ELSE # "$(OS)"=="MACOSX" JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar -JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +# --- Sources -------------------------------------------------------- -# --- Files -------------------------------------------------------- +JAVAFILES= \ + ContainerFactory.java \ + Controller.java \ + Frame.java \ + HasConnectionException.java \ + InvalidArgumentException.java \ + JavaWindowPeerFake.java \ + LocalOfficeConnection.java \ + LocalOfficeWindow.java \ + NativeConnection.java \ + NativeService.java \ + NoConnectionException.java \ + NoDocumentException.java \ + OfficeConnection.java \ + OfficeDocument.java \ + OfficeWindow.java \ + OOoBean.java \ + SystemWindowException.java \ + Wrapper.java -JAVACLASSFILES=\ - $(CLASSDIR)$/$(PACKAGE)$/OfficeConnection.class \ - $(CLASSDIR)$/$(PACKAGE)$/OfficeWindow.class \ - $(CLASSDIR)$/$(PACKAGE)$/ContainerFactory.class \ - $(CLASSDIR)$/$(PACKAGE)$/JavaWindowPeerFake.class \ - $(CLASSDIR)$/$(PACKAGE)$/NativeConnection.class \ - $(CLASSDIR)$/$(PACKAGE)$/NativeService.class \ - $(CLASSDIR)$/$(PACKAGE)$/LocalOfficeConnection.class \ - $(CLASSDIR)$/$(PACKAGE)$/LocalOfficeWindow.class \ - $(CLASSDIR)$/$(PACKAGE)$/InvalidArgumentException.class \ - $(CLASSDIR)$/$(PACKAGE)$/HasConnectionException.class \ - $(CLASSDIR)$/$(PACKAGE)$/NoConnectionException.class \ - $(CLASSDIR)$/$(PACKAGE)$/SystemWindowException.class \ - $(CLASSDIR)$/$(PACKAGE)$/NoDocumentException.class \ - $(CLASSDIR)$/$(PACKAGE)$/OfficeDocument.class \ - $(CLASSDIR)$/$(PACKAGE)$/Controller.class \ - $(CLASSDIR)$/$(PACKAGE)$/Frame.class \ - $(CLASSDIR)$/$(PACKAGE)$/Wrapper.class \ - $(CLASSDIR)$/$(PACKAGE)$/OOoBean.class +JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) .ENDIF diff --git a/bean/native/win32/officebean.dxp b/bean/native/win32/officebean.dxp index 7162e5452daa..0616891c20f9 100644 --- a/bean/native/win32/officebean.dxp +++ b/bean/native/win32/officebean.dxp @@ -1,2 +1,2 @@ -Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindowSystemType -Java_com_sun_star_beans_LocalOfficeWindow_getNativeWindow +Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindowSystemType +Java_com_sun_star_comp_beans_LocalOfficeWindow_getNativeWindow |