diff options
| author | Andreas Schlüns <as@openoffice.org> | 2001-06-11 09:29:50 +0000 |
|---|---|---|
| committer | Andreas Schlüns <as@openoffice.org> | 2001-06-11 09:29:50 +0000 |
| commit | 2923606bdf98ab543b67c2166f6e84d22722cb26 (patch) | |
| tree | 4ddf27356d2c3117a55ec0ef5609d200563adad2 /framework/inc/services/frame.hxx | |
| parent | 626f8b25859d4ed263bbb3d4caab3ca2ccba5ed7 (diff) | |
#85529# use new lock mechanism
Diffstat (limited to 'framework/inc/services/frame.hxx')
| -rw-r--r-- | framework/inc/services/frame.hxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 3b1cc3a59b3b..4342b7d5bdfe 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mba $ $Date: 2001-05-04 15:35:09 $ + * last change: $Author: as $ $Date: 2001-06-11 10:20:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,12 +74,8 @@ #include <threadhelp/transactionbase.hxx> #endif -#ifndef __FRAMEWORK_THREADHELP_RWLOCKBASE_HXX_ -#include <threadhelp/rwlockbase.hxx> -#endif - -#ifndef __FRAMEWORK_THREADHELP_MUTEXBASE_HXX_ -#include <threadhelp/mutexbase.hxx> +#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ +#include <threadhelp/threadhelpbase.hxx> #endif #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ @@ -276,7 +272,7 @@ enum EActiveState XEventListener @base MutexBase - FairRWLockBase + ThreadHelpBase TransactionBase OBroadcastHelper OPropertySetHelper @@ -299,9 +295,8 @@ class Frame : // interfaces public css::awt::XFocusListener , // base classes // Order is neccessary for right initialization of this class! - protected MutexBase , // helper for threadsafe propertyset! OPropertySetHelper can't work with rw-lock. - private FairRWLockBase , // helper for own threadsafe code - private TransactionBase , // helper for rejecting calls for wrong object states + public ThreadHelpBase , // helper for own threadsafe code + public TransactionBase , // helper for rejecting calls for wrong object states public ::cppu::OBroadcastHelper , // helper for propertyset => XPropertySet, XFastPropertySet, XMultiPropertySet public ::cppu::OPropertySetHelper , public ::cppu::OWeakObject // helper for refcount mechanism |