mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS c12v002_SRC680 (1.50.10); FILE MERGED

Browse Source 
2007/03/29 15:20:32 rt 1.50.10.2: RESYNC: (1.50-1.53); FILE MERGED
2007/03/12 13:57:29 pl 1.50.10.1: #b6453597# xembed for bean
This commit is contained in:
Vladimir Glazounov
2007-08-30 13:03:00 +00:00
parent a2cc55f8ec
commit 1ace7f189f
1 changed files with 82 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
toolkit/source/awt/vclxtoolkit.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: vclxtoolkit.cxx,v $
*
* $Revision: 1.57 $
* $Revision: 1.58 $
*
* last change: $Author: ihi $ $Date: 2007-07-10 14:52:25 $
* last change: $Author: vg $ $Date: 2007-08-30 14:03:00 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -84,6 +84,9 @@
#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_
#include <com/sun/star/uno/XInterface.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPP_
#include <com/sun/star/beans/NamedValue.hpp>
#endif
#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
@@ -1009,41 +1012,45 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
::com::sun::star::uno::Any anyHandle = xSystemDepParent->getWindowHandle(processIdSeq, SYSTEM_DEPENDENT_TYPE);
#if defined WNT
sal_Int32 hWnd;
// use sal_Int64 here to accomodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nWindowHandle = 0;
sal_Bool bXEmbed = sal_False;
if (anyHandle >>= hWnd)
bool bUseParentData = true;
if( ! (anyHandle >>= nWindowHandle) )
{
css::uno::Sequence< css::beans::NamedValue > aProps;
if( anyHandle >>= aProps )
{
const int nProps = aProps.getLength();
const css::beans::NamedValue* pProps = aProps.getConstArray();
for( int i = 0; i < nProps; i++ )
{
if( pProps[i].Name.equalsAscii( "WINDOW" ) )
pProps[i].Value >>= nWindowHandle;
else if( pProps[i].Name.equalsAscii( "XEMBED" ) )
pProps[i].Value >>= bXEmbed;
}
}
else
bUseParentData = false;
}
if( bUseParentData )
{
printf("hWnd = %ld\n", hWnd);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.hWnd = (HWND)hWnd;
#if defined QUARTZ
aParentData.rWindow = (WindowRef)nWindowHandle;
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
#elif defined WNT || defined OS2
aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle);
#endif
pNewWindow = new WorkWindow( &aParentData );
}
#elif defined QUARTZ
sal_IntPtr rWindow = 0;
if (anyHandle >>= rWindow)
{
printf("rWindow = %ld\n", rWindow);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.rWindow = (WindowRef)rWindow;
pNewWindow = new WorkWindow( &aParentData );
}
#elif defined UNX
sal_Int32 x11_id = 0;
if (anyHandle >>= x11_id)
{
printf("x11_id = %ld\n", x11_id);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.aWindow = x11_id;
pNewWindow = new WorkWindow( &aParentData );
}
#endif
}
}
@@ -1213,76 +1220,58 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
Window* pChildWindow = NULL;
if ( nSystemType == SYSTEM_DEPENDENT_TYPE )
{
#if defined WNT
sal_Int32 hWnd;
if ( Parent >>= hWnd)
// use sal_Int64 here to accomodate all int types
// uno::Any shift operator whill upcast if necessary
sal_Int64 nWindowHandle = 0;
sal_Bool bXEmbed = sal_False;
bool bUseParentData = true;
if( ! (Parent >>= nWindowHandle) )
{
css::uno::Sequence< css::beans::NamedValue > aProps;
if( Parent >>= aProps )
{
printf("hWnd = %ld\n", hWnd);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.hWnd = (HWND)hWnd;
osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() );
try
const int nProps = aProps.getLength();
const css::beans::NamedValue* pProps = aProps.getConstArray();
for( int i = 0; i < nProps; i++ )
{
pChildWindow = new WorkWindow( &aParentData );
}
catch ( ::com::sun::star::uno::RuntimeException & rEx )
{
// system child window could not be created
OSL_TRACE(
"VCLXToolkit::createSystemChild: caught %s\n",
::rtl::OUStringToOString(
rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
pChildWindow = NULL;
if( pProps[i].Name.equalsAscii( "WINDOW" ) )
pProps[i].Value >>= nWindowHandle;
else if( pProps[i].Name.equalsAscii( "XEMBED" ) )
pProps[i].Value >>= bXEmbed;
}
}
#elif defined QUARTZ
sal_IntPtr rWindow = 0;
if ( Parent >>= rWindow)
else
bUseParentData = false;
}
if( bUseParentData )
{
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
#if defined QUARTZ
aParentData.rWindow = (WindowRef)nWindowHandle;
#elif defined UNX
aParentData.aWindow = nWindowHandle;
aParentData.bXEmbedSupport = bXEmbed;
#elif defined WNT || defined OS2
aParentData.hWnd = reinterpret_cast<HWND>(nWindowHandle);
#endif
osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() );
try
{
printf("rWindow = %ld\n", rWindow);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.rWindow = (WindowRef)rWindow;
osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() );
try
{
pChildWindow = new WorkWindow( &aParentData );
}
catch ( ::com::sun::star::uno::RuntimeException & rEx )
{
// system child window could not be created
OSL_TRACE(
"VCLXToolkit::createSystemChild: caught %s\n",
::rtl::OUStringToOString(
rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
pChildWindow = NULL;
}
pChildWindow = new WorkWindow( &aParentData );
}
#elif defined UNX
sal_Int32 x11_id = 0;
if ( Parent >>= x11_id )
catch ( ::com::sun::star::uno::RuntimeException & rEx )
{
printf("x11_id = %ld\n", x11_id);
SystemParentData aParentData;
aParentData.nSize = sizeof( aParentData );
aParentData.aWindow = x11_id;
osl::Guard< vos::IMutex > aGuard( Application::GetSolarMutex() );
try
{
pChildWindow = new WorkWindow( &aParentData );
}
catch ( ::com::sun::star::uno::RuntimeException & rEx )
{
// system child window could not be created
OSL_TRACE(
"VCLXToolkit::createSystemChild: caught %s\n",
::rtl::OUStringToOString(
rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
pChildWindow = NULL;
}
// system child window could not be created
OSL_TRACE(
"VCLXToolkit::createSystemChild: caught %s\n",
::rtl::OUStringToOString(
rEx.Message, RTL_TEXTENCODING_UTF8).getStr());
pChildWindow = NULL;
}
#endif
}
}
else if (nSystemType == com::sun::star::lang::SystemDependent::SYSTEM_JAVA)
{