diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:11:29 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:11:29 +0000 |
| commit | 1b0eb70d06a058b5707ab6d9611eb59d8e152563 (patch) | |
| tree | ebabf02dffb3e5768778c4b5f2360822e69f3db2 | |
| parent | e07f5b13475437eb332a6bf5c390743c71b7efbd (diff) | |
INTEGRATION: CWS dba205c (1.10.6); FILE MERGED
2006/10/12 09:48:54 fs 1.10.6.1: during #i70255#: when setting the engine's text, unlock our own mutex, to prevent deadlocks.
| -rw-r--r-- | forms/source/richtext/richtextmodel.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 24645b1b5832..c1ed1f83caf1 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: richtextmodel.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-09-17 00:00:47 $ + * last change: $Author: hr $ $Date: 2006-10-24 15:11:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,10 @@ #include <cppuhelper/typeprovider.hxx> #endif +#ifndef _COMPHELPER_GUARDING_HXX_ +#include <comphelper/guarding.hxx> +#endif + #ifndef _TOOLKIT_AWT_VCLXDEVICE_HXX_ #include <toolkit/awt/vclxdevice.hxx> #endif @@ -407,6 +411,7 @@ namespace frm } else if ( PROPERTY_ID_TEXT == _nHandle ) { + MutexRelease aReleaseMutex( m_aMutex ); impl_smlock_setEngineText( m_sLastKnownEngineText ); } } |