diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:08 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:08 -0500 |
| commit | f744968454477935f7396b495a2426cf5e70546b (patch) | |
| tree | bc09336bedd062fbdd22fefc3c8940a05d2862ec /vcl/source | |
| parent | 5584c277cb3d7a198b9bd554e5a4dc92b8bea87d (diff) | |
merge vosremoval-thread patch
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/helper/threadex.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 71d063bed39d..029f282b6252 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -529,7 +529,7 @@ vos::IMutex& Application::GetSolarMutex() // ----------------------------------------------------------------------- -vos::OThread::TThreadIdentifier Application::GetMainThreadIdentifier() +oslThreadIdentifier Application::GetMainThreadIdentifier() { return ImplGetSVData()->mnMainThreadId; } diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4efa2b659e7c..1d8977af5f4e 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -293,7 +293,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM pSVData->maAppData.mxMSF = rSMgr; // Main-Thread-Id merken - pSVData->mnMainThreadId = ::vos::OThread::getCurrentIdentifier(); + pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier(); vos::OStartupInfo aStartInfo; rtl::OUString aExeFileName; diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index 133b19aa0538..8848d1e1c511 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -101,7 +101,7 @@ IMPL_LINK( SolarThreadExecutor, worker, void*, EMPTYARG ) long SolarThreadExecutor::impl_execute( const TimeValue* _pTimeout ) { - if( ::vos::OThread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() ) + if( ::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier() ) { osl_setCondition( m_aStart ); m_nReturn = doIt(); |