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

merge vosremoval-mutex.diff

Browse Source 
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
This commit is contained in:
Norbert Thiebaud 2010-10-16 03:15:49 -05:00
parent d3d553e1ef
commit 46308b84dd
43 changed files with 96 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/source/extended/AccessibleToolPanelDeck.cxx
View File

@ -40,7 +40,7 @@
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <tools/diagnose_ex.h>

2
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
View File

@ -46,7 +46,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/button.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <tools/diagnose_ex.h>
#include <vector>

2
accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
View File

@ -42,7 +42,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
//......................................................................................................................
namespace accessibility

8
automation/inc/automation/communi.hxx
View File

@ -30,7 +30,7 @@
#include <svl/svarray.hxx>
#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/timer.hxx>
#include <automation/simplecm.hxx>
@ -101,8 +101,8 @@ protected:
virtual BOOL ShutdownCommunication();
ULONG nConnectionClosedEventId;
ULONG nDataReceivedEventId;
NAMESPACE_VOS(OMutex) aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
NAMESPACE_VOS(OMutex) aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
osl::Mutex aMConnectionClosed; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
osl::Mutex aMDataReceived; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
virtual void WaitForShutdown();
DECL_LINK( ShutdownLink, void* );
@ -149,7 +149,7 @@ private:
ULONG nPortToListen;
USHORT nMaxConnections;
ULONG nAddConnectionEventId;
NAMESPACE_VOS(OMutex) aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
osl::Mutex aMAddConnection; // Notwendig, da Event verarbeitet werden kann bevor Variable gesetzt ist
void CallInfoMsg( InfoString aMsg ){ pMyServer->CallInfoMsg( aMsg ); }
CM_InfoType GetInfoType(){ return pMyServer->GetInfoType(); }

30
automation/source/communi/communi.cxx
View File

