diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:01:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 12:01:49 +0000 |
| commit | 473b5bd0e134e96ecf6fde87dc9406876ad55e05 (patch) | |
| tree | 14912527c62afc2120e062ea660ddd9fc810b2d1 /framework | |
| parent | 38374eea64e154c2b0ff3cc5c268b04e9aad0ca1 (diff) | |
INTEGRATION: CWS vcl30stop2 (1.6.64); FILE MERGED
2008/07/24 12:20:19 pl 1.6.64.1: #i92075# solve some threading issues (thanks cd)
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/helper/dockingareadefaultacceptor.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 5dc48c6704..f6c33c7003 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dockingareadefaultacceptor.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -48,6 +48,8 @@ // includes of other projects //_________________________________________________________________________________________________________________ +#include <vcl/svapp.hxx> + //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -79,7 +81,8 @@ using namespace ::rtl ; //***************************************************************************************************************** DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const Reference< XFrame >& xOwner ) // Init baseclasses first - : OWeakObject ( ) + : ThreadHelpBase ( &Application::GetSolarMutex() ) + , OWeakObject ( ) // Init member , m_xOwner ( xOwner ) { @@ -126,6 +129,8 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css // Try to "lock" the frame for access to taskscontainer. Reference< XFrame > xFrame( m_xOwner.get(), UNO_QUERY ); + aGuard.unlock(); + if ( xFrame.is() == sal_True ) { Reference< css::awt::XWindow > xContainerWindow( xFrame->getContainerWindow() ); |