diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:09:24 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-07-10 14:09:24 +0000 |
| commit | 1ff7c3391dbb4715e15e78c4ab29ea0363d7e7ef (patch) | |
| tree | 711acb5192dab12ed0ce93e41f2a9f4d9f299609 /framework/source/layoutmanager | |
| parent | 6feea1880a1c8fbf215b213d6b50639e5f0c977c (diff) | |
INTEGRATION: CWS fwk66 (1.63.12); FILE MERGED
2007/06/18 06:57:09 pb 1.63.12.1: fix: #i76867# top window must be a system window
Diffstat (limited to 'framework/source/layoutmanager')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 1b0cb66b7c3c..e1720d7b8448 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: layoutmanager.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: rt $ $Date: 2007-07-06 12:22:36 $ + * last change: $Author: ihi $ $Date: 2007-07-10 15:09:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -361,7 +361,14 @@ static sal_Bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame css::uno::Reference< css::awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), css::uno::UNO_QUERY); // dont use _THROW here ... its a check only if (xWindowCheck.is()) - return sal_True; + { + // --> PB 2007-06-18 #i76867# top and system window is required. + ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); + css::uno::Reference< css::awt::XWindow > xWindow( xWindowCheck, UNO_QUERY ); + Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + return ( pWindow && pWindow->IsSystemWindow() ); + // <-- + } return sal_False; } |