@ -67,7 +67,7 @@ _SV_SEEK_PTR( nm, AE )
SV_IMPL_PTRARR_SORT( CommunicationLinkList, CommunicationLink* );
NAMESPACE_VOS(OMutex) *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest
osl::Mutex *pMPostUserEvent=NULL; // Notwendig, da nicht threadfest
CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket )
: SimpleCommunicationLinkViaSocket( pMan, pSocket )
@ -78,7 +78,7 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM
{
SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl ));
if ( !pMPostUserEvent )
pMPostUserEvent = new NAMESPACE_VOS(OMutex);
pMPostUserEvent = new osl::Mutex;
// this is necassary to prevent the running thread from sending the close event
// before the open event has been sent.
StartCallback();
@ -93,7 +93,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
while ( nConnectionClosedEventId || nDataReceivedEventId )
GetpApp()->Yield();
{
NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
osl::MutexGuard aGuard( aMConnectionClosed );
if ( nConnectionClosedEventId )
{
GetpApp()->RemoveUserEvent( nConnectionClosedEventId );
@ -104,7 +104,7 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
}
}
{
NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
osl::MutexGuard aGuard( aMDataReceived );
if ( nDataReceivedEventId )
{
GetpApp()->RemoveUserEvent( nDataReceivedEventId );
@ -210,8 +210,8 @@ void CommunicationLinkViaSocket::run()
SetNewPacketAsCurrent();
StartCallback();
{
NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
osl::MutexGuard aGuard( aMDataReceived );
osl::MutexGuard aGuard2( *pMPostUserEvent );
mlPutDataReceived.Call(this);
}
}
@ -221,8 +221,8 @@ void CommunicationLinkViaSocket::run()
StartCallback();
{
NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
osl::MutexGuard aGuard( aMConnectionClosed );
osl::MutexGuard aGuard2( *pMPostUserEvent );
nConnectionClosedEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationLinkViaSocket, ConnectionClosed ) );
}
}
@ -239,7 +239,7 @@ BOOL CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CM
long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
{
{
NAMESPACE_VOS(OGuard) aGuard( aMConnectionClosed );
osl::MutexGuard aGuard( aMConnectionClosed );
nConnectionClosedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
}
ShutdownCommunication();
@ -250,7 +250,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
{
{
NAMESPACE_VOS(OGuard) aGuard( aMDataReceived );
osl::MutexGuard aGuard( aMDataReceived );
nDataReceivedEventId = 0; // Achtung!! alles andere muß oben gemacht werden.
}
return CommunicationLink::DataReceived( );
@ -454,7 +454,7 @@ CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread(
, xmNewConnection( NULL )
{
if ( !pMPostUserEvent )
pMPostUserEvent = new NAMESPACE_VOS(OMutex);
pMPostUserEvent = new osl::Mutex;
create();
}
@ -481,7 +481,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread(
DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread Übersprungen!!!! (wegen Solaris BUG)\n");
#endif
{
NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
osl::MutexGuard aGuard( aMAddConnection );
if ( nAddConnectionEventId )
{
GetpApp()->RemoveUserEvent( nAddConnectionEventId );
@ -532,8 +532,8 @@ void CommunicationManagerServerAcceptThread::run()
xmNewConnection = new CommunicationLinkViaSocket( pMyServer, pStreamSocket );
xmNewConnection->StartCallback();
{
NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
NAMESPACE_VOS(OGuard) aGuard2( *pMPostUserEvent );
osl::MutexGuard aGuard( aMAddConnection );
osl::MutexGuard aGuard2( *pMPostUserEvent );
nAddConnectionEventId = GetpApp()->PostUserEvent( LINK( this, CommunicationManagerServerAcceptThread, AddConnection ) );
}
}
@ -559,7 +559,7 @@ void CommunicationManagerServerAcceptThread::run()
IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYARG )
{
{
NAMESPACE_VOS(OGuard) aGuard( aMAddConnection );
osl::MutexGuard aGuard( aMAddConnection );
nAddConnectionEventId = 0;
}
pMyServer->AddConnection( xmNewConnection );

8
automation/source/simplecm/tcpio.cxx
View File

@ -34,7 +34,7 @@
/// implement ITransmiter
comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
{
vos::OGuard aGuard( aMSocketWriteAccess );
osl::MutexGuard aGuard( aMSocketWriteAccess );
if ( !pStreamSocket )
{
nLastSent = 0;
@ -50,7 +50,7 @@ comm_USHORT TCPIO::TransferBytes( const void* pBuffer, comm_UINT32 nLen )
/// implement IReceiver
comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
{
vos::OGuard aGuard( aMSocketReadAccess );
osl::MutexGuard aGuard( aMSocketReadAccess );
if ( !pStreamSocket )
{
nLastReceived = 0;
@ -66,8 +66,8 @@ comm_USHORT TCPIO::ReceiveBytes( void* pBuffer, comm_UINT32 nLen )
// helper
void TCPIO::SetStreamSocket( osl::StreamSocket* pSocket )
{
vos::OGuard aRGuard( aMSocketReadAccess );
vos::OGuard aWGuard( aMSocketWriteAccess );
osl::MutexGuard aRGuard( aMSocketReadAccess );
osl::MutexGuard aWGuard( aMSocketWriteAccess );
pStreamSocket = pSocket;
}

6
automation/source/simplecm/tcpio.hxx
View File

@ -29,7 +29,7 @@
#define TCPIO_HXX
#include <osl/socket.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include "communiio.hxx"
@ -37,8 +37,8 @@ class TCPIO : public ITransmiter, public IReceiver
{
private:
osl::StreamSocket* pStreamSocket;
vos::OMutex aMSocketReadAccess;
vos::OMutex aMSocketWriteAccess;
osl::Mutex aMSocketReadAccess;
osl::Mutex aMSocketWriteAccess;
public:

2
basctl/source/basicide/doceventnotifier.cxx
View File

@ -43,7 +43,7 @@
#include <comphelper/componentcontext.hxx>
#include <comphelper/processfactory.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <sal/macros.h>
#include <cppuhelper/compbase1.hxx>

2
basctl/source/basicide/scriptdocument.cxx
View File

@ -81,7 +81,7 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/componentcontext.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/implbase1.hxx>

2
basctl/source/basicide/unomodel.cxx
View File

@ -30,7 +30,7 @@
#include "precompiled_basctl.hxx"
#include "unomodel.hxx"
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfac.hxx>

2
basctl/source/dlged/dlgedclip.cxx
View File

@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
#include "dlgedclip.hxx"
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/datatransfer/XMimeContentType.hpp>

2
cui/inc/pch/precompiled_cui.hxx
View File

@ -942,7 +942,7 @@
#include "vcl/unohelp2.hxx"
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
#include "vos/mutex.hxx"
#include "osl/mutex.hxx"
#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"

2
cui/source/dialogs/cuigaldlg.cxx
View File

@ -31,7 +31,7 @@
#include <algorithm>
#include <ucbhelper/content.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <avmedia/mediawindow.hxx>

2
cui/source/dialogs/scriptdlg.cxx
View File

@ -34,7 +34,7 @@
#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <cuires.hrc>
#include "scriptdlg.hrc"

2
extensions/inc/pch/precompiled_extensions.hxx
View File

@ -541,7 +541,7 @@
#include "vos/macros.hxx"
#include "vos/module.hxx"
#include "vos/mutex.hxx"
#include "osl/mutex.hxx"
#include "xmloff/nmspmap.hxx"
//---MARKER---

6
extensions/source/bibliography/framectr.cxx
View File

@ -60,7 +60,7 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <vcl/edit.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <hash_map>
@ -186,7 +186,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno::
void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aGuard;
::SolarMutexGuard aGuard;
if ( pController )
pController->getFrame()->removeFrameActionListener( this );
}
@ -441,7 +441,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
{
if ( !bDisposing )
{
SolarMutexGuard aGuard;
::SolarMutexGuard aGuard;
Window* pParent = VCLUnoHelper::GetWindow( xWindow );
WaitObject aWaitObject( pParent );

2
extensions/source/bibliography/toolbar.cxx
View File

@ -47,7 +47,7 @@
#include "bibresid.hxx"
#include "bibtools.hxx"
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;

2
extensions/source/oooimprovecore/core.cxx
View File

@ -43,7 +43,7 @@
#include <cppuhelper/implbase3.hxx>
#include <svx/svxdlg.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <sfx2/app.hxx>

8
extensions/source/plugin/inc/plugin/unx/mediator.hxx
View File

@ -32,7 +32,7 @@
#include <tools/string.hxx>
#include <tools/link.hxx>
#include <osl/pipe.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <osl/conditn.hxx>
#include <osl/thread.hxx>
#if OSL_DEBUG_LEVEL > 1
@ -90,8 +90,8 @@ protected:
int m_nSocket;
std::vector<MediatorMessage*> m_aMessageQueue;
NAMESPACE_VOS(OMutex) m_aQueueMutex;
NAMESPACE_VOS(OMutex) m_aSendMutex;
osl::Mutex m_aQueueMutex;
osl::Mutex m_aSendMutex;
// only one thread can send a message at any given time
osl::Condition m_aNewMessageCdtn;
MediatorListener* m_pListener;
@ -155,7 +155,7 @@ class MediatorListener : public osl::Thread
friend class Mediator;
private:
Mediator* m_pMediator;
::vos::OMutex m_aMutex;
::osl::Mutex m_aMutex;
MediatorListener( Mediator* );
~MediatorListener();

2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
View File

@ -166,7 +166,7 @@ public:
class PluginConnector : public Mediator
{
protected:
NAMESPACE_VOS(OMutex) m_aUserEventMutex;
osl::Mutex m_aUserEventMutex;
static std::vector<PluginConnector*> allConnectors;

12
extensions/source/plugin/unx/mediator.cxx
View File

@ -51,7 +51,7 @@ Mediator::~Mediator()
if( m_pListener )
{
{
::vos::OGuard aGuard( m_pListener->m_aMutex );
::osl::MutexGuard aGuard( m_pListener->m_aMutex );
m_pListener->m_pMediator = NULL;
}
m_pListener = NULL;
@ -81,7 +81,7 @@ ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID
if( ! m_pListener )
return 0;
NAMESPACE_VOS(OGuard) aGuard( m_aSendMutex );
osl::MutexGuard aGuard( m_aSendMutex );
if( ! nMessageID )
nMessageID = m_nCurrentID;
@ -133,7 +133,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
while( m_pListener )
{
{
NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
@ -158,7 +158,7 @@ MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
{
// guard must be after WaitForMessage, else the listener
// cannot insert a new one -> deadlock
NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
@ -206,9 +206,9 @@ void MediatorListener::run()
char* pBuffer = new char[ nHeader[ 1 ] ];
if( m_pMediator && (ULONG)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
{
::vos::OGuard aMyGuard( m_aMutex );
::osl::MutexGuard aMyGuard( m_aMutex );
{
NAMESPACE_VOS(OGuard)
osl::MutexGuard
aGuard( m_pMediator->m_aQueueMutex );
MediatorMessage* pMessage =
new MediatorMessage( nHeader[ 0 ], nHeader[ 1 ], pBuffer );

6
extensions/source/plugin/unx/nppapi.cxx
View File

@ -53,7 +53,7 @@ PluginConnector::PluginConnector( int nSocket ) :
PluginConnector::~PluginConnector()
{
NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
osl::MutexGuard aGuard( m_aUserEventMutex );
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
it != allConnectors.end(); ++it )
{
@ -67,7 +67,7 @@ PluginConnector::~PluginConnector()
IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
{
NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
osl::MutexGuard aGuard( m_aUserEventMutex );
bool bFound = false;
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
it != allConnectors.end() && bFound == false; ++it )
@ -94,7 +94,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
return 0;
/*
{
NAMESPACE_VOS(OGuard) aGuard( m_aUserEventMutex );
osl::MutexGuard aGuard( m_aUserEventMutex );
m_aUserEventIDs.pop_front();
}
*/

2
extensions/source/plugin/unx/plugcon.cxx
View File

@ -180,7 +180,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
while( m_pListener )
{
{
NAMESPACE_VOS(OGuard) aGuard( m_aQueueMutex );
osl::MutexGuard aGuard( m_aQueueMutex );
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];

2
extensions/source/propctrlr/browserlistbox.cxx
View File

@ -45,7 +45,7 @@
#include <comphelper/asyncnotification.hxx>
#include <cppuhelper/implbase1.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
//............................................................................
namespace pcr

2
extensions/source/propctrlr/propcontroller.cxx
View File

@ -56,7 +56,7 @@
#include <comphelper/property.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/exc_hlp.hxx>

3
extensions/source/resource/resource.cxx
View File

@ -30,7 +30,7 @@
#include "precompiled_extensions.hxx"
#include "res_services.hxx"
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type
#include <cppuhelper/factory.hxx> // helper for factories
#include <cppuhelper/implbase3.hxx> // helper for implementations
@ -51,7 +51,6 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
using namespace vos;
using namespace rtl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;

2
extensions/source/scanner/sane.hxx
View File

@ -41,7 +41,7 @@
class BitmapTransporter : public OWeakObject, AWT::XBitmap
{
SvMemoryStream m_aStream;
vos::OMutex m_aProtector;
osl::Mutex m_aProtector;
public:

4
extensions/source/scanner/scanner.hxx
View File

@ -29,7 +29,7 @@
#define _EXT_SCANNER_HXX
#include <tools/stream.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weak.hxx>
@ -64,7 +64,7 @@ class ScannerManager : public OWeakObject, XScannerManager, AWT::XBitmap
{
protected:
vos::OMutex maProtector;
osl::Mutex maProtector;
void* mpData;
void AcquireData();

26
extensions/source/scanner/scanunx.cxx
View File

@ -65,7 +65,7 @@ ANY SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
AWT::Size BitmapTransporter::getSize() throw()
{
vos::OGuard aGuard( m_aProtector );
osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
AWT::Size aRet;
@ -89,7 +89,7 @@ AWT::Size BitmapTransporter::getSize() throw()
SEQ( sal_Int8 ) BitmapTransporter::getDIB() throw()
{
vos::OGuard aGuard( m_aProtector );
osl::MutexGuard aGuard( m_aProtector );
int nPreviousPos = m_aStream.Tell();
// create return value
@ -112,7 +112,7 @@ struct SaneHolder
{
Sane m_aSane;
REF( AWT::XBitmap ) m_xBitmap;
vos::OMutex m_aProtector;
osl::Mutex m_aProtector;
ScanError m_nError;
bool m_bBusy;
@ -147,7 +147,7 @@ namespace
m_aSanes.clear();
}
struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {};
struct theSaneProtector : public rtl::Static<osl::Mutex, theSaneProtector> {};
struct theSanes : public rtl::Static<allSanes, theSanes> {};
}
@ -193,7 +193,7 @@ ScannerThread::~ScannerThread()
void ScannerThread::run()
{
vos::OGuard aGuard( m_pHolder->m_aProtector );
osl::MutexGuard aGuard( m_pHolder->m_aProtector );
BitmapTransporter* pTransporter = new BitmapTransporter;
REF( XInterface ) aIf( static_cast< OWeakObject* >( pTransporter ) );
@ -225,13 +225,13 @@ void ScannerThread::run()
void ScannerManager::AcquireData()
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
theSanes::get().acquire();
}
void ScannerManager::ReleaseData()
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
theSanes::get().release();
}
@ -255,7 +255,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( rSanes.empty() )
@ -280,7 +280,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
@ -315,7 +315,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
void ScannerManager::startScan( const ScannerContext& scanner_context,
const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
@ -345,7 +345,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@ -364,7 +364,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
{
vos::OGuard aGuard( theSaneProtector::get() );
osl::MutexGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
@ -375,7 +375,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
);
boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
vos::OGuard aProtGuard( pHolder->m_aProtector );
osl::MutexGuard aProtGuard( pHolder->m_aProtector );
REF( AWT::XBitmap ) xRet( pHolder->m_xBitmap );
pHolder->m_xBitmap = REF( AWT::XBitmap )();

14
extensions/source/scanner/scanwin.cxx
View File

@ -42,7 +42,7 @@
#include <math.h>
#include <tools/svwin.h>
#include <tools/stream.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <vos/module.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@ -110,7 +110,7 @@ class ImpTwain : public ::cppu::WeakImplHelper1< util::XCloseListener >
TW_IDENTITY aSrcIdent;
Link aNotifyLink;
DSMENTRYPROC pDSM;
NAMESPACE_VOS( OModule )* pMod;
NAMESPACE_VOS(OModule )* pMod;
ULONG nCurState;
HWND hTwainWnd;
HHOOK hTwainHook;
@ -994,7 +994,7 @@ SEQ( sal_Int8 ) ScannerManager::getDIB() throw()
SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
{
vos::OGuard aGuard( maProtector );
osl::MutexGuard aGuard( maProtector );
SEQ( ScannerContext ) aRet( 1 );
aRet.getArray()[0].ScannerName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) );
@ -1008,7 +1008,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException )
{
vos::OGuard aGuard( maProtector );
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@ -1024,7 +1024,7 @@ BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener )
throw( ScannerException )
{
vos::OGuard aGuard( maProtector );
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@ -1039,7 +1039,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
throw( ScannerException )
{
vos::OGuard aGuard( maProtector );
osl::MutexGuard aGuard( maProtector );
uno::Reference< XScannerManager > xThis( this );
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
@ -1053,7 +1053,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ )
throw( ScannerException )
{
vos::OGuard aGuard( maProtector );
osl::MutexGuard aGuard( maProtector );
return uno::Reference< awt::XBitmap >( this );
}

2
extensions/source/update/ui/updatecheckui.cxx
View File

@ -43,7 +43,7 @@
#include <comphelper/processfactory.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <osl/mutex.hxx>
#include <vcl/window.hxx>

2
extensions/test/stm/datatest.cxx
View File

@ -47,7 +47,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>

2
extensions/test/stm/marktest.cxx
View File

@ -43,7 +43,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>

2
extensions/test/stm/pipetest.cxx
View File

@ -40,7 +40,7 @@
#include <usr/weak.hxx> // OWeakObject
#include <osl/conditn.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
#include <string.h>

2
forms/inc/pch/precompiled_forms.hxx
View File

@ -394,7 +394,7 @@
#include "vcl/timer.hxx"
#include "vcl/wintypes.hxx"
#include "vos/mutex.hxx"
#include "osl/mutex.hxx"
#include "osl/thread.hxx"
//---MARKER---
#endif

2
forms/source/component/Button.cxx
View File

@ -39,7 +39,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
//.........................................................................
namespace frm

2
forms/source/component/DatabaseForm.cxx
View File

@ -90,7 +90,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <ctype.h>
#include <hash_map>

2
forms/source/component/FormattedField.cxx
View File

@ -60,7 +60,7 @@
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
// needed as long as we use the SolarMutex
#include <comphelper/streamsection.hxx>
#include <cppuhelper/weakref.hxx>

2
forms/source/component/ImageButton.cxx
View File

@ -32,7 +32,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <comphelper/basicio.hxx>
#include <com/sun/star/awt/MouseButton.hpp>

2
forms/source/component/clickableimage.cxx
View File

@ -47,7 +47,7 @@
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include "services.hxx"
#include <comphelper/container.hxx>
#include <comphelper/listenernotification.hxx>

2
forms/source/richtext/richtextcontrol.cxx
View File

@ -375,7 +375,7 @@ namespace frm
void ORichTextPeer::dispose( ) throw(RuntimeException)
{
{
::vos::OGuard aGuard( GetMutex() );
::osl::SolarMutexGuard aGuard( GetMutex() );
RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() );
if ( pRichTextControl )

2
forms/source/richtext/richtextengine.cxx
View File

@ -44,7 +44,7 @@
#include <vcl/outdev.hxx>
#include <unotools/lingucfg.hxx>
#include <svl/undo.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <algorithm>
#include <functional>

2
forms/source/runtime/formoperations.cxx
View File

@ -68,7 +68,7 @@
#include <comphelper/property.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <vos/mutex.hxx>
#include <osl/mutex.hxx>
#include <sal/macros.h>
//--------------------------------------------------------------------------