summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-08-30 12:57:57 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-08-30 12:57:57 +0000
commit2ec569028a07f1674dd3efddaaec8fee96664e7f (patch)
tree413bd1fce112294da26d48b4bf5b647337ac20db
parent3299cdce8a0862fe3e809b302620b52011cf50f1 (diff)
INTEGRATION: CWS c12v002_SRC680 (1.3.32); FILE MERGED
2007/04/02 09:25:33 jl 1.3.32.2: #t6453597# LocalOfficeWindow has now a method getWrappedWindowHandle 2007/03/12 14:27:42 jl 1.3.32.1: #t6453597# XSystemDependentWindowPeer.getWindowhandle return a sequences<NamedValue> now which indicates i OOo should use XEmbed
-rw-r--r--bean/com/sun/star/comp/beans/JavaWindowPeerFake.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 37297c493..e83644f0e 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -4,9 +4,9 @@
*
* $RCSfile: JavaWindowPeerFake.java,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 22:00:04 $
+ * last change: $Author: vg $ $Date: 2007-08-30 13:57:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -51,18 +51,17 @@ import com.sun.star.container.*;
/* package */ class JavaWindowPeerFake
implements XSystemDependentWindowPeer, XWindowPeer
{
-
- protected long hWindow;
- protected int localSystemType;
-
+ protected int localSystemType;
+ protected Any wrappedHandle;
+
/** Create the faked window peer.
* @param _hWindow the system handle to the window.
* @param _systemType specifies the system type.
*/
- public JavaWindowPeerFake(long _hWindow, int _systemType)
+ public JavaWindowPeerFake(Any _hWindow, int _systemType)
{
- hWindow = _hWindow;
- localSystemType = _systemType;
+ localSystemType = _systemType;
+ wrappedHandle = _hWindow;
}
/** <p>Implementation of XSystemDependentWindowPeer (that's all we really need)</p>
@@ -71,9 +70,8 @@ import com.sun.star.container.*;
public Object getWindowHandle(/*IN*/byte[] ProcessId, /*IN*/short SystemType)
throws com.sun.star.uno.RuntimeException
{
-
if (SystemType == localSystemType) {
- return new Integer((int)hWindow);
+ return wrappedHandle;
}
else return null;
}