[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_so3 binfilter/bf_svx

[Norbert Thiebaud]

 binfilter/bf_forms/source/component/EventThread.hxx       |    8 ++++----
 binfilter/bf_forms/source/component/forms_EventThread.cxx |    3 ++-
 binfilter/bf_sc/source/core/data/sc_documen3.cxx          |    2 +-
 binfilter/bf_so3/source/persist/transprt.cxx              |    2 +-
 binfilter/bf_svx/source/inc/trace.hxx                     |    2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 5c8cc62d916e2370db983d15d57c79ae2aabd448
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Oct 10 21:29:03 2010 -0500

    merge vosremoval-thread patch

diff --git a/binfilter/bf_forms/source/component/EventThread.hxx b/binfilter/bf_forms/source/component/EventThread.hxx
index 3d51f4a..cc5d632 100644
--- a/binfilter/bf_forms/source/component/EventThread.hxx
+++ b/binfilter/bf_forms/source/component/EventThread.hxx
@@ -29,7 +29,7 @@
 #define _FRM_EVENT_THREAD_HXX_
 
 #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( );
diff --git a/binfilter/bf_forms/source/component/forms_EventThread.cxx b/binfilter/bf_forms/source/component/forms_EventThread.cxx
index 1ab6e35..7267006 100644
--- a/binfilter/bf_forms/source/component/forms_EventThread.cxx
+++ b/binfilter/bf_forms/source/component/forms_EventThread.cxx
@@ -158,7 +158,8 @@ void OComponentEventThread::implTerminated( )
 
 void SAL_CALL OComponentEventThread::kill()
 {
-    OComponentEventThread_TBASE::kill();
+    OComponentEventThread_TBASE::terminate();
+    OComponentEventThread_TBASE::join();
 
     implTerminated( );
 }
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 7fdaf24..5ec2a0f 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -423,7 +423,7 @@ using namespace ::com::sun::star;
 /*?*/ 				//	let the thread that called BroadcastUno continue
 /*?*/ 				while ( bInUnoBroadcast )
 /*?*/ 				{
-/*?*/ 					vos::OThread::yield();
+/*?*/ 					osl::Thread::yield();
 /*?*/ 				}
 /*?*/ 			}
 /*N*/ 		}
diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx
index e510792..8d71a78 100644
--- a/binfilter/bf_so3/source/persist/transprt.cxx
+++ b/binfilter/bf_so3/source/persist/transprt.cxx
@@ -1050,7 +1050,7 @@ sal_Int64 SAL_CALL UcbTransportInputStream_Impl::getLength (void)
  *
  *======================================================================*/
 
-class TransportThread_Impl : public ::vos::OThread
+class TransportThread_Impl : public ::osl::Thread
 {
     Link            m_aLink;
 public:
diff --git a/binfilter/bf_svx/source/inc/trace.hxx b/binfilter/bf_svx/source/inc/trace.hxx
index 24a6bdb..305fb75 100644
--- a/binfilter/bf_svx/source/inc/trace.hxx
+++ b/binfilter/bf_svx/source/inc/trace.hxx
@@ -36,7 +36,7 @@ class Tracer
 {
     ByteString m_sBlockDescription;
 
-    DECLARE_STL_STDKEY_MAP( ::vos::OThread::TThreadIdentifier, sal_Int32, MapThreadId2Int );
+    DECLARE_STL_STDKEY_MAP( ::oslThreadIdentifier, sal_Int32, MapThreadId2Int );
     static MapThreadId2Int s_aThreadIndents;
 
     static ::vos::OMutex	s_aMapSafety;