diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 12:23:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 12:23:20 +0000 |
| commit | 2f35c804f87e777d11a5e375d009de4e43a1676a (patch) | |
| tree | f5f325b45ab07c6a108297128522a4ae6e7a6a49 /forms/source | |
| parent | 545d76caa1370d56ef49a7bc0c25d9f678bae6b0 (diff) | |
INTEGRATION: CWS dba202a (1.9.30); FILE MERGED
2005/11/25 13:42:23 fs 1.9.30.1: comphelper::OReusableGuard -> osl::ResettableMutexGuard / NOTIFY_LISTENERS replaced by ListenerContainer::forEach/notifyEach
Diffstat (limited to 'forms/source')
| -rw-r--r-- | forms/source/inc/FormComponent.hxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 1e5e87013de9..250a8f08c9d2 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -4,9 +4,9 @@ * * $RCSfile: FormComponent.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:54:32 $ + * last change: $Author: obo $ $Date: 2005-12-21 13:23:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -145,9 +145,6 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif -#ifndef _COMPHELPER_GUARDING_HXX_ -#include <comphelper/guarding.hxx> -#endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> #endif @@ -384,9 +381,7 @@ class OControlModel :public ::cppu::OComponentHelper protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory; - OCountedMutex m_aMutex; - // we use this kind of mutex to check the correct using of MutexRelease - // (in the product version OCountedMutex is defined as OMutex) + ::osl::Mutex m_aMutex; InterfaceRef m_xParent; // ParentComponent OImplementationIdsRef m_aHoldIdHelper; |