diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:28:59 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:28:59 -0500 |
| commit | a5aeb902a7145b4863695abc989855a6766e4c3d (patch) | |
| tree | 631564f56e853a93f4e30d06e762bf6b57661f22 | |
| parent | a06e8658b3b19d399bcc08a75cc14fad0f1ba4e4 (diff) | |
merge vosremoval-thread patch
| -rw-r--r-- | dbaccess/inc/pch/precompiled_dbaccess.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/brwctrlr.hxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index f16091db2..a88dbdb46 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -501,7 +501,6 @@ #include "vos/mutex.hxx" #include "vos/ref.hxx" #include "vos/refernce.hxx" -#include "vos/thread.hxx" #include "xmloff/ProgressBarHelper.hxx" #include "xmloff/XMLConstantsPropertyHandler.hxx" diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 81d85df78..1c12ed392 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -440,7 +440,7 @@ IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ ) SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() ); if ( pGrid ) // if this fails, we were disposing before arriving here { - if ( Application::GetMainThreadIdentifier() != ::vos::OThread::getCurrentIdentifier() ) + if ( Application::GetMainThreadIdentifier() != ::osl::Thread::getCurrentIdentifier() ) { // still not in the main thread (see SbaXGridPeer::dispatch). post an event, again // without moving the special even to the back of the queue @@ -480,7 +480,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa if (!pGrid) return; - if ( Application::GetMainThreadIdentifier() != ::vos::OThread::getCurrentIdentifier() ) + if ( Application::GetMainThreadIdentifier() != ::osl::Thread::getCurrentIdentifier() ) { // we're not in the main thread. This is bad, as we want to raise windows here, // and VCL does not like windows to be opened in non-main threads (at least on Win32). diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 1a1193592..517bf0eb2 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -52,7 +52,7 @@ #include <vcl/timer.hxx> #include <svtools/transfer.hxx> #include <osl/mutex.hxx> -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <cppuhelper/implbase9.hxx> #include <svtools/cliplistener.hxx> |