diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:25:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:25:05 +0000 |
| commit | 6735ef00c19ecf2c29d32630cfab36d66393d757 (patch) | |
| tree | d60ae35821f98b77e6e1791919d4a48259ddf12a /vcl | |
| parent | fcedd8955b7166b3868ed965b0bf8ec33b3e6b2e (diff) | |
INTEGRATION: CWS sdk10 (1.94.112.1.40.1.12); FILE MERGED
2004/03/29 06:53:40 mi 1.94.112.1.40.1.12.3: RESYNC: (1.101-1.103); FILE MERGED
2004/02/03 11:36:40 mi 1.94.112.1.40.1.12.2: RESYNC: (1.94.112.1.40.1-1.101); FILE MERGED
2004/01/06 13:45:27 mi 1.94.112.1.40.1.12.1: #i19974# closing OooBean caused crash in OOo
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 6cc1d70ce724..435afb8513fa 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.104 $ + * $Revision: 1.105 $ * - * last change: $Author: hr $ $Date: 2004-05-10 16:02:52 $ + * last change: $Author: kz $ $Date: 2004-05-19 10:25:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1620,6 +1620,10 @@ void WinSalFrame::SetParent( SalFrame* pNewParent ) bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent ) { + if ( pNewParent->hWnd == 0 ) + { + pNewParent->hWnd = GetDesktopWindow(); + } ImplSetParentFrame( this, pNewParent->hWnd, TRUE ); return true; } @@ -5305,12 +5309,15 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP // to access lpCreateParams is the same structure CREATESTRUCTA* pStruct = (CREATESTRUCTA*)lParam; WinSalFrame* pFrame = (WinSalFrame*)pStruct->lpCreateParams; - SetWindowPtr( hWnd, pFrame ); - // HWND schon hier setzen, da schon auf den Instanzdaten - // gearbeitet werden kann, wenn Messages waehrend - // CreateWindow() gesendet werden - pFrame->mhWnd = hWnd; - pFrame->maSysData.hWnd = hWnd; + if ( pFrame != 0 ) + { + SetWindowPtr( hWnd, pFrame ); + // HWND schon hier setzen, da schon auf den Instanzdaten + // gearbeitet werden kann, wenn Messages waehrend + // CreateWindow() gesendet werden + pFrame->mhWnd = hWnd; + pFrame->maSysData.hWnd = hWnd; + } return 0; } |