diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:02 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:02 -0500 |
| commit | f81e36d56ed79d1d4d06d928dbf095966261dbca (patch) | |
| tree | 572ea460fc5ab28e46c6017e3d8ba197fdda94bf /forms | |
| parent | 53f428d9bf8f9648e21bf89cfbb406747536ed09 (diff) | |
merge vosremoval-thread patch
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/inc/pch/precompiled_forms.hxx | 2 | ||||
| -rw-r--r-- | forms/source/component/EventThread.cxx | 3 | ||||
| -rw-r--r-- | forms/source/component/EventThread.hxx | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index f75e8ca4316a..c7e71669815a 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -395,6 +395,6 @@ #include "vcl/wintypes.hxx" #include "vos/mutex.hxx" -#include "vos/thread.hxx" +#include "osl/thread.hxx" //---MARKER--- #endif diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 504a180f6ee5..874c2e3a073c 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -167,7 +167,8 @@ void OComponentEventThread::implTerminated( ) void SAL_CALL OComponentEventThread::kill() { - OComponentEventThread_TBASE::kill(); + OComponentEventThread_TBASE::terminate(); + OComponentEventThread_TBASE::join(); implTerminated( ); } diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index b36743f85b47..1d926b2717ed 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <osl/conditn.hxx> @@ -49,7 +49,7 @@ namespace frm // *************************************************************************************************** // *************************************************************************************************** -typedef ::vos::OThread OComponentEventThread_TBASE; +typedef ::osl::Thread OComponentEventThread_TBASE; class OComponentEventThread :public OComponentEventThread_TBASE ,public ::com::sun::star::lang::XEventListener @@ -108,8 +108,8 @@ public: virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); /* resolve ambiguity : both OWeakObject and OObject have these memory operators */ - void * SAL_CALL operator new( size_t size ) throw() { return OThread::operator new(size); } - void SAL_CALL operator delete( void * p ) throw() { OThread::operator delete(p); } + void * SAL_CALL operator new( size_t size ) throw() { return osl::Thread::operator new(size); } + void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); } private: void implStarted( ); |