diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:19:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:19:02 +0000 |
| commit | caf66bb1b43b31bc1dacd9de414b04a60381c29a (patch) | |
| tree | cf21c9eb4b2da2c9f89ef4c5e88e48dff4d618fd /svtools | |
| parent | 53b3e5ef191eb8acedf9a5bfebbcfd16b5454a85 (diff) | |
INTEGRATION: CWS fwk16 (1.6.102); FILE MERGED
2005/06/09 15:46:19 cd 1.6.102.1: #i50187# Don't lock solar mutex when retrieving property from frame
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 45950cb214e3..b535d3371c7b 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2005-03-01 19:52:07 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:19:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,9 +177,13 @@ Reference< XMultiServiceFactory > ToolboxController::getServiceManager() const Reference< XLayoutManager > ToolboxController::getLayoutManager() const { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); Reference< XLayoutManager > xLayoutManager; - Reference< XPropertySet > xPropSet( m_xFrame, UNO_QUERY ); + Reference< XPropertySet > xPropSet; + { + vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + xPropSet = Reference< XPropertySet >( m_xFrame, UNO_QUERY ); + } + if ( xPropSet.is() ) { try |