merge vosremoval-thread patch

6 files changed, 15 insertions, 16 deletions

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e9a08fa631..d65630c3ea 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3626,7 +3626,7 @@ void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
 {
     TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
     ::osl::MutexGuard aGuard(m_aAdjustSafety);
-    if (::vos::OThread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
+    if (::osl::Thread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
     {
         m_nAsynAdjustEvent = PostUserEvent(LINK(this, DbGridControl, OnAsyncAdjust), reinterpret_cast< void* >( _bRows ));
         m_bPendingAdjustRows = _bRows;
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 55b8ef1bd3..0264ce937f 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -36,7 +36,7 @@
 
 //------------------------------------------------------------------------------
 ::vos::OMutex Tracer::s_aMapSafety;
-::std::map< ::vos::OThread::TThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
+::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > >
         Tracer::s_aThreadIndents;
 
 //------------------------------------------------------------------------------
@@ -44,13 +44,13 @@ Tracer::Tracer(const char* _pBlockDescription)
     :m_sBlockDescription(_pBlockDescription)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ]++;
+    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -64,13 +64,13 @@ Tracer::Tracer(const char* _pBlockDescription)
 Tracer::~Tracer()
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = --s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    INT32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -84,13 +84,13 @@ Tracer::~Tracer()
 void Tracer::TraceString(const char* _pMessage)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
@@ -105,13 +105,13 @@ void Tracer::TraceString(const char* _pMessage)
 void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
 {
     ::vos::OGuard aGuard(s_aMapSafety);
-    INT32 nIndent = s_aThreadIndents[ ::vos::OThread::getCurrentIdentifier() ];
+    INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
     ByteString sIndent;
     while (nIndent--)
         sIndent += '\t';
 
-    ByteString sThread( ByteString::CreateFromInt32( (INT32)::vos::OThread::getCurrentIdentifier() ) );
+    ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) );
     sThread += '\t';
 
     ByteString sMessage(sThread);
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3aaa3d5118..b36ac9d84b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -1188,7 +1188,7 @@ void FmSearchEngine::ImplStartNextSearch()
         pSearcher->setTerminationHandler(LINK(this, FmSearchEngine, OnSearchTerminated));
 
         pSearcher->createSuspended();
-        pSearcher->setPriority(::vos::OThread::TPriority_Lowest);
+        pSearcher->setPriority(osl_Thread_PriorityLowest);
         pSearcher->resume();
     }
     else
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 31103bd371..62e8da3f7f 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -65,7 +65,6 @@
 #include "svx/fmtools.hxx"
 #include "fmsrccfg.hxx"
 #include <osl/mutex.hxx>
-#include <vos/thread.hxx>
 #include <tools/debug.hxx>
 #include <cppuhelper/component.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index c8cc4972ef..afedf71bad 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -44,7 +44,7 @@
 #include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
 
 #ifndef _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGS
@@ -61,7 +61,7 @@ SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16)
 // ===================================================================================================
 
 class FmSearchEngine;
-class FmSearchThread : public ::vos::OThread
+class FmSearchThread : public ::osl::Thread
 {
     FmSearchEngine*		m_pEngine;
     Link				m_aTerminationHdl;
diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx
index c33cf02a2b..9aeccdb97a 100644
--- a/svx/source/inc/trace.hxx
+++ b/svx/source/inc/trace.hxx
@@ -30,7 +30,7 @@
 #if defined(DBG_UTIL)
 
 #include <tools/string.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
 #include <vos/mutex.hxx>
 #include <comphelper/stl_types.hxx>
 
@@ -39,7 +39,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;