From f81e36d56ed79d1d4d06d928dbf095966261dbca Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 10 Oct 2010 21:29:02 -0500 Subject: merge vosremoval-thread patch --- forms/inc/pch/precompiled_forms.hxx | 2 +- forms/source/component/EventThread.cxx | 3 ++- forms/source/component/EventThread.hxx | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'forms') 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 #include #include -#include +#include #include @@ -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( ); -- cgit