From d5e43bed6c2aec93fb95b0a18fb46516d9dfa39a Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 30 Aug 2007 12:57:57 +0000 Subject: 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 now which indicates i OOo should use XEmbed --- bean/com/sun/star/comp/beans/JavaWindowPeerFake.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'bean/com') diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java index 0582c26c8a9e..14d997d0fd7c 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; + wrappedHandle = _hWindow; } /**

Implementation of XSystemDependentWindowPeer (that's all we really need)

@@ -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; } -- cgit