diff options
43 files changed, 96 insertions, 97 deletions
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index ce2b05b86b85..be2245474174 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -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> diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index a305b19cde6e..f4864c95a860 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -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> diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 2ad3ee0f3266..b621124cbe5f 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -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 diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index df33a87c2192..a65896382997 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -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(); } diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index 7c32484d4807..f19b095449ff 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -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 ); diff --git a/automation/source/simplecm/tcpio.cxx b/automation/source/simplecm/tcpio.cxx index 2906c04d2de0..e71afb399b84 100644 --- a/automation/source/simplecm/tcpio.cxx +++ b/automation/source/simplecm/tcpio.cxx @@ -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; } diff --git a/automation/source/simplecm/tcpio.hxx b/automation/source/simplecm/tcpio.hxx index c5a3e5cd77d6..1aa49bc93f34 100644 --- a/automation/source/simplecm/tcpio.hxx +++ b/automation/source/simplecm/tcpio.hxx @@ -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: diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index b8afffe21d88..a47c269f2c3d 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -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> diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index 1f277b3da112..bc21f4b3f556 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -81,7 +81,7 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/componentcontext.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 456d9eb89e35..498599a6bb04 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -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> diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index 9364cb2f5d4c..17392b2510ac 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -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> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 1e90181effb5..4bc9a226d0c4 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -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" diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index c2070261e7b1..26c13ee9fbfa 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -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> diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index c491d0d203fc..9d44e12f55f1 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -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" diff --git a/extensions/inc/pch/precompiled_extensions.hxx b/extensions/inc/pch/precompiled_extensions.hxx index 0d10b45bdb1d..8ffb20deed9e 100644 --- a/extensions/inc/pch/precompiled_extensions.hxx +++ b/extensions/inc/pch/precompiled_extensions.hxx @@ -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--- diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 74882f812493..1194982782c3 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -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 ); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index e019b7b50392..1cfb4726068d 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -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; diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 8310c5164128..4510a8fe21af 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -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> diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 4156c6bf24c4..6eacb4f30edb 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -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(); diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index a7b0b7450481..0f672684c67f 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -166,7 +166,7 @@ public: class PluginConnector : public Mediator { protected: - NAMESPACE_VOS(OMutex) m_aUserEventMutex; + osl::Mutex m_aUserEventMutex; static std::vector<PluginConnector*> allConnectors; diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx index 30056162fae4..4cbab9e0c9a2 100644 --- a/extensions/source/plugin/unx/mediator.cxx +++ b/extensions/source/plugin/unx/mediator.cxx @@ -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 ); diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index 61378dd8a78c..bf0faabf15dc 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -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(); } */ diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx index 2b85c516b2ac..607ae05d9877 100644 --- a/extensions/source/plugin/unx/plugcon.cxx +++ b/extensions/source/plugin/unx/plugcon.cxx @@ -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 ]; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 6ba05e432185..02e663c820c4 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -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 diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 16fedd434cad..50a6ed66bd65 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -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> diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index 0da4c9d68779..e5a61e69e376 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.cxx @@ -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; diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 44ce0d295f42..e4137649c8ed 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -41,7 +41,7 @@ class BitmapTransporter : public OWeakObject, AWT::XBitmap { SvMemoryStream m_aStream; - vos::OMutex m_aProtector; + osl::Mutex m_aProtector; public: diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 34d0f3e1a82d..a232365f4c49 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -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(); diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index fa671b99eede..7043c3d9a971 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -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 )(); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 81870e763972..8e449d906654 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -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 ); } diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index e14d490f5bb0..550705ee4a67 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -43,7 +43,7 @@ #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <vcl/window.hxx> diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx index a35d187f114c..1611458394c0 100644 --- a/extensions/test/stm/datatest.cxx +++ b/extensions/test/stm/datatest.cxx @@ -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> diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx index 00b4e4910634..260b38a027a1 100644 --- a/extensions/test/stm/marktest.cxx +++ b/extensions/test/stm/marktest.cxx @@ -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> diff --git a/extensions/test/stm/pipetest.cxx b/extensions/test/stm/pipetest.cxx index 95adfd52c4c5..705152f38939 100644 --- a/extensions/test/stm/pipetest.cxx +++ b/extensions/test/stm/pipetest.cxx @@ -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> diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index c7e71669815a..daa9fb6a2c7a 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -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 diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 1dd34d151fe1..da060f997052 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -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 diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index fccd544d99f6..248fbb44c0b9 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -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> diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index d7e075826209..8bafb3f893b4 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -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> diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index c0f2c87b2a64..926ed5c57e55 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -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> diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 2619c4e094b8..2c62e7960f69 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -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> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 266225310ee8..9d738c49be72 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -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 ) diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 4e251ec53115..a627c6d0e4e3 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -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> diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 78190b19ae7a..601af810779b 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -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> //-------------------------------------------------------------------------- |