summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--automation/inc/automation/communi.hxx6
-rw-r--r--automation/source/communi/communi.cxx6
-rw-r--r--automation/source/server/server.hxx2
-rw-r--r--automation/source/testtool/tcommuni.hxx2
-rw-r--r--extensions/inc/pch/precompiled_extensions.hxx1
-rw-r--r--extensions/source/ole/olethread.cxx2
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx4
-rw-r--r--extensions/source/scanner/scanunx.cxx4
-rw-r--r--extensions/test/stm/datatest.cxx2
-rw-r--r--extensions/test/stm/marktest.cxx2
-rw-r--r--extensions/test/stm/pipetest.cxx6
-rw-r--r--forms/inc/pch/precompiled_forms.hxx2
-rw-r--r--forms/source/component/EventThread.cxx3
-rw-r--r--forms/source/component/EventThread.hxx8
14 files changed, 25 insertions, 25 deletions
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 36a6660f1a6d..5e42fa71d15d 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -29,7 +29,7 @@
#define _COMMUNI_HXX
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
@@ -76,7 +76,7 @@ public:
CommunicationManagerClient( BOOL bUseMultiChannel = FALSE );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread)
+class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
{
public:
CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket );
@@ -133,7 +133,7 @@ private:
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread)
+class CommunicationManagerServerAcceptThread: public osl::Thread
{
public:
CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS );
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index e62e060ba89c..dd2340bcaaa0 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -205,7 +205,7 @@ void CommunicationLinkViaSocket::run()
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
SetNewPacketAsCurrent();
StartCallback();
{
@@ -216,7 +216,7 @@ void CommunicationLinkViaSocket::run()
}
TimeValue sNochEins = {0, 1000000};
while ( schedule() && bIsInsideCallback ) // solange der letzte Callback nicht beendet ist
- sleep( sNochEins );
+ wait( sNochEins );
StartCallback();
{
@@ -527,7 +527,7 @@ void CommunicationManagerServerAcceptThread::run()
TimeValue sNochEins = {0, 100};
while ( schedule() && xmNewConnection.Is() ) // Solange die letzte Connection nicht abgeholt wurde warten wir
- sleep( sNochEins );
+ wait( sNochEins );
xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
xmNewConnection->StartCallback();
{
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 099973bee6bb..357bbe04364a 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -27,7 +27,7 @@
#ifndef _SERVER_HXX
#define _SERVER_HXX
-/*#include <vos/thread.hxx>
+/*#include <osl/thread.hxx>
#ifndef _STD_NO_NAMESPACE
namespace vos
{
diff --git a/automation/source/testtool/tcommuni.hxx b/automation/source/testtool/tcommuni.hxx
index 4374edfd7fc9..51d666489ee4 100644
--- a/automation/source/testtool/tcommuni.hxx
+++ b/automation/source/testtool/tcommuni.hxx
@@ -29,7 +29,7 @@
#include <tools/link.hxx>
#include <svl/svarray.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#ifndef _STRING_LIST
DECLARE_LIST( StringList, String * )
diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx
index b2316046daa7..adbaf3f4cf74 100644
--- a/extensions/inc/pch/precompiled_extensions.hxx
+++ b/extensions/inc/pch/precompiled_extensions.hxx
@@ -543,7 +543,6 @@
#include "vos/pipe.hxx"
#include "vos/ref.hxx"
#include "vos/refernce.hxx"
-#include "vos/thread.hxx"
#include "vos/timer.hxx"
#include "xmloff/nmspmap.hxx"
diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx
index bd6d8652d902..7fcd29612f57 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -36,7 +36,7 @@
#include <tools/presys.h>
#include <tools/postsys.h>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
using namespace vos;
using namespace std;
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 68619db54cad..1fd1c9c85c6c 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -34,7 +34,7 @@
#include <vos/pipe.hxx>
#include <vos/mutex.hxx>
#include <vos/conditn.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
@@ -150,7 +150,7 @@ public:
}
};
-class MediatorListener : public NAMESPACE_VOS( OThread )
+class MediatorListener : public osl::Thread
{
friend class Mediator;
private:
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 0a477a9dae7d..50b3e7cf871c 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -29,7 +29,7 @@
#include "precompiled_extensions.hxx"
#include <scanner.hxx>
#include <sanedlg.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <tools/list.hxx>
#include <boost/shared_ptr.hpp>
@@ -154,7 +154,7 @@ namespace
// - ScannerThread -
// -----------------
-class ScannerThread : public vos::OThread
+class ScannerThread : public osl::Thread
{
boost::shared_ptr<SaneHolder> m_pHolder;
REF( com::sun::star::lang::XEventListener ) m_xListener;
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index c562d8c68210..2e11bb239351 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -47,7 +47,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 019de72cf46c..a34ff8f78f86 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -43,7 +43,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx
index 39eb73b3c591..d957e19429f1 100644
--- a/extensions/test/stm/pipetest.cxx
+++ b/extensions/test/stm/pipetest.cxx
@@ -40,7 +40,7 @@
#include <vos/conditn.hxx>
#include <vos/mutex.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <string.h>
@@ -54,7 +54,7 @@ using namespace usr;
#endif
class WriteToStreamThread :
- public OThread
+ public osl::Thread
{
public:
@@ -369,7 +369,7 @@ void OPipeTest::testMultithreading( const XInterfaceRef &r )
Sequence<BYTE> seqRead;
// deletes itself
- OThread *p = new WriteToStreamThread( output, iMax );
+ osl::Thread *p = new WriteToStreamThread( output, iMax );
ERROR_ASSERT( p , "couldn't create thread for testing !\n" );
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( );