diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:35:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-21 15:35:14 +0000 |
| commit | 32e0179972c52f593522a156cd8786cc95d31b08 (patch) | |
| tree | f12c8c8f20dc8a3b99a5fc09e480397d702518c5 /forms | |
| parent | 6b8157f71c9ef54c5c95bccc687df4b3fea28cb8 (diff) | |
INTEGRATION: CWS dba24c (1.2.36); FILE MERGED
2007/10/03 12:21:37 fs 1.2.36.1: during #i82169#: setPropertyValues: reset guard before actually setting, else we'll get deadlocks soon
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/propertybaghelper.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index e22c86573b69..62008aa58593 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: propertybaghelper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2007-05-10 09:57:46 $ + * last change: $Author: ihi $ $Date: 2007-11-21 16:35:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,7 +320,7 @@ namespace frm //-------------------------------------------------------------------- void PropertyBagHelper::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { - ::osl::MutexGuard aGuard( m_rContext.getMutex() ); + ::osl::ClearableMutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); sal_Int32 nPropertyValues = _rProps.getLength(); @@ -354,6 +354,8 @@ namespace frm aValues.getArray(), SelectValueOfPropertyValue() ); Reference< XMultiPropertySet > xMe( m_rContext.getPropertiesInterface(), UNO_QUERY_THROW ); + + aGuard.clear(); xMe->setPropertyValues( aNames, aValues ); } |