mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge vosremoval-thread patch

Browse Source
This commit is contained in:
Norbert Thiebaud
2010-10-10 21:28:59 -05:00
parent d7f4b5a0fc
commit 8d48117826
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbaccess/inc/pch/precompiled_dbaccess.hxx
View File

@@ -501,7 +501,6 @@
#include "vos/mutex.hxx" #include "vos/mutex.hxx"
#include "vos/ref.hxx" #include "vos/ref.hxx"
#include "vos/refernce.hxx" #include "vos/refernce.hxx"
#include "vos/thread.hxx"
#include "xmloff/ProgressBarHelper.hxx" #include "xmloff/ProgressBarHelper.hxx"
#include "xmloff/XMLConstantsPropertyHandler.hxx" #include "xmloff/XMLConstantsPropertyHandler.hxx"

4
dbaccess/source/ui/browser/sbagrid.cxx
View File

@@ -440,7 +440,7 @@ IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() ); SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() );
if ( pGrid ) // if this fails, we were disposing before arriving here 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 // still not in the main thread (see SbaXGridPeer::dispatch). post an event, again
// without moving the special even to the back of the queue // 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) if (!pGrid)
return; 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, // 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). // and VCL does not like windows to be opened in non-main threads (at least on Win32).

2
dbaccess/source/ui/inc/brwctrlr.hxx
View File

@@ -52,7 +52,7 @@
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <svtools/transfer.hxx> #include <svtools/transfer.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vos/thread.hxx> #include <osl/thread.hxx>
#include <cppuhelper/implbase9.hxx> #include <cppuhelper/implbase9.hxx>
#include <svtools/cliplistener.hxx> #include <svtools/cliplistener.hxx>