From 8d48117826d5b77a20ddffe53b016775b92df73e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 10 Oct 2010 21:28:59 -0500 Subject: merge vosremoval-thread patch --- dbaccess/source/ui/browser/sbagrid.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dbaccess/source/ui/browser/sbagrid.cxx') diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 006baa1f0e5e..c532c0330b96 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). -- cgit