diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
152 files changed, 1048 insertions, 1231 deletions
diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx index cbd880709b3d..cf42e15e2ef3 100644 --- a/canvas/inc/canvas/vclwrapper.hxx +++ b/canvas/inc/canvas/vclwrapper.hxx @@ -30,7 +30,7 @@ #define INCLUDED_CANVAS_VCLWRAPPER_HXX #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx index faeeaa793475..6865a70f1e31 100644 --- a/canvas/source/vcl/bitmapbackbuffer.cxx +++ b/canvas/source/vcl/bitmapbackbuffer.cxx @@ -32,7 +32,7 @@ #include "bitmapbackbuffer.hxx" #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/bitmapex.hxx> diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index 082de4eeff74..963162b22587 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -30,10 +30,11 @@ #define _VCLCANVAS_TOOLS_HXX #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> +#include <vcl/solarmutex.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -123,18 +124,18 @@ namespace vclcanvas { public: LocalGuard() : - aGuard( Application::GetSolarMutex() ) + aSolarGuard() { } /// To be compatible with CanvasBase mutex concept LocalGuard( const ::osl::Mutex& ) : - aGuard( Application::GetSolarMutex() ) + aSolarGuard() { } private: - ::vos::OGuard aGuard; + SolarMutexGuard aSolarGuard; }; class OutDevStateKeeper diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx index 5d31b4c43444..1b11005a42c2 100644 --- a/comphelper/inc/comphelper/ChainablePropertySet.hxx +++ b/comphelper/inc/comphelper/ChainablePropertySet.hxx @@ -39,10 +39,7 @@ namespace comphelper { class ChainablePropertySetInfo; } -namespace vos -{ - class IMutex; -} + /* * A ChainablePropertySet has the following features: * @@ -77,7 +74,7 @@ namespace comphelper friend class MasterPropertySet; protected: ChainablePropertySetInfo *mpInfo; - vos::IMutex *mpMutex; + osl::SolarMutex* mpMutex; ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySetInfo > mxInfo; void lockMutex(); void unlockMutex(); @@ -109,7 +106,7 @@ namespace comphelper throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: - ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex = NULL ) + ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, osl::SolarMutex* pMutex = NULL ) throw(); virtual ~ChainablePropertySet() throw(); diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx index 9eed2ef9eb28..c5e335d6cf67 100644 --- a/comphelper/inc/comphelper/MasterPropertySet.hxx +++ b/comphelper/inc/comphelper/MasterPropertySet.hxx @@ -34,10 +34,7 @@ #include <comphelper/PropertyInfoHash.hxx> #include "comphelper/comphelperdllapi.h" #include <map> -namespace vos -{ - class IMutex; -} + namespace comphelper { class MasterPropertySetInfo; @@ -72,7 +69,7 @@ namespace comphelper { protected: MasterPropertySetInfo *mpInfo; - vos::IMutex *mpMutex; + osl::SolarMutex* mpMutex; sal_uInt8 mnLastId; SlaveMap maSlaveMap; ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySetInfo > mxInfo; @@ -106,7 +103,7 @@ namespace comphelper throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); public: - MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, ::vos::IMutex *pMutex = NULL ) + MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, ::osl::SolarMutex* pMutex = NULL ) throw(); virtual ~MasterPropertySet() throw(); diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx index 035af6dc4f5c..ed951083df71 100644 --- a/comphelper/inc/comphelper/SettingsHelper.hxx +++ b/comphelper/inc/comphelper/SettingsHelper.hxx @@ -32,10 +32,6 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase3.hxx> -namespace vos -{ - class IMutex; -} namespace comphelper { @@ -56,7 +52,7 @@ namespace comphelper public ComphelperBase { public: - SettingsHelperNoState ( ComphelperBaseInfo *pInfo, ::vos::IMutex *pMutex = NULL) + SettingsHelperNoState ( ComphelperBaseInfo *pInfo, ::osl::SolarMutex* pMutex = NULL) : ComphelperBase ( pInfo, pMutex ) {} virtual ~SettingsHelperNoState () throw( ) {} diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 9ceefb351c21..f77f6fe2e664 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -30,7 +30,7 @@ #include "precompiled_comphelper.hxx" #include <comphelper/ChainablePropertySet.hxx> #include <comphelper/ChainablePropertySetInfo.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <memory> // STL auto_ptr @@ -41,9 +41,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -using ::vos::IMutex; -ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, vos::IMutex *pMutex ) +ChainablePropertySet::ChainablePropertySet( comphelper::ChainablePropertySetInfo* pInfo, osl::SolarMutex* pMutex ) throw() : mpInfo ( pInfo ) , mpMutex ( pMutex ) @@ -79,9 +78,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -97,9 +96,9 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -143,9 +142,9 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); const sal_Int32 nCount = aPropertyNames.getLength(); @@ -177,9 +176,9 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); const sal_Int32 nCount = aPropertyNames.getLength(); diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index be1b2b6c3224..be423448e354 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -33,7 +33,7 @@ #include <comphelper/MasterPropertySetInfo.hxx> #include <comphelper/ChainablePropertySet.hxx> #include <comphelper/ChainablePropertySetInfo.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <memory> // STL auto_ptr @@ -42,19 +42,19 @@ class AutoOGuardArray { sal_Int32 nSize; - std::auto_ptr< vos::OGuard > * pGuardArray; + std::auto_ptr< osl::SolarMutexGuard > * pGuardArray; public: AutoOGuardArray( sal_Int32 nNumElements ); ~AutoOGuardArray(); - std::auto_ptr< vos::OGuard > & operator[] ( sal_Int32 i ) { return pGuardArray[i]; } + std::auto_ptr< osl::SolarMutexGuard > & operator[] ( sal_Int32 i ) { return pGuardArray[i]; } }; AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) { nSize = nNumElements; - pGuardArray = new std::auto_ptr< vos::OGuard >[ nSize ]; + pGuardArray = new std::auto_ptr< osl::SolarMutexGuard >[ nSize ]; } AutoOGuardArray::~AutoOGuardArray() @@ -72,7 +72,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -using vos::IMutex; + SlaveData::SlaveData ( ChainablePropertySet *pSlave) : mpSlave ( pSlave ) @@ -81,7 +81,7 @@ SlaveData::SlaveData ( ChainablePropertySet *pSlave) { } -MasterPropertySet::MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, IMutex *pMutex ) +MasterPropertySet::MasterPropertySet( comphelper::MasterPropertySetInfo* pInfo, osl::SolarMutex* pMutex ) throw() : mpInfo ( pInfo ) , mpMutex ( pMutex ) @@ -130,9 +130,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -150,9 +150,9 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave; // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard2; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2; if (pSlave->mpMutex) - pMutexGuard2.reset( new vos::OGuard(pSlave->mpMutex) ); + pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) ); pSlave->_preSetValues(); pSlave->_setSingleValue( *((*aIter).second->mpInfo), rValue ); @@ -164,9 +164,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -185,9 +185,9 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave; // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard2; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard2; if (pSlave->mpMutex) - pMutexGuard2.reset( new vos::OGuard(pSlave->mpMutex) ); + pMutexGuard2.reset( new osl::SolarMutexGuard(pSlave->mpMutex) ); pSlave->_preGetValues(); pSlave->_getSingleValue( *((*aIter).second->mpInfo), aAny ); @@ -225,9 +225,9 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); const sal_Int32 nCount = aPropertyNames.getLength(); @@ -264,7 +264,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). if (pSlave->mpSlave->mpMutex) - aOGuardArray[i].reset( new vos::OGuard(pSlave->mpSlave->mpMutex) ); + aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) ); pSlave->mpSlave->_preSetValues(); pSlave->SetInit ( sal_True ); @@ -291,9 +291,9 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< : throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (mpMutex) - pMutexGuard.reset( new vos::OGuard(mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(mpMutex) ); const sal_Int32 nCount = aPropertyNames.getLength(); @@ -329,7 +329,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< : { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). if (pSlave->mpSlave->mpMutex) - aOGuardArray[i].reset( new vos::OGuard(pSlave->mpSlave->mpMutex) ); + aOGuardArray[i].reset( new osl::SolarMutexGuard(pSlave->mpSlave->mpMutex) ); pSlave->mpSlave->_preGetValues(); pSlave->SetInit ( sal_True ); @@ -392,9 +392,9 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin ChainablePropertySet * pSlave = maSlaveMap [ (*aIter).second->mnMapId ]->mpSlave; // acquire mutex in c-tor and releases it in the d-tor (exception safe!). - std::auto_ptr< vos::OGuard > pMutexGuard; + std::auto_ptr< osl::SolarMutexGuard > pMutexGuard; if (pSlave->mpMutex) - pMutexGuard.reset( new vos::OGuard(pSlave->mpMutex) ); + pMutexGuard.reset( new osl::SolarMutexGuard(pSlave->mpMutex) ); pSlave->_preGetPropertyState(); pSlave->_getPropertyState( *((*aIter).second->mpInfo), aState ); diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 888a238aca1a..123e9ef2f784 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -37,7 +37,7 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/stl_types.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/uuid.h> #include <boost/mem_fn.hpp> #include <boost/bind.hpp> diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 10afb0f5bde8..8b4096fac2be 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -33,7 +33,7 @@ #include <tools/diagnose_ex.h> #include <canvas/verbosetrace.hxx> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/logfile.hxx> #include <comphelper/sequence.hxx> diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index e142013b0ea5..2d8d42942c99 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -421,7 +421,7 @@ #include <unotools/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vos/process.hxx> #include <vos/security.hxx> #include <vos/thread.hxx> diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 8a23e08aef62..14b95906ddd1 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/smplhint.hxx> #include <rtl/instance.hxx> #include <unotools/syslocale.hxx> diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index fc6db651a314..5d9cb63c6fef 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -33,7 +33,7 @@ #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <i18npool/mslangid.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <rtl/instance.hxx> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx index c84605c6202c..76ac32d4211d 100644 --- a/svl/source/notify/cancel.cxx +++ b/svl/source/notify/cancel.cxx @@ -31,14 +31,14 @@ #define _SFX_CANCEL_CXX #include <svl/cancel.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <svl/smplhint.hxx> #include <svl/cnclhint.hxx> #include <rtl/instance.hxx> -namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; } +namespace { struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex >{}; } //========================================================================= @@ -67,7 +67,7 @@ BOOL SfxCancelManager::CanCancel() const */ { - ::vos::OGuard aGuard( lclMutex::get() ); + ::osl::MutexGuard aGuard( lclMutex::get() ); return _aJobs.Count() > 0 || ( _pParent && _pParent->CanCancel() ); } @@ -82,7 +82,7 @@ void SfxCancelManager::Cancel( BOOL bDeep ) */ { - ::vos::OGuard aGuard( lclMutex::get() ); + ::osl::MutexGuard aGuard( lclMutex::get() ); SfxCancelManagerWeak xWeak( this ); for ( USHORT n = _aJobs.Count(); n-- && xWeak.Is(); ) if ( n < _aJobs.Count() ) @@ -111,7 +111,7 @@ void SfxCancelManager::InsertCancellable( SfxCancellable *pJob ) } #endif - ::vos::OClearableGuard aGuard( lclMutex::get() ); + ::osl::ClearableMutexGuard aGuard( lclMutex::get() ); _aJobs.C40_INSERT( SfxCancellable, pJob, _aJobs.Count() ); aGuard.clear(); @@ -132,7 +132,7 @@ void SfxCancelManager::RemoveCancellable( SfxCancellable *pJob ) */ { - ::vos::OClearableGuard aGuard( lclMutex::get() ); + ::osl::ClearableMutexGuard aGuard( lclMutex::get() ); const SfxCancellable *pTmp = pJob; USHORT nPos = _aJobs.GetPos( pTmp ); if ( nPos != 0xFFFF ) diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 97b59d2c6414..cf026acb8a71 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -32,7 +32,7 @@ #include <tools/color.hxx> #include <tools/debug.hxx> #include <i18npool/mslangid.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/util/Date.hpp> diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index 86b055680c4a..da0ec77ed7cc 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -33,7 +33,7 @@ #include <tools/color.hxx> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <rtl/uuid.h> diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 9b3275b9ed9f..909a141e018f 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -33,7 +33,7 @@ #include <comphelper/sharedmutex.hxx> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <strmadpt.hxx> #include "instrm.hxx" @@ -43,7 +43,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -using namespace ::vos; using namespace ::utl; #define PERSISTENT_SERVICE_NAME ::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index ab9c15edec6c..0dc3196250f3 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -37,7 +37,7 @@ #include <osl/thread.h> #include <tools/debug.hxx> #include <tools/solarmutex.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // static DWORD hDdeInst = NULL; // static short nInstance = 0; diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx index 82fc620129ee..6758222fe552 100644 --- a/svtools/inc/asynclink.hxx +++ b/svtools/inc/asynclink.hxx @@ -32,14 +32,10 @@ #include "svtools/svtdllapi.h" #include <tools/solar.h> #include <tools/link.hxx> +#include <osl/mutex.hxx> class Timer; -namespace vos -{ - class OMutex; -} - namespace svtools { class SVT_DLLPUBLIC AsynchronLink @@ -50,7 +46,7 @@ class SVT_DLLPUBLIC AsynchronLink BOOL _bInCall; BOOL* _pDeleted; void* _pArg; - vos::OMutex* _pMutex; + ::osl::Mutex* _pMutex; DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* ); SVT_DLLPRIVATE void Call_Impl( void* pArg ); diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx index 7aafdc3025e5..c746d53b7c7f 100644 --- a/svtools/inc/pch/precompiled_svtools.hxx +++ b/svtools/inc/pch/precompiled_svtools.hxx @@ -425,7 +425,7 @@ #include <vcl/mapunit.hxx> #include <vcl/unohelp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vos/process.hxx> //---MARKER--- diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index 57df1523ffcf..2058a01e566a 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -31,7 +31,7 @@ #include <list> #include <vos/macros.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 851573252671..e537c5682622 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/uno/Sequence.h> #include <svl/poolitem.hxx> //Any2Bool #include <svl/smplhint.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <itemholder2.hxx> diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 59759652b2f4..7610554612c6 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/uno/Sequence.h> #include <svl/poolitem.hxx> //Any2Bool #include <svl/smplhint.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> /* #100822# ---- #include <vcl/wrkwin.hxx> diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index fe06ee97b2c2..0f40bf0fbb18 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -45,7 +45,7 @@ #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <memory> diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 3631592619e3..758999d61dcd 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -30,7 +30,7 @@ #include "precompiled_svtools.hxx" #include <asynclink.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <vcl/timer.hxx> #include <vcl/svapp.hxx> @@ -40,7 +40,7 @@ namespace svtools { void AsynchronLink::CreateMutex() { - if( !_pMutex ) _pMutex = new vos::OMutex; + if( !_pMutex ) _pMutex = new osl::Mutex; } void AsynchronLink::Call( void* pObj, BOOL diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index e0ff543a3714..2a3153109eed 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -54,7 +54,7 @@ #include <vcl/toolbox.hxx> #include <osl/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unotools/historyoptions.hxx> #include <svl/eitem.hxx> @@ -113,7 +113,7 @@ public: // ----------------------------------------------------------------------- class SvtMatchContext_Impl : public ::osl::Thread { - static ::vos::OMutex* pDirMutex; + static ::osl::Mutex* pDirMutex; SvStringsDtor aPickList; SvStringsDtor* pCompletions; @@ -136,20 +136,20 @@ class SvtMatchContext_Impl : public ::osl::Thread void FillPicklist( SvStringsDtor& rPickList ); public: - static ::vos::OMutex* GetMutex(); + static ::osl::Mutex* GetMutex(); SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ); ~SvtMatchContext_Impl(); void Stop(); }; -::vos::OMutex* SvtMatchContext_Impl::pDirMutex = 0; +::osl::Mutex* SvtMatchContext_Impl::pDirMutex = 0; -::vos::OMutex* SvtMatchContext_Impl::GetMutex() +::osl::Mutex* SvtMatchContext_Impl::GetMutex() { - ::vos::OGuard aGuard( ::vos::OMutex::getGlobalMutex() ); + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !pDirMutex ) - pDirMutex = new ::vos::OMutex; + pDirMutex = new ::osl::Mutex; return pDirMutex; } @@ -601,7 +601,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir ) //------------------------------------------------------------------------- void SvtMatchContext_Impl::run() { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::MutexGuard aGuard( GetMutex() ); if( bStop ) // have we been stopped while we were waiting for the mutex? return; @@ -977,7 +977,7 @@ BOOL SvtURLBox::ProcessKey( const KeyCode& rKey ) if ( aCode == KEY_RETURN && GetText().Len() ) { // wait for completion of matching thread - ::vos::OGuard aGuard( SvtMatchContext_Impl::GetMutex() ); + ::osl::MutexGuard aGuard( SvtMatchContext_Impl::GetMutex() ); if ( bAutoCompleteMode ) { @@ -1143,7 +1143,7 @@ void SvtURLBox::SetNoURLSelection( BOOL bSet ) String SvtURLBox::GetURL() { // wait for end of autocompletion - ::vos::OGuard aGuard( SvtMatchContext_Impl::GetMutex() ); + ::osl::MutexGuard aGuard( SvtMatchContext_Impl::GetMutex() ); String aText( GetText() ); if ( MatchesPlaceHolder( aText ) ) @@ -1239,7 +1239,7 @@ void SvtURLBox::DisableHistory() //------------------------------------------------------------------------- void SvtURLBox::SetBaseURL( const String& rURL ) { - ::vos::OGuard aGuard( SvtMatchContext_Impl::GetMutex() ); + ::osl::MutexGuard aGuard( SvtMatchContext_Impl::GetMutex() ); // Reset match lists if ( pImp->pCompletions ) diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index f3baa7107caa..938d14bc854f 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -847,7 +847,7 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone void SAL_CALL ToolbarMenuEntryAcc::addEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { - const ::vos::OGuard aGuard( maMutex ); + const ::osl::MutexGuard aGuard( maMutex ); if( rxListener.is() ) { @@ -871,7 +871,7 @@ void SAL_CALL ToolbarMenuEntryAcc::addEventListener( const Reference< XAccessibl void SAL_CALL ToolbarMenuEntryAcc::removeEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException) { - const ::vos::OGuard aGuard( maMutex ); + const ::osl::MutexGuard aGuard( maMutex ); if( rxListener.is() ) { diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 0e42afd79b56..0df8c8e78045 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/image.hxx> #include <vcl/menu.hxx> @@ -255,7 +255,7 @@ public: private: EventListenerVector mxEventListeners; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; ToolbarMenuEntry* mpParent; /** Tell all listeners that the object is dying. This callback is diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index c6e5f32fc7ac..6187f655ade4 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -846,7 +846,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu void ValueItemAcc::ParentDestroyed() { - const ::vos::OGuard aGuard( maMutex ); + const ::osl::MutexGuard aGuard( maMutex ); mpParent = NULL; } @@ -1068,7 +1068,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() void SAL_CALL ValueItemAcc::addEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( maMutex ); + const ::osl::MutexGuard aGuard( maMutex ); if( rxListener.is() ) { @@ -1093,7 +1093,7 @@ void SAL_CALL ValueItemAcc::addEventListener( const uno::Reference< accessibilit void SAL_CALL ValueItemAcc::removeEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException) { - const ::vos::OGuard aGuard( maMutex ); + const ::osl::MutexGuard aGuard( maMutex ); if( rxListener.is() ) { diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 93aacf9245f5..1c2d1812f8ad 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/list.hxx> #include <tools/color.hxx> #include <tools/string.hxx> @@ -204,7 +204,6 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); private: - // ::vos::OMutex maMutex; ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; ValueSet* mpParent; @@ -273,7 +272,7 @@ private: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener > > mxEventListeners; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; ValueSetItem* mpParent; bool mbIsTransientChildrenDisabled; diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index ce5991e8ae27..5103e8362ee7 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -66,7 +66,7 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace ::com::sun::star; diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 9ac11ab183ed..879bf684b5a6 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -32,7 +32,7 @@ #if defined UNX && defined ALPHA #include <fstream.hxx> #endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <ucbhelper/content.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 637df34c395f..3c477f045fc3 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -32,7 +32,7 @@ #include "descriptor.hxx" #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> #include <svl/itemprop.hxx> diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 34fade3fe7ad..19c8d904b3d9 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -30,7 +30,7 @@ #include "precompiled_svtools.hxx" #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 5043fe303c5b..045dca6fe5d9 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -30,7 +30,7 @@ #include "precompiled_svtools.hxx" #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/metaact.hxx> diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 809b50fc2c2d..d955fca30cac 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/propertysetinfo.hxx> diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index e534988bd652..3a0d3c8e2fd4 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -30,7 +30,7 @@ #include "precompiled_svtools.hxx" #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/metaact.hxx> diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index f4eca8e0f2b0..de44feea6f18 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -37,7 +37,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/dialog.hxx> #include <tools/link.hxx> diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index d2ae5bae8b95..887ae9b2c9f5 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/java/RestartRequiredException.hpp> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/rcid.h> #include <jvmfwk/framework.h> diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index dedab2947b7f..fea433503989 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -56,7 +56,7 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //=============================================== // namespace diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 7389b30bc142..741e62cb64a8 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "cliplistener.hxx" #include <svtools/transfer.hxx> diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index c12b827ed253..f146a84a969e 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/rcid.h> #include <vcl/wintypes.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 9ed80ae82971..c8bf04e2f464 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -54,7 +54,7 @@ #include <cppuhelper/implbase4.hxx> #include "vcl/svapp.hxx" #include <rtl/logfile.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace com::sun::star; diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 3d0b34e9fec7..19148344a6f4 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -54,7 +54,7 @@ #include <svtools/svtools.hrc> #include "imagemgr.hrc" #include <svtools/svtdata.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // globals ******************************************************************* diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index f4ee42cfeebd..50ad17317955 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -40,7 +40,7 @@ #endif #include <tools/postwin.h> #endif -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/memory.h> #include <rtl/uuid.h> #include <rtl/uri.hxx> diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index adc955af754a..3ef70f236b0d 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index 8fefc166a028..703ce138629a 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -75,7 +75,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); if ( m_pTabBar == NULL ) throw DisposedException( ::rtl::OUString(), *this ); @@ -91,7 +91,7 @@ namespace svt void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException) { { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); m_pTabBar = NULL; } VCLXWindow::dispose(); diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 0aa996ad3fe1..d99dfcefe855 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -75,7 +75,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); if ( m_pDeck == NULL ) throw DisposedException( ::rtl::OUString(), *this ); @@ -89,7 +89,7 @@ namespace svt void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException) { { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); m_pDeck = NULL; } VCLXWindow::dispose(); diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx index 4bf0e0fe5661..ce6d7300f23c 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx @@ -134,7 +134,7 @@ namespace svt //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext() { - ::vos::OGuard aSolarGuard( GetMutex() ); + ::osl::SolarMutexGuard aSolarGuard( GetMutex() ); return new ToolPanelDrawerContext( *this ); } diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 6c8239c88895..65834dd8b3cc 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -47,7 +47,7 @@ #include <osl/conditn.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <toolkit/unohlp.hxx> diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 53a99ec64609..5f1bc0de3ac1 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -31,7 +31,7 @@ #include <framestatuslistener.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::cppu; diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 8226fa6dd652..5d3a3bcdd53c 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -47,7 +47,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star::awt; diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 5079120b3bad..b1c050fe3eff 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -41,7 +41,7 @@ #include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::comphelper; diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 924543c0516b..bf828175532f 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -53,7 +53,7 @@ #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/logfile.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ // Defines diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 8547cd431edd..936853be6d10 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 823840010d11..447cf8f9715d 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -124,7 +124,7 @@ void SAL_CALL SVTXGridControl::removeSelectionListener(const ::com::sun::star::u void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TableControl* pTable = (TableControl*)GetWindow(); switch( GetPropertyId( PropertyName ) ) @@ -363,7 +363,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); const sal_uInt16 nPropId = GetPropertyId( PropertyName ); TableControl* pTable = (TableControl*)GetWindow(); @@ -422,7 +422,7 @@ void SVTXGridControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TableControl* pTable = (TableControl*)GetWindow(); if ( pTable ) { @@ -432,13 +432,13 @@ void SAL_CALL SVTXGridControl::setVisible( sal_Bool bVisible ) throw(::com::sun: } void SAL_CALL SVTXGridControl::setFocus() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow()) GetWindow()->GrabFocus(); } void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); std::vector< Any > newRow; Sequence< Any > rawRowData = Event.rowData; @@ -486,7 +486,7 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TableControl* pTable = (TableControl*)GetWindow(); if(Event.index == -1) @@ -529,7 +529,7 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri void SAL_CALL SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent& Event ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TableControl* pTable = (TableControl*)GetWindow(); if(Event.valueName == rtl::OUString::createFromAscii("ColumnResize")) @@ -578,7 +578,7 @@ void SAL_CALL SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid: } void SAL_CALL SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TableControl* pTable = (TableControl*)GetWindow(); if(Event.valueName == rtl::OUString::createFromAscii("RowHeight")) @@ -819,7 +819,7 @@ void SAL_CALL SVTXGridControl::selectColumn(::sal_Int32 x) throw (::com::sun::st } void SVTXGridControl::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 111416dfd5fe..2981959bf035 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <imgdef.hxx> #include <svtools/miscopt.hxx> diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 4d46b5039b31..b4bbbe61cfc1 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -487,7 +487,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -549,7 +549,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ChangeNodesSelection( rSelection, true, true ); return sal_True; } @@ -558,7 +558,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -625,7 +625,7 @@ void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (I void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); getTreeListBoxOrThrow().SelectAll( FALSE ); } @@ -633,7 +633,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException) sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return getTreeListBoxOrThrow().GetSelectionCount(); } @@ -679,7 +679,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -703,7 +703,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -729,7 +729,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return msDefaultExpandedGraphicURL; } @@ -737,7 +737,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com:: void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( msDefaultExpandedGraphicURL != sDefaultExpandedGraphicURL ) { if( sDefaultExpandedGraphicURL.getLength() ) @@ -767,7 +767,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return msDefaultCollapsedGraphicURL; } @@ -775,7 +775,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com: void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( msDefaultCollapsedGraphicURL != sDefaultCollapsedGraphicURL ) { if( sDefaultCollapsedGraphicURL.getLength() ) @@ -805,7 +805,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -816,7 +816,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return !isNodeExpanded( xNode ); } @@ -824,7 +824,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode > void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -836,7 +836,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -847,7 +847,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -859,7 +859,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -885,7 +885,7 @@ void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTr Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -903,7 +903,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -921,7 +921,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( i_Node, true ); @@ -934,7 +934,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); return rTree.IsEditingActive() ? sal_True : sal_False; @@ -944,7 +944,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException) sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); if( rTree.IsEditingActive() ) @@ -962,7 +962,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException) void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); rTree.EndEditing(FALSE); @@ -972,7 +972,7 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException) void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); UnoTreeListEntry* pEntry = getEntry( xNode ); @@ -1042,7 +1042,7 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const XubString& void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( mnEditLock != 0 ) return; @@ -1052,7 +1052,7 @@ void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tr void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( mnEditLock != 0 ) return; @@ -1062,7 +1062,7 @@ void SAL_CALL TreeControlPeer::treeNodesInserted( const ::com::sun::star::awt::t void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( mnEditLock != 0 ) return; @@ -1072,7 +1072,7 @@ void SAL_CALL TreeControlPeer::treeNodesRemoved( const ::com::sun::star::awt::tr void SAL_CALL TreeControlPeer::treeStructureChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( mnEditLock != 0 ) return; @@ -1242,7 +1242,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) void SAL_CALL TreeControlPeer::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException) { // model is disposed, so we clear our tree - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); rTree.Clear(); mxDataModel.clear(); @@ -1282,7 +1282,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere ::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz; /* todo @@ -1300,7 +1300,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere ::com::sun::star::awt::Size TreeControlPeer::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz = rNewSize; /* todo @@ -1317,7 +1317,7 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); @@ -1420,7 +1420,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); const sal_uInt16 nPropId = GetPropertyId( PropertyName ); if( (nPropId >= BASEPROPERTY_TREE_START) && (nPropId <= BASEPROPERTY_TREE_END) ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 83db17ef8640..daec6a674a59 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -226,7 +226,7 @@ void VCLXMultiLineEdit::removeTextListener( const ::com::sun::star::uno::Referen void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) @@ -243,7 +243,7 @@ void VCLXMultiLineEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); if ( pEdit ) @@ -255,7 +255,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel ::rtl::OUString VCLXMultiLineEdit::getText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); @@ -266,7 +266,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel ::rtl::OUString VCLXMultiLineEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); @@ -278,7 +278,7 @@ void VCLXMultiLineEdit::insertText( const ::com::sun::star::awt::Selection& rSel void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); if ( pMultiLineEdit ) @@ -289,7 +289,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS ::com::sun::star::awt::Selection VCLXMultiLineEdit::getSelection() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Selection aSel; MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); @@ -303,7 +303,7 @@ void VCLXMultiLineEdit::setSelection( const ::com::sun::star::awt::Selection& aS sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); return ( pMultiLineEdit && !pMultiLineEdit->IsReadOnly() && pMultiLineEdit->IsEnabled() ) ? sal_True : sal_False; @@ -311,7 +311,7 @@ sal_Bool VCLXMultiLineEdit::isEditable() throw(::com::sun::star::uno::RuntimeExc void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); if ( pMultiLineEdit ) @@ -320,7 +320,7 @@ void VCLXMultiLineEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); if ( pMultiLineEdit ) @@ -329,7 +329,7 @@ void VCLXMultiLineEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star:: sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*) GetWindow(); return pMultiLineEdit ? (sal_Int16)pMultiLineEdit->GetMaxTextLen() : (sal_Int16)0; @@ -337,7 +337,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim ::rtl::OUString VCLXMultiLineEdit::getTextLines() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; MultiLineEdit* pEdit = (MultiLineEdit*)GetWindow(); @@ -348,7 +348,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz; MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow(); @@ -364,7 +364,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim ::com::sun::star::awt::Size VCLXMultiLineEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz = rNewSize; MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow(); @@ -375,7 +375,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim ::com::sun::star::awt::Size VCLXMultiLineEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz; MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow(); @@ -386,7 +386,7 @@ sal_Int16 VCLXMultiLineEdit::getMaxTextLen() throw(::com::sun::star::uno::Runtim void VCLXMultiLineEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); nCols = nLines = 0; MultiLineEdit* pEdit = (MultiLineEdit*) GetWindow(); @@ -423,7 +423,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow(); if ( pMultiLineEdit ) @@ -479,7 +479,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any VCLXMultiLineEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; MultiLineEdit* pMultiLineEdit = (MultiLineEdit*)GetWindow(); @@ -523,7 +523,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const void SAL_CALL VCLXMultiLineEdit::setFocus( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); // don't grab the focus if we already have it. Reason is that the only thing which the edit // does is forwarding the focus to it's text window. This text window then does a "select all". @@ -578,7 +578,7 @@ IMPL_XTYPEPROVIDER_END void SAL_CALL VCLXFileControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pControl = (FileControl*)GetWindow(); if ( pControl ) @@ -628,7 +628,7 @@ void VCLXFileControl::removeTextListener( const ::com::sun::star::uno::Reference void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -643,7 +643,7 @@ void VCLXFileControl::setText( const ::rtl::OUString& aText ) throw(::com::sun:: void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl ) @@ -655,7 +655,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, ::rtl::OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; Window* pWindow = GetWindow(); @@ -666,7 +666,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, ::rtl::OUString VCLXFileControl::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; FileControl* pFileControl = (FileControl*) GetWindow(); @@ -678,7 +678,7 @@ void VCLXFileControl::insertText( const ::com::sun::star::awt::Selection& rSel, void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl ) @@ -687,7 +687,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel ::com::sun::star::awt::Selection VCLXFileControl::getSelection() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Selection aSel; FileControl* pFileControl = (FileControl*) GetWindow(); @@ -701,7 +701,7 @@ void VCLXFileControl::setSelection( const ::com::sun::star::awt::Selection& aSel sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); return ( pFileControl && !pFileControl->GetEdit().IsReadOnly() && pFileControl->GetEdit().IsEnabled() ) ? sal_True : sal_False; @@ -709,7 +709,7 @@ sal_Bool VCLXFileControl::isEditable() throw(::com::sun::star::uno::RuntimeExcep void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl ) @@ -718,7 +718,7 @@ void VCLXFileControl::setEditable( sal_Bool bEditable ) throw(::com::sun::star:: void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); if ( pFileControl ) @@ -727,7 +727,7 @@ void VCLXFileControl::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::un sal_Int16 VCLXFileControl::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FileControl* pFileControl = (FileControl*) GetWindow(); return pFileControl ? pFileControl->GetEdit().GetMaxTextLen() : 0; @@ -745,7 +745,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG ) ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz; FileControl* pControl = (FileControl*) GetWindow(); @@ -767,7 +767,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG ) ::com::sun::star::awt::Size VCLXFileControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz =rNewSize; FileControl* pControl = (FileControl*) GetWindow(); @@ -782,7 +782,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG ) ::com::sun::star::awt::Size VCLXFileControl::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz; FileControl* pControl = (FileControl*) GetWindow(); @@ -796,7 +796,7 @@ IMPL_LINK( VCLXFileControl, ModifyHdl, Edit*, EMPTYARG ) void VCLXFileControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); nCols = 0; nLines = 1; @@ -847,7 +847,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow ) // -------------------------------------------------------------------------------------- void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -972,7 +972,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const // -------------------------------------------------------------------------------------- ::com::sun::star::uno::Any SVTXFormattedField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; @@ -1433,7 +1433,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { case VCLEVENT_ROADMAP_ITEMSELECTED: { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) { @@ -1455,7 +1455,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) void SVTXRoadmap::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) { @@ -1524,7 +1524,7 @@ RMItemData SVTXRoadmap::GetRMItemData( const ::com::sun::star::container::Contai void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) { @@ -1537,7 +1537,7 @@ void SVTXRoadmap::elementInserted( const ::com::sun::star::container::ContainerE void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) { @@ -1551,7 +1551,7 @@ void SVTXRoadmap::elementRemoved( const ::com::sun::star::container::ContainerEv void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) { @@ -1567,7 +1567,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE // -------------------------------------------------------------------------------------- void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::svt::ORoadmap* pField = GetRoadmap(); if ( pField ) @@ -1622,7 +1622,7 @@ void SVTXRoadmap::setProperty( const ::rtl::OUString& PropertyName, const ::com: // -------------------------------------------------------------------------------------- ::com::sun::star::uno::Any SVTXRoadmap::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; @@ -1696,7 +1696,7 @@ IMPL_XTYPEPROVIDER_END void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1705,7 +1705,7 @@ void SVTXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetValue() : 0; @@ -1713,7 +1713,7 @@ double SVTXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1722,7 +1722,7 @@ void SVTXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetMinValue() : 0; @@ -1730,7 +1730,7 @@ double SVTXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException) void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1739,7 +1739,7 @@ void SVTXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetMaxValue() : 0; @@ -1747,7 +1747,7 @@ double SVTXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException) void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1756,7 +1756,7 @@ void SVTXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinFirst() : 0; @@ -1764,7 +1764,7 @@ double SVTXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1773,7 +1773,7 @@ void SVTXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinLast() : 0; @@ -1781,7 +1781,7 @@ double SVTXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1790,7 +1790,7 @@ void SVTXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno:: double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinSize() : 0; @@ -1798,7 +1798,7 @@ double SVTXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1807,7 +1807,7 @@ void SVTXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetDecimalDigits() : 0; @@ -1815,7 +1815,7 @@ sal_Int16 SVTXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1824,7 +1824,7 @@ void SVTXNumericField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::sta sal_Bool SVTXNumericField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->IsStrictFormat() : sal_False; @@ -1862,7 +1862,7 @@ IMPL_XTYPEPROVIDER_END void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1871,7 +1871,7 @@ void SVTXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetValue() : 0; @@ -1879,7 +1879,7 @@ double SVTXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1888,7 +1888,7 @@ void SVTXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetMinValue() : 0; @@ -1896,7 +1896,7 @@ double SVTXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1905,7 +1905,7 @@ void SVTXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetMaxValue() : 0; @@ -1913,7 +1913,7 @@ double SVTXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1922,7 +1922,7 @@ void SVTXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinFirst() : 0; @@ -1930,7 +1930,7 @@ double SVTXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1939,7 +1939,7 @@ void SVTXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinLast() : 0; @@ -1947,7 +1947,7 @@ double SVTXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1956,7 +1956,7 @@ void SVTXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno: double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetSpinSize() : 0; @@ -1964,7 +1964,7 @@ double SVTXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeExce void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1973,7 +1973,7 @@ void SVTXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->GetDecimalDigits() : 0; @@ -1981,7 +1981,7 @@ sal_Int16 SVTXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); if ( pField ) @@ -1990,7 +1990,7 @@ void SVTXCurrencyField::setStrictFormat( sal_Bool bStrict ) throw(::com::sun::st sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormattedField* pField = GetFormattedField(); return pField ? pField->IsStrictFormat() : sal_False; @@ -1998,7 +1998,7 @@ sal_Bool SVTXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; @@ -2038,7 +2038,7 @@ void SVTXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any SVTXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; @@ -2159,7 +2159,7 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XProgressBar void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2171,7 +2171,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2185,7 +2185,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); m_nValue = nValue; ImplUpdateValue(); @@ -2193,7 +2193,7 @@ void VCLXProgressBar::setValue( sal_Int32 nValue ) throw(::com::sun::star::uno:: void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( nMin < nMax ) { @@ -2213,7 +2213,7 @@ void VCLXProgressBar::setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::su sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return m_nValue; } @@ -2221,7 +2221,7 @@ sal_Int32 VCLXProgressBar::getValue() throw(::com::sun::star::uno::RuntimeExcept // ::com::sun::star::awt::VclWindowPeer void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ProgressBar* pProgressBar = (ProgressBar*)GetWindow(); if ( pProgressBar ) @@ -2279,7 +2279,7 @@ void VCLXProgressBar::setProperty( const ::rtl::OUString& PropertyName, const :: ::com::sun::star::uno::Any VCLXProgressBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ProgressBar* pProgressBar = (ProgressBar*)GetWindow(); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 7b8f62cf7e28..924654907fdc 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -47,7 +47,7 @@ #include <list> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "unoevent.hxx" diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index d3ef745b7bd5..fdca8b1919a6 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -41,7 +41,7 @@ #include <tools/diagnose_ex.h> #include <rtl/strbuf.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> //...................................................................................................................... diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx index de79b10ccd4a..300536d3951c 100644 --- a/toolkit/inc/pch/precompiled_toolkit.hxx +++ b/toolkit/inc/pch/precompiled_toolkit.hxx @@ -340,7 +340,7 @@ #include "vcl/vclenum.hxx" #include "vcl/virdev.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" //---MARKER--- #endif diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index d2b4e24d9b80..5cee7501ac34 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/weak.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/awt/XUnitConversion.hpp> @@ -58,7 +58,7 @@ class TOOLKIT_DLLPUBLIC VCLXDevice : public ::com::sun::star::awt::XDevice, friend class VCLXGraphics; private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + ::osl::SolarMutex& mrMutex; // Reference to SolarMutex OutputDevice* mpOutputDevice; public: @@ -66,7 +66,7 @@ public: sal_uInt32 nFlags; protected: - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + ::osl::SolarMutex& GetMutex() { return mrMutex; } void DestroyOutputDevice(); public: diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx index 16cd87cfb609..22266f3aa7fc 100644 --- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/weak.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/font.hxx> #include <tools/color.hxx> @@ -61,7 +61,7 @@ class VCLXGraphics : public ::com::sun::star::awt::XGraphics, public ::cppu::OWeakObject { private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + osl::SolarMutex& mrMutex; // Reference to SolarMutex ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice> mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben OutputDevice* mpOutputDevice; @@ -74,7 +74,7 @@ private: Region* mpClipRegion; protected: - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + osl::SolarMutex& GetMutex() { return mrMutex; } public: VCLXGraphics(); diff --git a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx index 38637fdbfab7..5c49313c1aed 100644 --- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx @@ -55,7 +55,7 @@ protected: bool isSystemDependentWindowPeer() const { return m_bWHWND; } - virtual ::vos::IMutex& GetMutexImpl() = 0; + virtual ::osl::SolarMutex& GetMutexImpl() = 0; virtual Window* GetWindowImpl() = 0; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0; @@ -96,7 +96,7 @@ class VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer { protected: - virtual vos::IMutex& GetMutexImpl(); + virtual osl::SolarMutex& GetMutexImpl(); virtual Window* GetWindowImpl(); virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl(); diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx index f38e5639971e..eab9eb76aa53 100644 --- a/toolkit/inc/toolkit/helper/throbberimpl.hxx +++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <vcl/timer.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //........................................................................ namespace toolkit @@ -44,7 +44,7 @@ namespace toolkit class Throbber_Impl { private: - NAMESPACE_VOS(IMutex)& mrMutex; // Reference to SolarMutex + osl::SolarMutex& mrMutex; // Reference to SolarMutex ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList; ::com::sun::star::uno::Reference< VCLXWindow > mxParent; @@ -56,7 +56,7 @@ namespace toolkit DECL_LINK( TimeOutHdl, Throbber_Impl* ); - NAMESPACE_VOS(IMutex)& GetMutex() { return mrMutex; } + osl::SolarMutex& GetMutex() { return mrMutex; } public: Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent, diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index f6945248a081..e912e83bd12e 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -30,7 +30,7 @@ #include "precompiled_toolkit.hxx" #include "vcl/svapp.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "sal/config.h" #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" @@ -125,7 +125,8 @@ void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XC { if ( Application::IsInMain() ) { - osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; + CallbackData* pCallbackData = new CallbackData( xCallback, aData ); Application::PostUserEvent( STATIC_LINK( this, AsyncCallback, Notify_Impl ), pCallbackData ); } diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 55d3c9287292..97aa746a43e9 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -36,7 +36,6 @@ /** === end UNO includes === **/ #include <cppuhelper/interfacecontainer.hxx> -#include <vos/mutex.hxx> #include <osl/mutex.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> @@ -70,11 +69,11 @@ namespace toolkit //================================================================================================================== struct WindowStyleSettings_Data { - ::vos::IMutex& rMutex; + ::osl::SolarMutex& rMutex; VCLXWindow* pOwningWindow; ::cppu::OInterfaceContainerHelper aStyleChangeListeners; - WindowStyleSettings_Data( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) + WindowStyleSettings_Data( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) :rMutex( i_rWindowMutex ) ,pOwningWindow( &i_rOwningWindow ) ,aStyleChangeListeners( i_rListenerMutex ) @@ -118,14 +117,14 @@ namespace toolkit } private: - ::vos::OGuard m_aGuard; + ::osl::SolarMutexGuard m_aGuard; }; //================================================================================================================== //= WindowStyleSettings //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - WindowStyleSettings::WindowStyleSettings( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) + WindowStyleSettings::WindowStyleSettings( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) :m_pData( new WindowStyleSettings_Data( i_rWindowMutex, i_rListenerMutex, i_rOwningWindow ) ) { Window* pWindow = i_rOwningWindow.GetWindow(); diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index c3640dbe118c..f9a1dff98ff0 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -36,10 +36,6 @@ #include <boost/scoped_ptr.hpp> -namespace vos -{ - class IMutex; -} namespace osl { class Mutex; @@ -61,7 +57,7 @@ namespace toolkit class WindowStyleSettings : public WindowStyleSettings_Base { public: - WindowStyleSettings( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ); + WindowStyleSettings( ::osl::SolarMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ); ~WindowStyleSettings(); void dispose(); diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 1c583ecb5cda..64af167d8c7d 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -77,21 +77,21 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XVclContainer void VCLXContainer::addVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); GetContainerListeners().addInterface( rxListener ); } void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclContainerListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); GetContainerListeners().removeInterface( rxListener ); } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > VCLXContainer::getWindows( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); // Bei allen Childs das Container-Interface abfragen... ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq; @@ -119,7 +119,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref // ::com::sun::star::awt::XVclContainerPeer void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -135,7 +135,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Tabs, sal_Bool bGroupControl ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); sal_uInt32 nCount = Components.getLength(); DBG_ASSERT( nCount == (sal_uInt32)Tabs.getLength(), "setTabOrder: TabCount != ComponentCount" ); @@ -180,7 +180,7 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > >& Components ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); sal_uInt32 nCount = Components.getLength(); const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); @@ -234,8 +234,4 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: } } - - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 060371905ad3..3d802bb9dbd1 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -112,7 +112,7 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XDevice, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXDevice::createGraphics( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > xRef; @@ -124,7 +124,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXDevice::createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > xRef; if ( GetOutputDevice() ) @@ -140,7 +140,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::awt::DeviceInfo VCLXDevice::getInfo() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::DeviceInfo aInfo; @@ -191,7 +191,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor > VCLXDevice::getFontDescriptors( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Sequence< ::com::sun::star::awt::FontDescriptor> aFonts; if( mpOutputDevice ) @@ -210,7 +210,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > VCLXDevice::getFont( const ::com::sun::star::awt::FontDescriptor& rDescriptor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > xRef; if( mpOutputDevice ) @@ -224,7 +224,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > VCLXDevice::createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; if( mpOutputDevice ) @@ -240,7 +240,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap > VCLXDevice::createDisplayBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rxBitmap ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); BitmapEx aBmp = VCLUnoHelper::GetBitmap( rxBitmap ); VCLXBitmap* pBmp = new VCLXBitmap; @@ -252,41 +252,20 @@ IMPL_XTYPEPROVIDER_END VCLXVirtualDevice::~VCLXVirtualDevice() { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); DestroyOutputDevice(); } // ----------------------------------------------------------------------------- -// ::com::sun::star::awt::XTextConstraints -// ----------------------------------------------------------------------------- -// ::sal_Int32 SAL_CALL VCLXDevice::getTextWidth( const ::rtl::OUString& Text ) throw (::com::sun::star::uno::RuntimeException) -// { -// ::vos::OGuard aGuard( GetMutex() ); -// if (Text.getLength() == 0) -// { -// return 0; -// } -// -// return 1; -// } -// -// ::sal_Int32 SAL_CALL VCLXDevice::getTextHeight( ) throw (::com::sun::star::uno::RuntimeException) -// { -// ::vos::OGuard aGuard( GetMutex() ); -// return 1; -// } - - -// ----------------------------------------------------------------------------- // Interface implementation of ::com::sun::star::awt::XUnitConversion // ----------------------------------------------------------------------------- ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { (void)aPoint; - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT ) { // percentage not allowed here @@ -311,7 +290,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice() ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToPixel( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { (void)aPoint; - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT || SourceUnit == com::sun::star::util::MeasureUnit::PIXEL ) { @@ -335,7 +314,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice() ::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { (void)aSize; - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if (TargetUnit == com::sun::star::util::MeasureUnit::PERCENT) { // percentage not allowed here @@ -360,7 +339,7 @@ VCLXVirtualDevice::~VCLXVirtualDevice() ::com::sun::star::awt::Size SAL_CALL VCLXDevice::convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { (void)aSize; - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if (SourceUnit == com::sun::star::util::MeasureUnit::PERCENT || SourceUnit == com::sun::star::util::MeasureUnit::PIXEL) { diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 4af3fabfa1ac..de96baff8009 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -80,7 +80,7 @@ VCLXDialog::~VCLXDialog() DBG_DTOR( VCLXDialog, NULL ); } -vos::IMutex& VCLXDialog::GetMutexImpl() +osl::SolarMutex& VCLXDialog::GetMutexImpl() { return VCLXWindow::GetMutex(); } @@ -102,7 +102,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXDialog, VCLXWindow, VCLXDialog_Base ); void SAL_CALL VCLXDialog::dispose() throw(::com::sun::star::uno::RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -147,7 +147,7 @@ void SAL_CALL VCLXDialog::allocateArea( const css::awt::Rectangle &rArea ) void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); switch ( _rVclWindowEvent.GetId() ) { @@ -162,7 +162,7 @@ void VCLXDialog::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any &Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -179,7 +179,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons ::com::sun::star::uno::Any SAL_CALL VCLXDialog::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aReturn; if ( GetWindow() ) @@ -200,7 +200,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, cons void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -209,7 +209,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -218,7 +218,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aTitle; Window* pWindow = GetWindow(); @@ -229,7 +229,7 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int16 nRet = 0; if ( GetWindow() ) @@ -253,7 +253,7 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException) void VCLXDialog::endDialog( sal_Int32 nResult ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( nResult == BUTTONID_HELP ) { diff --git a/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx index 0c2a2e14af8f..978519319d3a 100644 --- a/toolkit/source/awt/vclxdialog.hxx +++ b/toolkit/source/awt/vclxdialog.hxx @@ -54,7 +54,7 @@ private: VCLXDialog& operator=( const VCLXDialog& ); // never implemented protected: - vos::IMutex& GetMutexImpl(); + osl::SolarMutex& GetMutexImpl(); Window* GetWindowImpl(); ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl(); diff --git a/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx index 8401e79c4f86..443ba262c72e 100644 --- a/toolkit/source/awt/vclxfixedline.cxx +++ b/toolkit/source/awt/vclxfixedline.cxx @@ -63,7 +63,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXFixedLine, VCLXWindow ); void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -80,7 +80,7 @@ void SAL_CALL VCLXFixedLine::dispose() throw(RuntimeException) void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); /* switch ( _rVclWindowEvent.GetId() ) { @@ -96,7 +96,7 @@ void VCLXFixedLine::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -113,7 +113,7 @@ void SAL_CALL VCLXFixedLine::setProperty( const ::rtl::OUString& PropertyName, c Any SAL_CALL VCLXFixedLine::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Any aReturn; if ( GetWindow() ) diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index ae8bc088f2e3..b103452fa221 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -142,7 +142,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags ) ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXGraphics::getDevice() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( !mxDevice.is() && mpOutputDevice ) { @@ -155,7 +155,7 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags ) ::com::sun::star::awt::SimpleFontMetric VCLXGraphics::getFontMetric() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::SimpleFontMetric aM; if( mpOutputDevice ) @@ -168,56 +168,56 @@ void VCLXGraphics::InitOutputDevice( sal_uInt16 nFlags ) void VCLXGraphics::setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& rxFont ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maFont = VCLUnoHelper::CreateFont( rxFont ); } void VCLXGraphics::selectFont( const ::com::sun::star::awt::FontDescriptor& rDescription ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maFont = VCLUnoHelper::CreateFont( rDescription, Font() ); } void VCLXGraphics::setTextColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maTextColor = Color( (sal_uInt32)nColor ); } void VCLXGraphics::setTextFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maTextFillColor = Color( (sal_uInt32)nColor ); } void VCLXGraphics::setLineColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maLineColor = Color( (sal_uInt32)nColor ); } void VCLXGraphics::setFillColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); maFillColor = Color( (sal_uInt32)nColor ); } void VCLXGraphics::setRasterOp( ::com::sun::star::awt::RasterOperation eROP ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); meRasterOp = (RasterOp)eROP; } void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); delete mpClipRegion; if ( rxRegion.is() ) @@ -228,7 +228,7 @@ void VCLXGraphics::setClipRegion( const ::com::sun::star::uno::Reference< ::com: void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if ( rxRegion.is() ) { @@ -242,7 +242,7 @@ void VCLXGraphics::intersectClipRegion( const ::com::sun::star::uno::Reference< void VCLXGraphics::push( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) @@ -251,7 +251,7 @@ void VCLXGraphics::push( ) throw(::com::sun::star::uno::RuntimeException) void VCLXGraphics::pop( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) @@ -260,7 +260,7 @@ void VCLXGraphics::pop( ) throw(::com::sun::star::uno::RuntimeException) void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >& rxSource, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if ( mpOutputDevice ) { @@ -277,7 +277,7 @@ void VCLXGraphics::copy( const ::com::sun::star::uno::Reference< ::com::sun::sta void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayBitmap >& rxBitmapHandle, sal_Int32 nSourceX, sal_Int32 nSourceY, sal_Int32 nSourceWidth, sal_Int32 nSourceHeight, sal_Int32 nDestX, sal_Int32 nDestY, sal_Int32 nDestWidth, sal_Int32 nDestHeight ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -309,7 +309,7 @@ void VCLXGraphics::draw( const ::com::sun::star::uno::Reference< ::com::sun::sta void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -320,7 +320,7 @@ void VCLXGraphics::drawPixel( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star: void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -331,7 +331,7 @@ void VCLXGraphics::drawLine( sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -342,7 +342,7 @@ void VCLXGraphics::drawRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int3 void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 nHorzRound, sal_Int32 nVertRound ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -353,7 +353,7 @@ void VCLXGraphics::drawRoundedRect( sal_Int32 x, sal_Int32 y, sal_Int32 width, s void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -364,7 +364,7 @@ void VCLXGraphics::drawPolyLine( const ::com::sun::star::uno::Sequence< sal_Int3 void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -375,7 +375,7 @@ void VCLXGraphics::drawPolygon( const ::com::sun::star::uno::Sequence< sal_Int32 void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataX, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& DataY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -391,7 +391,7 @@ void VCLXGraphics::drawPolyPolygon( const ::com::sun::star::uno::Sequence< ::com void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -402,7 +402,7 @@ void VCLXGraphics::drawEllipse( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_I void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -413,7 +413,7 @@ void VCLXGraphics::drawArc( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -424,7 +424,7 @@ void VCLXGraphics::drawPie( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, sal_Int32 x1, sal_Int32 y1, sal_Int32 x2, sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -435,7 +435,7 @@ void VCLXGraphics::drawChord( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_Int32 height, const ::com::sun::star::awt::Gradient& rGradient ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -454,7 +454,7 @@ void VCLXGraphics::drawGradient( sal_Int32 x, sal_Int32 y, sal_Int32 width, sal_ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { @@ -465,7 +465,7 @@ void VCLXGraphics::drawText( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rT void VCLXGraphics::drawTextArray( sal_Int32 x, sal_Int32 y, const ::rtl::OUString& rText, const ::com::sun::star::uno::Sequence< sal_Int32 >& rLongs ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + osl::SolarMutexGuard aGuard( GetMutex() ); if( mpOutputDevice ) { diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 02d90f92eee8..6e1e036fe8e7 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -38,7 +38,7 @@ #include <cppuhelper/typeprovider.hxx> #include <rtl/memory.h> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/menu.hxx> #include <vcl/keycod.hxx> diff --git a/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx index 99e769a6fa3e..3b318eb4f48d 100644 --- a/toolkit/source/awt/vclxplugin.cxx +++ b/toolkit/source/awt/vclxplugin.cxx @@ -55,7 +55,7 @@ VCLXPlugin::~VCLXPlugin() void SAL_CALL VCLXPlugin::dispose() throw(uno::RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); lang::EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -72,7 +72,7 @@ void VCLXPlugin::SetPlugin( ::Control *p ) awt::Size SAL_CALL VCLXPlugin::getMinimumSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); if ( mpPlugin ) return AWTSize( mpPlugin->GetSizePixel() ); return awt::Size(); diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index c330de5aa047..093e02fc0efd 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -58,7 +58,7 @@ static sal_uInt16 nElements = 0; if( !pProperties ) { - ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !pProperties ) { static ::com::sun::star::beans::Property __FAR_DATA aPropTable[] = @@ -102,7 +102,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName ) : OPropertySetHelper( BrdcstHelper ) , mpPrinter( new Printer( rPrinterName ) ) { - osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; mnOrientation = 0; mbHorizontal = sal_False; @@ -110,7 +110,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName ) VCLXPrinterPropertySet::~VCLXPrinterPropertySet() { - osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; mpPrinter.reset(); } @@ -136,7 +136,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() static ::cppu::OPropertyArrayHelper* pPropertyArrayHelper = NULL; if ( !pPropertyArrayHelper ) { - ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !pPropertyArrayHelper ) { sal_uInt16 nElements; @@ -149,7 +149,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); sal_Bool bDifferent = sal_False; switch ( nHandle ) @@ -186,7 +186,7 @@ sal_Bool VCLXPrinterPropertySet::convertFastPropertyValue( ::com::sun::star::uno void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); switch( nHandle ) { @@ -209,7 +209,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const { - ::osl::Guard< ::osl::Mutex > aGuard( ((VCLXPrinterPropertySet*)this)->Mutex ); + ::osl::MutexGuard aGuard( ((VCLXPrinterPropertySet*)this)->Mutex ); switch( nHandle ) { @@ -229,7 +229,7 @@ void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& r // ::com::sun::star::awt::XPrinterPropertySet void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); ::com::sun::star::uno::Any aValue; aValue <<= bHorizontal; @@ -238,7 +238,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: ::com::sun::star::uno::Sequence< ::rtl::OUString > VCLXPrinterPropertySet::getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount(); ::com::sun::star::uno::Sequence< ::rtl::OUString > aDescriptions( nPaperBinCount ); @@ -258,7 +258,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); sal_Int32 nIndex = 0; sal_uInt16 nPaperBin = sal::static_int_cast< sal_uInt16 >( @@ -268,7 +268,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ::com::sun::star::uno::Sequence< sal_Int8 > VCLXPrinterPropertySet::getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; aMem << BINARYSETUPMARKER; @@ -278,7 +278,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem( (char*) data.getConstArray(), data.getLength(), STREAM_READ ); sal_uInt32 nMarker; @@ -325,7 +325,7 @@ IMPL_XTYPEPROVIDER_END sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); sal_Bool bDone = sal_True; if ( mpListener.get() ) @@ -339,7 +339,7 @@ sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nC void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); if ( mpListener.get() ) { @@ -350,14 +350,14 @@ void VCLXPrinter::end( ) throw(::com::sun::star::awt::PrinterException, ::com:: void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); mpListener.reset(); } ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinter::startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); if ( mpListener.get() ) { @@ -368,7 +368,7 @@ void VCLXPrinter::terminate( ) throw(::com::sun::star::uno::RuntimeException) void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); if ( mpListener.get() ) { @@ -411,7 +411,7 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::awt::XInfoPrinter ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(::com::sun::star::uno::RuntimeException) { - ::osl::Guard< ::osl::Mutex > aGuard( Mutex ); + ::osl::MutexGuard aGuard( Mutex ); return GetDevice(); } diff --git a/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx index 5117d550ec7b..7165b568cbb7 100644 --- a/toolkit/source/awt/vclxscroller.cxx +++ b/toolkit/source/awt/vclxscroller.cxx @@ -69,7 +69,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER1( VCLXScroller, VCLXWindow ); void SAL_CALL VCLXScroller::dispose() throw(RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -149,24 +149,12 @@ void SAL_CALL VCLXScroller::allocateArea( void VCLXScroller::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { -/* - ::vos::OClearableGuard aGuard( GetMutex() ); - - switch ( _rVclWindowEvent.GetId() ) - { - default: - aGuard.clear(); -*/ - VCLXWindow::ProcessWindowEvent( _rVclWindowEvent ); -/* - break; - } -*/ + VCLXWindow::ProcessWindowEvent( _rVclWindowEvent ); } void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, const Any &Value ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -185,7 +173,7 @@ void SAL_CALL VCLXScroller::setProperty( const ::rtl::OUString& PropertyName, co Any SAL_CALL VCLXScroller::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Any aReturn; if ( GetWindow() ) diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index 2cfd26649b55..d0f8ef35b9c6 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -93,7 +93,7 @@ namespace toolkit void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); EventObject aDisposeEvent; aDisposeEvent.Source = *this; @@ -123,9 +123,9 @@ namespace toolkit typedef long (SpinButton::*GetSpinButtonValue) (void) const; //................................................................ - void lcl_setSpinButtonValue( ::vos::IMutex& _rMutex, Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue ) + void lcl_setSpinButtonValue( ::osl::SolarMutex& _rMutex, Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue ) { - ::vos::OGuard aGuard( _rMutex ); + ::osl::SolarMutexGuard aGuard( _rMutex ); SpinButton* pSpinButton = static_cast< SpinButton* >( _pWindow ); if ( pSpinButton ) @@ -133,9 +133,9 @@ namespace toolkit } //................................................................ - sal_Int32 lcl_getSpinButtonValue( ::vos::IMutex& _rMutex, const Window* _pWindow, GetSpinButtonValue _pGetter ) + sal_Int32 lcl_getSpinButtonValue( ::osl::SolarMutex& _rMutex, const Window* _pWindow, GetSpinButtonValue _pGetter ) { - ::vos::OGuard aGuard( _rMutex ); + ::osl::SolarMutexGuard aGuard( _rMutex ); sal_Int32 nValue = 0; @@ -155,7 +155,7 @@ namespace toolkit //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); setMinimum( minValue ); setMaximum( maxValue ); @@ -207,7 +207,7 @@ namespace toolkit //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL ); } @@ -223,7 +223,7 @@ namespace toolkit //-------------------------------------------------------------------- void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); Reference< XSpinValue > xKeepAlive( this ); SpinButton* pSpinButton = static_cast< SpinButton* >( GetWindow() ); if ( !pSpinButton ) @@ -255,7 +255,7 @@ namespace toolkit //-------------------------------------------------------------------- void SAL_CALL VCLXSpinButton::setProperty( const ::rtl::OUString& PropertyName, const Any& Value ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nValue = 0; sal_Bool bIsLongValue = ( Value >>= nValue ); @@ -305,7 +305,7 @@ namespace toolkit //-------------------------------------------------------------------- Any SAL_CALL VCLXSpinButton::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Any aReturn; diff --git a/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx index 712bca05d6b7..4e422a79067b 100644 --- a/toolkit/source/awt/vclxsplitter.cxx +++ b/toolkit/source/awt/vclxsplitter.cxx @@ -107,7 +107,7 @@ VCLXSplitter::getChild( int i ) void SAL_CALL VCLXSplitter::dispose() throw(RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 73f70d9118f9..d2ff5cb9cc98 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -80,7 +80,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Any VCLXSystemDependentWindow::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); // TODO, check the process id ::com::sun::star::uno::Any aRet; diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx index 0cfc90a53c04..c88d4405fdd9 100644 --- a/toolkit/source/awt/vclxtabcontrol.cxx +++ b/toolkit/source/awt/vclxtabcontrol.cxx @@ -100,7 +100,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXTabControl, VCLXWindow, VCLXTabControl_Bas void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -220,7 +220,7 @@ uno::Sequence< NamedValue > SAL_CALL VCLXTabControl::getTabProps( sal_Int32 ID ) // TODO: draw tab border here void SAL_CALL VCLXTabControl::draw( sal_Int32 nX, sal_Int32 nY ) throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TabControl *pTabControl = getTabControl(); TabPage *pTabPage = pTabControl->GetTabPage( sal::static_int_cast< USHORT >( getActiveTabID() ) ); @@ -447,7 +447,7 @@ awt::Size SAL_CALL VCLXTabControl::getMinimumSize() void VCLXTabControl::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { - ::vos::OClearableGuard aGuard( GetMutex() ); + ::osl::ClearableSolarMutexGuard aGuard( GetMutex() ); TabControl* pTabControl = static_cast< TabControl* >( GetWindow() ); if ( !pTabControl ) return; diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx index 2f80ce3dca6a..642f6883f6c3 100644 --- a/toolkit/source/awt/vclxtabpage.cxx +++ b/toolkit/source/awt/vclxtabpage.cxx @@ -66,7 +66,7 @@ VCLXTabPage::~VCLXTabPage() void SAL_CALL VCLXTabPage::dispose() throw(uno::RuntimeException) { { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); lang::EventObject aDisposeEvent; aDisposeEvent.Source = W3K_EXPLICIT_CAST (*this); @@ -135,7 +135,7 @@ void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area ) awt::Size SAL_CALL VCLXTabPage::getMinimumSize() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return Bin::getMinimumSize(); } diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 66e5e7b35e8b..5ad7680f31c5 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -93,7 +93,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) ::com::sun::star::uno::Any VCLXTopWindow_Base::getWindowHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); // TODO, check the process id ::com::sun::star::uno::Any aRet; @@ -134,21 +134,21 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) void VCLXTopWindow_Base::addTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); GetTopWindowListenersImpl().addInterface( rxListener ); } void VCLXTopWindow_Base::removeTopWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); GetTopWindowListenersImpl().removeInterface( rxListener ); } void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); Window* pWindow = GetWindowImpl(); if ( pWindow ) @@ -161,7 +161,7 @@ void VCLXTopWindow_Base::toBack( ) throw(::com::sun::star::uno::RuntimeExceptio void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& rxMenu ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); SystemWindow* pWindow = (SystemWindow*) GetWindowImpl(); if ( pWindow ) @@ -180,7 +180,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c //-------------------------------------------------------------------- ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() ); if ( !pWindow ) @@ -192,7 +192,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c //-------------------------------------------------------------------- void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() ); if ( !pWindow ) @@ -204,7 +204,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro //-------------------------------------------------------------------- ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); const WorkWindow* pWindow = dynamic_cast< const WorkWindow* >( GetWindowImpl() ); if ( !pWindow ) @@ -216,7 +216,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro //-------------------------------------------------------------------- void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); WorkWindow* pWindow = dynamic_cast< WorkWindow* >( GetWindowImpl() ); if ( !pWindow ) @@ -228,7 +228,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); const SystemWindow* pWindow = dynamic_cast< const SystemWindow* >( GetWindowImpl() ); if ( !pWindow ) @@ -240,7 +240,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro //-------------------------------------------------------------------- void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (RuntimeException, IndexOutOfBoundsException) { - ::vos::OGuard aGuard( GetMutexImpl() ); + ::osl::SolarMutexGuard aGuard( GetMutexImpl() ); if ( ( _display < 0 ) || ( _display >= (sal_Int32)Application::GetScreenCount() ) ) throw IndexOutOfBoundsException(); @@ -270,7 +270,7 @@ VCLXTopWindow::~VCLXTopWindow() { } -vos::IMutex& VCLXTopWindow::GetMutexImpl() +osl::SolarMutex& VCLXTopWindow::GetMutexImpl() { return VCLXContainer::GetMutex(); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 2372d47f96de..a8e272876031 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -128,7 +128,7 @@ private: private: VCLXWindow& mrAntiImpl; - ::vos::IMutex& mrMutex; + ::osl::SolarMutex& mrMutex; ::toolkit::AccessibilityClient maAccFactory; bool mbDisposed; bool mbDrawingOntoParent; // no bit mask, is passed around by reference @@ -181,7 +181,7 @@ public: the <type>VCLXWindow</type> instance which the object belongs to. Must live longer then the object just being constructed. */ - VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex, bool _bWithDefaultProps ); + VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::osl::SolarMutex& _rMutex, bool _bWithDefaultProps ); /** synchronously mbEnableVisible */ @@ -237,7 +237,7 @@ private: }; //-------------------------------------------------------------------- -VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex, bool _bWithDefaultProps ) +VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::osl::SolarMutex& _rMutex, bool _bWithDefaultProps ) :mrAntiImpl( _rAntiImpl ) ,mrMutex( _rMutex ) ,mbDisposed( false ) @@ -276,7 +276,7 @@ VCLXWindowImpl::~VCLXWindowImpl() //-------------------------------------------------------------------- void VCLXWindowImpl::disposing() { - ::vos::OGuard aGuard( mrMutex ); + ::osl::SolarMutexGuard aGuard( mrMutex ); if ( mnCallbackEventId ) Application::RemoveUserEvent( mnCallbackEventId ); mnCallbackEventId = 0; @@ -323,7 +323,7 @@ IMPL_LINK( VCLXWindowImpl, OnProcessCallbacks, void*, EMPTYARG ) // work on a copy of the callback array CallbackArray aCallbacksCopy; { - ::vos::OGuard aGuard( mrMutex ); + ::osl::SolarMutexGuard aGuard( mrMutex ); aCallbacksCopy = maCallbackEvents; maCallbackEvents.clear(); @@ -366,7 +366,7 @@ void SAL_CALL VCLXWindowImpl::release() //-------------------------------------------------------------------- Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() { - ::vos::OGuard aGuard( mrMutex ); + ::osl::SolarMutexGuard aGuard( mrMutex ); if ( mbDisposed ) throw DisposedException( ::rtl::OUString(), mrAntiImpl ); if ( !mxWindowStyleSettings.is() ) @@ -943,7 +943,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) uno::Reference< accessibility::XAccessibleContext > VCLXWindow::CreateAccessibleContext() { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return getAccessibleFactory().createAccessibleContext( this ); } @@ -979,7 +979,7 @@ IMPL_XUNOTUNNEL2( VCLXWindow, VCLXDevice ) // ::com::sun::star::lang::Component void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->mxViewGraphics = NULL; @@ -1018,14 +1018,14 @@ void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException) void VCLXWindow::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getEventListeners().addInterface( rxListener ); } void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getEventListeners().removeInterface( rxListener ); } @@ -1034,7 +1034,7 @@ void VCLXWindow::removeEventListener( const ::com::sun::star::uno::Reference< :: // ::com::sun::star::awt::XWindow void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -1047,7 +1047,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 ::com::sun::star::awt::Rectangle VCLXWindow::getPosSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Rectangle aBounds; if ( GetWindow() ) @@ -1063,7 +1063,7 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -1088,7 +1088,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -1100,7 +1100,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt void VCLXWindow::setFocus( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) GetWindow()->GrabFocus(); @@ -1108,7 +1108,7 @@ void VCLXWindow::setFocus( ) throw(::com::sun::star::uno::RuntimeException) void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getWindowListeners().addInterface( rxListener ); @@ -1123,7 +1123,7 @@ void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::co void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Reference< XWindowListener2 > xListener2( rxListener, UNO_QUERY ); if ( xListener2.is() ) @@ -1134,61 +1134,61 @@ void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< : void VCLXWindow::addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getFocusListeners().addInterface( rxListener ); } void VCLXWindow::removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getFocusListeners().removeInterface( rxListener ); } void VCLXWindow::addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getKeyListeners().addInterface( rxListener ); } void VCLXWindow::removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getKeyListeners().removeInterface( rxListener ); } void VCLXWindow::addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getMouseListeners().addInterface( rxListener ); } void VCLXWindow::removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getMouseListeners().removeInterface( rxListener ); } void VCLXWindow::addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getMouseMotionListeners().addInterface( rxListener ); } void VCLXWindow::removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getMouseMotionListeners().removeInterface( rxListener ); } void VCLXWindow::addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getPaintListeners().addInterface( rxListener ); } void VCLXWindow::removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getPaintListeners().removeInterface( rxListener ); } @@ -1202,7 +1202,7 @@ void VCLXWindow::removePaintListener( const ::com::sun::star::uno::Reference< :: void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPointer >& rxPointer ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); VCLXPointer* pPointer = VCLXPointer::GetImplementation( rxPointer ); if ( pPointer ) @@ -1215,7 +1215,7 @@ void VCLXWindow::setPointer( const ::com::sun::star::uno::Reference< ::com::sun: void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -1235,7 +1235,7 @@ void VCLXWindow::setBackground( sal_Int32 nColor ) throw(::com::sun::star::uno:: void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) GetWindow()->Invalidate( (sal_uInt16) nInvalidateFlags ); @@ -1243,7 +1243,7 @@ void VCLXWindow::invalidate( sal_Int16 nInvalidateFlags ) throw(::com::sun::star void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect, sal_Int16 nInvalidateFlags ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) GetWindow()->Invalidate( VCLRectangle(rRect), (sal_uInt16) nInvalidateFlags ); @@ -1253,7 +1253,7 @@ void VCLXWindow::invalidateRect( const ::com::sun::star::awt::Rectangle& rRect, // ::com::sun::star::awt::XVclWindowPeer sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& rxPeer ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Bool bIsChild = sal_False; Window* pWindow = GetWindow(); @@ -1268,20 +1268,20 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun void VCLXWindow::setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->mbDesignMode = bOn; } sal_Bool VCLXWindow::isDesignMode( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return mpImpl->mbDesignMode; } void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) GetWindow()->EnableClipSiblings( bClip ); @@ -1289,7 +1289,7 @@ void VCLXWindow::enableClipSiblings( sal_Bool bClip ) throw(::com::sun::star::un void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -1300,7 +1300,7 @@ void VCLXWindow::setForeground( sal_Int32 nColor ) throw(::com::sun::star::uno:: void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rFont ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) GetWindow()->SetControlFont( VCLUnoHelper::CreateFont( rFont, GetWindow()->GetControlFont() ) ); @@ -1308,7 +1308,7 @@ void VCLXWindow::setControlFont( const ::com::sun::star::awt::FontDescriptor& rF void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -1462,7 +1462,7 @@ namespace void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( !pWindow ) @@ -1995,7 +1995,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::com::sun::star::uno::Any VCLXWindow::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; if ( GetWindow() ) @@ -2235,7 +2235,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size VCLXWindow::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); // Diese Methode sollte nur fuer Componenten gerufen werden, die zwar // ueber das ::com::sun::star::awt::Toolkit erzeugt werden koennen, aber fuer die es @@ -2279,7 +2279,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::com::sun::star::awt::Size VCLXWindow::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aNewSize( rNewSize ); ::com::sun::star::awt::Size aMinSize = getMinimumSize(); @@ -2296,7 +2296,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: // ::com::sun::star::awt::XView sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& rxDevice ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( VCLUnoHelper::GetOutputDevice( rxDevice ) ) mpImpl->mxViewGraphics = rxDevice; @@ -2308,14 +2308,14 @@ sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > VCLXWindow::getGraphics( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return mpImpl->mxViewGraphics; } ::com::sun::star::awt::Size VCLXWindow::getSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; if ( GetWindow() ) @@ -2325,7 +2325,7 @@ sal_Bool VCLXWindow::setGraphics( const ::com::sun::star::uno::Reference< ::com: void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( !pWindow ) @@ -2421,7 +2421,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -2437,7 +2437,7 @@ void VCLXWindow::setZoom( float fZoomX, float /*fZoomY*/ ) throw(::com::sun::sta // ::com::sun::star::lang::XEventListener void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); // check if it comes from our AccessibleContext uno::Reference< uno::XInterface > aAC( mpImpl->mxAccessibleContext, uno::UNO_QUERY ); @@ -2454,7 +2454,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& { using namespace ::com::sun::star; - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); // already disposed if( ! mpImpl ) @@ -2478,7 +2478,7 @@ void SAL_CALL VCLXWindow::disposing( const ::com::sun::star::lang::EventObject& // ::com::sun::star::awt::XDockable void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( xListener.is() ) mpImpl->getDockableWindowListeners().addInterface( xListener ); @@ -2487,14 +2487,14 @@ void SAL_CALL VCLXWindow::addDockableWindowListener( const ::com::sun::star::uno void SAL_CALL VCLXWindow::removeDockableWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mpImpl->getDockableWindowListeners().removeInterface( xListener ); } void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2503,7 +2503,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::s sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if( pWindow ) @@ -2514,7 +2514,7 @@ sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (::com::sun::star::uno::Runti void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if( pWindow ) @@ -2523,7 +2523,7 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::su sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if( pWindow ) @@ -2534,7 +2534,7 @@ sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (::com::sun::star::uno::Runtime void SAL_CALL VCLXWindow::lock( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) ) @@ -2543,7 +2543,7 @@ void SAL_CALL VCLXWindow::lock( ) throw (::com::sun::star::uno::RuntimeExceptio void SAL_CALL VCLXWindow::unlock( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) ) @@ -2552,14 +2552,14 @@ void SAL_CALL VCLXWindow::unlock( ) throw (::com::sun::star::uno::RuntimeExcept void SAL_CALL VCLXWindow::startPopupMode( const ::com::sun::star::awt::Rectangle& ) throw (::com::sun::star::uno::RuntimeException) { // TODO: remove interface in the next incompatible build - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); } sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (::com::sun::star::uno::RuntimeException) { // TODO: remove interface in the next incompatible build - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return FALSE; } @@ -2568,7 +2568,7 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (::com::sun::star::uno::Ru void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window *pWindow; if( (pWindow = GetWindow()) != NULL ) { @@ -2582,7 +2582,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz ::com::sun::star::awt::Size SAL_CALL VCLXWindow::getOutputSize( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window *pWindow; if( (pWindow = GetWindow()) != NULL ) { @@ -2598,7 +2598,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz sal_Bool SAL_CALL VCLXWindow::isVisible( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( GetWindow() ) return GetWindow()->IsVisible(); else @@ -2607,7 +2607,7 @@ sal_Bool SAL_CALL VCLXWindow::isVisible( ) throw (::com::sun::star::uno::Runtim sal_Bool SAL_CALL VCLXWindow::isActive( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( GetWindow() ) return GetWindow()->IsActive(); else @@ -2617,7 +2617,7 @@ sal_Bool SAL_CALL VCLXWindow::isActive( ) throw (::com::sun::star::uno::Runtime sal_Bool SAL_CALL VCLXWindow::isEnabled( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( GetWindow() ) return GetWindow()->IsEnabled(); else @@ -2626,7 +2626,7 @@ sal_Bool SAL_CALL VCLXWindow::isEnabled( ) throw (::com::sun::star::uno::Runtim sal_Bool SAL_CALL VCLXWindow::hasFocus( ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if( GetWindow() ) return GetWindow()->HasFocus(); else @@ -2638,7 +2638,7 @@ sal_Bool SAL_CALL VCLXWindow::hasFocus( ) throw (::com::sun::star::uno::Runtime UnoPropertyArrayHelper * VCLXWindow::GetPropHelper() { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( mpImpl->mpPropHelper == NULL ) { std::list< sal_uInt16 > aIDs; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a0284c9fd441..adf8d970fac9 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -223,7 +223,7 @@ void VCLXGraphicControl::ImplSetNewImage() void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -236,7 +236,7 @@ void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Button* pButton = static_cast< Button* >( GetWindow() ); if ( !pButton ) @@ -289,7 +289,7 @@ void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; if ( !GetWindow() ) @@ -389,7 +389,7 @@ VCLXButton::~VCLXButton() void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -400,31 +400,31 @@ void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } void VCLXButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.addInterface( l ); } void VCLXButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.removeInterface( l ); } void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -433,14 +433,14 @@ void VCLXButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::sta void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionCommand = rCommand; } ::com::sun::star::awt::Size VCLXButton::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; PushButton* pButton = (PushButton*) GetWindow(); @@ -459,7 +459,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com ::com::sun::star::awt::Size VCLXButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = VCLSize(rNewSize); PushButton* pButton = (PushButton*) GetWindow(); @@ -487,7 +487,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Button* pButton = (Button*)GetWindow(); if ( pButton ) @@ -532,7 +532,7 @@ void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::com::sun::star::uno::Any VCLXButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; Button* pButton = (Button*)GetWindow(); @@ -664,7 +664,7 @@ void VCLXImageControl::ImplSetNewImage() ::com::sun::star::awt::Size VCLXImageControl::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = GetBitmap().GetSizePixel(); aSz = ImplCalcWindowSize( aSz ); @@ -679,7 +679,7 @@ void VCLXImageControl::ImplSetNewImage() ::com::sun::star::awt::Size VCLXImageControl::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz = rNewSize; ::com::sun::star::awt::Size aMinSz = getMinimumSize(); @@ -692,7 +692,7 @@ void VCLXImageControl::ImplSetNewImage() void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ImageControl* pImageControl = (ImageControl*)GetWindow(); @@ -728,7 +728,7 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const : ::com::sun::star::uno::Any VCLXImageControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ImageControl* pImageControl = (ImageControl*)GetWindow(); @@ -812,7 +812,7 @@ IMPL_XTYPEPROVIDER_END void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -822,37 +822,37 @@ void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXCheckBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.addInterface( l ); } void VCLXCheckBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.removeInterface( l ); } void VCLXCheckBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXCheckBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } void VCLXCheckBox::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionCommand = rCommand; } void VCLXCheckBox::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -861,7 +861,7 @@ void VCLXCheckBox::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::s void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); CheckBox* pCheckBox = (CheckBox*)GetWindow(); if ( pCheckBox) @@ -889,7 +889,7 @@ void VCLXCheckBox::setState( short n ) throw(::com::sun::star::uno::RuntimeExcep short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); short nState = -1; CheckBox* pCheckBox = (CheckBox*)GetWindow(); @@ -909,7 +909,7 @@ short VCLXCheckBox::getState() throw(::com::sun::star::uno::RuntimeException) void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); CheckBox* pCheckBox = (CheckBox*)GetWindow(); if ( pCheckBox) @@ -918,7 +918,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run ::com::sun::star::awt::Size VCLXCheckBox::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; CheckBox* pCheckBox = (CheckBox*) GetWindow(); @@ -934,7 +934,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run ::com::sun::star::awt::Size VCLXCheckBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = VCLSize(rNewSize); CheckBox* pCheckBox = (CheckBox*) GetWindow(); @@ -951,7 +951,7 @@ void VCLXCheckBox::enableTriState( sal_Bool b ) throw(::com::sun::star::uno::Run void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); CheckBox* pCheckBox = (CheckBox*)GetWindow(); if ( pCheckBox ) @@ -987,7 +987,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com ::com::sun::star::uno::Any VCLXCheckBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; CheckBox* pCheckBox = (CheckBox*)GetWindow(); @@ -1114,7 +1114,7 @@ IMPL_XTYPEPROVIDER_END void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -1124,7 +1124,7 @@ void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); RadioButton* pButton = (RadioButton*)GetWindow(); if ( pButton ) @@ -1166,7 +1166,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: ::com::sun::star::uno::Any VCLXRadioButton::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; RadioButton* pButton = (RadioButton*)GetWindow(); @@ -1195,31 +1195,31 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: void VCLXRadioButton::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.addInterface( l ); } void VCLXRadioButton::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.removeInterface( l ); } void VCLXRadioButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXRadioButton::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -1228,13 +1228,13 @@ void VCLXRadioButton::setLabel( const ::rtl::OUString& rLabel ) throw(::com::sun void VCLXRadioButton::setActionCommand( const ::rtl::OUString& rCommand ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionCommand = rCommand; } void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); RadioButton* pRadioButton = (RadioButton*)GetWindow(); if ( pRadioButton) @@ -1253,7 +1253,7 @@ void VCLXRadioButton::setState( sal_Bool b ) throw(::com::sun::star::uno::Runtim sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); RadioButton* pRadioButton = (RadioButton*)GetWindow(); return pRadioButton ? pRadioButton->IsChecked() : sal_False; @@ -1261,7 +1261,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti ::com::sun::star::awt::Size VCLXRadioButton::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; RadioButton* pRadioButton = (RadioButton*) GetWindow(); @@ -1277,7 +1277,7 @@ sal_Bool VCLXRadioButton::getState() throw(::com::sun::star::uno::RuntimeExcepti ::com::sun::star::awt::Size VCLXRadioButton::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = VCLSize(rNewSize); RadioButton* pRadioButton = (RadioButton*) GetWindow(); @@ -1376,19 +1376,19 @@ IMPL_XTYPEPROVIDER_END void VCLXSpinField::addSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maSpinListeners.addInterface( l ); } void VCLXSpinField::removeSpinListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XSpinListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maSpinListeners.removeInterface( l ); } void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); SpinField* pSpinField = (SpinField*) GetWindow(); if ( pSpinField ) @@ -1397,7 +1397,7 @@ void VCLXSpinField::up() throw(::com::sun::star::uno::RuntimeException) void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); SpinField* pSpinField = (SpinField*) GetWindow(); if ( pSpinField ) @@ -1406,7 +1406,7 @@ void VCLXSpinField::down() throw(::com::sun::star::uno::RuntimeException) void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); SpinField* pSpinField = (SpinField*) GetWindow(); if ( pSpinField ) @@ -1415,7 +1415,7 @@ void VCLXSpinField::first() throw(::com::sun::star::uno::RuntimeException) void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); SpinField* pSpinField = (SpinField*) GetWindow(); if ( pSpinField ) @@ -1424,7 +1424,7 @@ void VCLXSpinField::last() throw(::com::sun::star::uno::RuntimeException) void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -1523,7 +1523,7 @@ VCLXListBox::VCLXListBox() void VCLXListBox::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -1534,31 +1534,31 @@ void VCLXListBox::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXListBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.addInterface( l ); } void VCLXListBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.removeInterface( l ); } void VCLXListBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXListBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1567,7 +1567,7 @@ void VCLXListBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw( void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1591,7 +1591,7 @@ void VCLXListBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStri void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1603,7 +1603,7 @@ void VCLXListBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::s sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); return pBox ? pBox->GetEntryCount() : 0; @@ -1611,7 +1611,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept ::rtl::OUString VCLXListBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); String aItem; ListBox* pBox = (ListBox*) GetWindow(); @@ -1622,7 +1622,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getItems() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; ListBox* pBox = (ListBox*) GetWindow(); @@ -1641,7 +1641,7 @@ sal_Int16 VCLXListBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcept sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); return pBox ? pBox->GetSelectEntryPos() : 0; @@ -1649,7 +1649,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime ::com::sun::star::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Sequence<sal_Int16> aSeq; ListBox* pBox = (ListBox*) GetWindow(); @@ -1665,7 +1665,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime ::rtl::OUString VCLXListBox::getSelectedItem() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); String aItem; ListBox* pBox = (ListBox*) GetWindow(); @@ -1676,7 +1676,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXListBox::getSelectedItems() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; ListBox* pBox = (ListBox*) GetWindow(); @@ -1692,7 +1692,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() throw(::com::sun::star::uno::Runtime void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox && ( pBox->IsEntryPosSelected( nPos ) != bSelect ) ) @@ -1711,7 +1711,7 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com: void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int16>& aPositions, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1742,7 +1742,7 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1 void VCLXListBox::selectItem( const ::rtl::OUString& rItemText, sal_Bool bSelect ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1755,7 +1755,7 @@ void VCLXListBox::selectItem( const ::rtl::OUString& rItemText, sal_Bool bSelect void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1764,7 +1764,7 @@ void VCLXListBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::sta sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int16 nLines = 0; ListBox* pBox = (ListBox*) GetWindow(); @@ -1775,7 +1775,7 @@ sal_Int16 VCLXListBox::getDropDownLineCount() throw(::com::sun::star::uno::Runti sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Bool bMulti = sal_False; ListBox* pBox = (ListBox*) GetWindow(); @@ -1786,7 +1786,7 @@ sal_Bool VCLXListBox::isMutipleMode() throw(::com::sun::star::uno::RuntimeExcept void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1795,7 +1795,7 @@ void VCLXListBox::setMultipleMode( sal_Bool bMulti ) throw(::com::sun::star::uno void VCLXListBox::makeVisible( sal_Int16 nEntry ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pBox = (ListBox*) GetWindow(); if ( pBox ) @@ -1854,14 +1854,14 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXListBox::CreateAccessibleContext() { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return getAccessibleFactory().createAccessibleContext( this ); } void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = (ListBox*)GetWindow(); if ( pListBox ) @@ -1938,7 +1938,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: ::com::sun::star::uno::Any VCLXListBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ListBox* pListBox = (ListBox*)GetWindow(); @@ -1992,7 +1992,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: ::com::sun::star::awt::Size VCLXListBox::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ListBox* pListBox = (ListBox*) GetWindow(); @@ -2003,7 +2003,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: ::com::sun::star::awt::Size VCLXListBox::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ListBox* pListBox = (ListBox*) GetWindow(); @@ -2018,7 +2018,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: ::com::sun::star::awt::Size VCLXListBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = VCLSize(rNewSize); ListBox* pListBox = (ListBox*) GetWindow(); @@ -2029,7 +2029,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: ::com::sun::star::awt::Size VCLXListBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ListBox* pListBox = (ListBox*) GetWindow(); @@ -2040,7 +2040,7 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: void VCLXListBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); nCols = nLines = 0; ListBox* pListBox = (ListBox*) GetWindow(); @@ -2098,7 +2098,7 @@ namespace void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() ); @@ -2113,7 +2113,7 @@ void SAL_CALL VCLXListBox::listItemInserted( const ItemListEvent& i_rEvent ) thr void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() ); @@ -2126,7 +2126,7 @@ void SAL_CALL VCLXListBox::listItemRemoved( const ItemListEvent& i_rEvent ) thro void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() ); @@ -2145,7 +2145,7 @@ void SAL_CALL VCLXListBox::listItemModified( const ItemListEvent& i_rEvent ) thr void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pListBox, "VCLXListBox::listItemModified: no ListBox?!" ); @@ -2157,7 +2157,7 @@ void SAL_CALL VCLXListBox::allItemsRemoved( const EventObject& i_rEvent ) throw void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ListBox* pListBox = dynamic_cast< ListBox* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pListBox, "VCLXListBox::listItemModified: no ListBox?!" ); @@ -2228,7 +2228,7 @@ IMPL_XTYPEPROVIDER_END void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2237,7 +2237,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com: ::rtl::OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); String aText; Window* pWindow = GetWindow(); @@ -2248,7 +2248,7 @@ void VCLXMessageBox::setCaptionText( const ::rtl::OUString& rText ) throw(::com: void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MessBox* pBox = (MessBox*)GetWindow(); if ( pBox ) @@ -2257,7 +2257,7 @@ void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com: ::rtl::OUString VCLXMessageBox::getMessageText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; MessBox* pBox = (MessBox*)GetWindow(); @@ -2268,7 +2268,7 @@ void VCLXMessageBox::setMessageText( const ::rtl::OUString& rText ) throw(::com: sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); MessBox* pBox = (MessBox*)GetWindow(); return pBox ? pBox->Execute() : 0; @@ -2276,7 +2276,7 @@ sal_Int16 VCLXMessageBox::execute() throw(::com::sun::star::uno::RuntimeExceptio ::com::sun::star::awt::Size SAL_CALL VCLXMessageBox::getMinimumSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return ::com::sun::star::awt::Size( 250, 100 ); } @@ -2319,7 +2319,7 @@ IMPL_XTYPEPROVIDER_END void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Dialog* pDialog = dynamic_cast< Dialog* >( GetWindow() ); if ( pDialog ) @@ -2328,7 +2328,7 @@ void SAL_CALL VCLXDialog::endDialog( ::sal_Int32 i_result ) throw (RuntimeExcept void SAL_CALL VCLXDialog::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2337,7 +2337,7 @@ void SAL_CALL VCLXDialog::setHelpId( ::sal_Int32 i_id ) throw (RuntimeException) void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2346,7 +2346,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aTitle; Window* pWindow = GetWindow(); @@ -2357,7 +2357,7 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int16 nRet = 0; if ( GetWindow() ) @@ -2394,7 +2394,7 @@ void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException) void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2414,7 +2414,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s { ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Dialog* pDlg = (Dialog*) GetWindow(); if ( pDlg ) pDlg->GetDrawWindowBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset ); @@ -2457,7 +2457,7 @@ void SAL_CALL VCLXDialog::setProperty( const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Dialog* pDialog = (Dialog*)GetWindow(); if ( pDialog ) @@ -2524,7 +2524,7 @@ IMPL_XTYPEPROVIDER_END void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2553,7 +2553,7 @@ void SAL_CALL VCLXTabPage::setProperty( const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TabPage* pTabPage = (TabPage*)GetWindow(); if ( pTabPage ) @@ -2618,7 +2618,7 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink() void VCLXFixedHyperlink::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -2682,7 +2682,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); if ( pBase ) @@ -2691,7 +2691,7 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun ::rtl::OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; Window* pWindow = GetWindow(); @@ -2702,7 +2702,7 @@ void VCLXFixedHyperlink::setText( const ::rtl::OUString& Text ) throw(::com::sun void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); if ( pBase ) @@ -2711,7 +2711,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun:: ::rtl::OUString VCLXFixedHyperlink::getURL( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); @@ -2722,7 +2722,7 @@ void VCLXFixedHyperlink::setURL( const ::rtl::OUString& URL ) throw(::com::sun:: void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2743,7 +2743,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); short nAlign = 0; Window* pWindow = GetWindow(); @@ -2762,19 +2762,19 @@ short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeExc void VCLXFixedHyperlink::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } ::com::sun::star::awt::Size VCLXFixedHyperlink::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; FixedText* pFixedText = (FixedText*)GetWindow(); @@ -2790,7 +2790,7 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe ::com::sun::star::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz = rNewSize; ::com::sun::star::awt::Size aMinSz = getMinimumSize(); @@ -2802,7 +2802,7 @@ void VCLXFixedHyperlink::removeActionListener( const ::com::sun::star::uno::Refe void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); if ( pBase ) @@ -2836,7 +2836,7 @@ void VCLXFixedHyperlink::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any VCLXFixedHyperlink::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow(); @@ -2944,7 +2944,7 @@ IMPL_XTYPEPROVIDER_END void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2953,7 +2953,7 @@ void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::sta ::rtl::OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; Window* pWindow = GetWindow(); @@ -2964,7 +2964,7 @@ void VCLXFixedText::setText( const ::rtl::OUString& Text ) throw(::com::sun::sta void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -2985,7 +2985,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); short nAlign = 0; Window* pWindow = GetWindow(); @@ -3004,7 +3004,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio ::com::sun::star::awt::Size VCLXFixedText::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; FixedText* pFixedText = (FixedText*)GetWindow(); @@ -3020,7 +3020,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio ::com::sun::star::awt::Size VCLXFixedText::calcAdjustedSize( const ::com::sun::star::awt::Size& rMaxSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aAdjustedSize( VCLUnoHelper::ConvertToVCLSize( rMaxSize ) ); FixedText* pFixedText = (FixedText*)GetWindow(); @@ -3087,7 +3087,7 @@ IMPL_XTYPEPROVIDER_END // ::com::sun::star::lang::XComponent void VCLXScrollBar::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -3098,19 +3098,19 @@ void VCLXScrollBar::dispose() throw(::com::sun::star::uno::RuntimeException) // ::com::sun::star::awt::XScrollbar void VCLXScrollBar::addAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maAdjustmentListeners.addInterface( l ); } void VCLXScrollBar::removeAdjustmentListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XAdjustmentListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maAdjustmentListeners.removeInterface( l ); } void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3119,7 +3119,7 @@ void VCLXScrollBar::setValue( sal_Int32 n ) throw(::com::sun::star::uno::Runtime void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3132,7 +3132,7 @@ void VCLXScrollBar::setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 n sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); return pScrollBar ? pScrollBar->GetThumbPos() : 0; @@ -3140,7 +3140,7 @@ sal_Int32 VCLXScrollBar::getValue() throw(::com::sun::star::uno::RuntimeExceptio void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3149,7 +3149,7 @@ void VCLXScrollBar::setMaximum( sal_Int32 n ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); return pScrollBar ? pScrollBar->GetRangeMax() : 0; @@ -3157,7 +3157,7 @@ sal_Int32 VCLXScrollBar::getMaximum() throw(::com::sun::star::uno::RuntimeExcept void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() ); if ( pScrollBar ) @@ -3166,7 +3166,7 @@ void VCLXScrollBar::setMinimum( sal_Int32 n ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() ); return pScrollBar ? pScrollBar->GetRangeMin() : 0; @@ -3174,7 +3174,7 @@ sal_Int32 VCLXScrollBar::getMinimum() throw(::com::sun::star::uno::RuntimeExcept void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3183,7 +3183,7 @@ void VCLXScrollBar::setLineIncrement( sal_Int32 n ) throw(::com::sun::star::uno: sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); return pScrollBar ? pScrollBar->GetLineSize() : 0; @@ -3191,7 +3191,7 @@ sal_Int32 VCLXScrollBar::getLineIncrement() throw(::com::sun::star::uno::Runtime void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3200,7 +3200,7 @@ void VCLXScrollBar::setBlockIncrement( sal_Int32 n ) throw(::com::sun::star::uno sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); return pScrollBar ? pScrollBar->GetPageSize() : 0; @@ -3208,7 +3208,7 @@ sal_Int32 VCLXScrollBar::getBlockIncrement() throw(::com::sun::star::uno::Runtim void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); if ( pScrollBar ) @@ -3217,7 +3217,7 @@ void VCLXScrollBar::setVisibleSize( sal_Int32 n ) throw(::com::sun::star::uno::R sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*) GetWindow(); return pScrollBar ? pScrollBar->GetVisibleSize() : 0; @@ -3225,7 +3225,7 @@ sal_Int32 VCLXScrollBar::getVisibleSize() throw(::com::sun::star::uno::RuntimeEx void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) @@ -3244,7 +3244,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 n = 0; Window* pWindow = GetWindow(); @@ -3263,7 +3263,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx // ::com::sun::star::awt::VclWindowPeer void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ScrollBar* pScrollBar = (ScrollBar*)GetWindow(); if ( pScrollBar ) @@ -3378,7 +3378,7 @@ void VCLXScrollBar::setProperty( const ::rtl::OUString& PropertyName, const ::co ::com::sun::star::uno::Any VCLXScrollBar::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ScrollBar* pScrollBar = (ScrollBar*)GetWindow(); @@ -3502,7 +3502,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return implGetMinimumSize( GetWindow() ); } @@ -3575,7 +3575,7 @@ IMPL_XTYPEPROVIDER_END void VCLXEdit::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -3585,19 +3585,19 @@ void VCLXEdit::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXEdit::addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetTextListeners().addInterface( l ); } void VCLXEdit::removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetTextListeners().removeInterface( l ); } void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*)GetWindow(); if ( pEdit ) @@ -3614,7 +3614,7 @@ void VCLXEdit::setText( const ::rtl::OUString& aText ) throw(::com::sun::star::u void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*)GetWindow(); if ( pEdit ) @@ -3632,7 +3632,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const : ::rtl::OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; Window* pWindow = GetWindow(); @@ -3643,7 +3643,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const : ::rtl::OUString VCLXEdit::getSelectedText() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aText; Edit* pEdit = (Edit*) GetWindow(); @@ -3655,7 +3655,7 @@ void VCLXEdit::insertText( const ::com::sun::star::awt::Selection& rSel, const : void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); if ( pEdit ) @@ -3664,7 +3664,7 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection ::com::sun::star::awt::Selection VCLXEdit::getSelection() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Selection aSel; Edit* pEdit = (Edit*) GetWindow(); @@ -3675,7 +3675,7 @@ void VCLXEdit::setSelection( const ::com::sun::star::awt::Selection& aSelection sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); return ( pEdit && !pEdit->IsReadOnly() && pEdit->IsEnabled() ) ? sal_True : sal_False; @@ -3683,7 +3683,7 @@ sal_Bool VCLXEdit::isEditable() throw(::com::sun::star::uno::RuntimeException) void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); if ( pEdit ) @@ -3693,7 +3693,7 @@ void VCLXEdit::setEditable( sal_Bool bEditable ) throw(::com::sun::star::uno::Ru void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); if ( pEdit ) @@ -3702,7 +3702,7 @@ void VCLXEdit::setMaxTextLen( sal_Int16 nLen ) throw(::com::sun::star::uno::Runt sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); return pEdit ? pEdit->GetMaxTextLen() : 0; @@ -3710,7 +3710,7 @@ sal_Int16 VCLXEdit::getMaxTextLen() throw(::com::sun::star::uno::RuntimeExceptio void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*) GetWindow(); if ( pEdit ) @@ -3719,7 +3719,7 @@ void VCLXEdit::setEchoChar( sal_Unicode cEcho ) throw(::com::sun::star::uno::Run void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Edit* pEdit = (Edit*)GetWindow(); if ( pEdit ) @@ -3764,7 +3764,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su ::com::sun::star::uno::Any VCLXEdit::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; Edit* pEdit = (Edit*)GetWindow(); @@ -3796,7 +3796,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su ::com::sun::star::awt::Size VCLXEdit::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; Edit* pEdit = (Edit*) GetWindow(); @@ -3807,7 +3807,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su ::com::sun::star::awt::Size VCLXEdit::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; Edit* pEdit = (Edit*) GetWindow(); @@ -3821,7 +3821,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su ::com::sun::star::awt::Size VCLXEdit::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::awt::Size aSz = rNewSize; ::com::sun::star::awt::Size aMinSz = getMinimumSize(); @@ -3833,7 +3833,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su ::com::sun::star::awt::Size VCLXEdit::getMinimumSize( sal_Int16 nCols, sal_Int16 ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; Edit* pEdit = (Edit*) GetWindow(); @@ -3849,7 +3849,7 @@ void VCLXEdit::setProperty( const ::rtl::OUString& PropertyName, const ::com::su void VCLXEdit::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); nLines = 1; nCols = 0; @@ -3937,14 +3937,14 @@ VCLXComboBox::~VCLXComboBox() ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext() { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return getAccessibleFactory().createAccessibleContext( this ); } void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; @@ -3956,31 +3956,31 @@ void VCLXComboBox::dispose() throw(::com::sun::star::uno::RuntimeException) void VCLXComboBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.addInterface( l ); } void VCLXComboBox::removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maItemListeners.removeInterface( l ); } void VCLXComboBox::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.addInterface( l ); } void VCLXComboBox::removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maActionListeners.removeInterface( l ); } void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) @@ -3989,7 +3989,7 @@ void VCLXComboBox::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) @@ -4010,7 +4010,7 @@ void VCLXComboBox::addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUStr void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) @@ -4022,7 +4022,7 @@ void VCLXComboBox::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(::com:: sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pBox = (ComboBox*) GetWindow(); return pBox ? pBox->GetEntryCount() : 0; @@ -4030,7 +4030,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep ::rtl::OUString VCLXComboBox::getItem( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aItem; ComboBox* pBox = (ComboBox*) GetWindow(); @@ -4041,7 +4041,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep ::com::sun::star::uno::Sequence< ::rtl::OUString> VCLXComboBox::getItems() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq; ComboBox* pBox = (ComboBox*) GetWindow(); @@ -4060,7 +4060,7 @@ sal_Int16 VCLXComboBox::getItemCount() throw(::com::sun::star::uno::RuntimeExcep void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pBox = (ComboBox*) GetWindow(); if ( pBox ) @@ -4069,7 +4069,7 @@ void VCLXComboBox::setDropDownLineCount( sal_Int16 nLines ) throw(::com::sun::st sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int16 nLines = 0; ComboBox* pBox = (ComboBox*) GetWindow(); @@ -4080,7 +4080,7 @@ sal_Int16 VCLXComboBox::getDropDownLineCount() throw(::com::sun::star::uno::Runt void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = (ComboBox*)GetWindow(); if ( pComboBox ) @@ -4130,7 +4130,7 @@ void VCLXComboBox::setProperty( const ::rtl::OUString& PropertyName, const ::com ::com::sun::star::uno::Any VCLXComboBox::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; ComboBox* pComboBox = (ComboBox*)GetWindow(); @@ -4218,7 +4218,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::awt::Size VCLXComboBox::getMinimumSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ComboBox* pComboBox = (ComboBox*) GetWindow(); @@ -4229,7 +4229,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::awt::Size VCLXComboBox::getPreferredSize( ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ComboBox* pComboBox = (ComboBox*) GetWindow(); @@ -4244,7 +4244,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::awt::Size VCLXComboBox::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz = VCLSize(rNewSize); ComboBox* pComboBox = (ComboBox*) GetWindow(); @@ -4255,7 +4255,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) ::com::sun::star::awt::Size VCLXComboBox::getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); Size aSz; ComboBox* pComboBox = (ComboBox*) GetWindow(); @@ -4266,7 +4266,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); nCols = nLines = 0; ComboBox* pComboBox = (ComboBox*) GetWindow(); @@ -4280,7 +4280,7 @@ void VCLXComboBox::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) thr } void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() ); @@ -4295,7 +4295,7 @@ void SAL_CALL VCLXComboBox::listItemInserted( const ItemListEvent& i_rEvent ) th void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() ); @@ -4308,7 +4308,7 @@ void SAL_CALL VCLXComboBox::listItemRemoved( const ItemListEvent& i_rEvent ) thr void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() ); @@ -4327,7 +4327,7 @@ void SAL_CALL VCLXComboBox::listItemModified( const ItemListEvent& i_rEvent ) th void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" ); @@ -4339,7 +4339,7 @@ void SAL_CALL VCLXComboBox::allItemsRemoved( const EventObject& i_rEvent ) throw void SAL_CALL VCLXComboBox::itemListChanged( const EventObject& i_rEvent ) throw (RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ComboBox* pComboBox = dynamic_cast< ComboBox* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pComboBox, "VCLXComboBox::listItemModified: no ComboBox?!" ); @@ -4398,7 +4398,7 @@ VCLXFormattedSpinField::~VCLXFormattedSpinField() void VCLXFormattedSpinField::setStrictFormat( sal_Bool bStrict ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) @@ -4414,7 +4414,7 @@ sal_Bool VCLXFormattedSpinField::isStrictFormat() void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FormatterBase* pFormatter = GetFormatter(); if ( pFormatter ) @@ -4453,7 +4453,7 @@ void VCLXFormattedSpinField::setProperty( const ::rtl::OUString& PropertyName, c ::com::sun::star::uno::Any VCLXFormattedSpinField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); @@ -4547,7 +4547,7 @@ IMPL_XTYPEPROVIDER_END void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -4616,7 +4616,7 @@ void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::co ::com::sun::star::uno::Any VCLXDateField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); @@ -4662,7 +4662,7 @@ void VCLXDateField::setProperty( const ::rtl::OUString& PropertyName, const ::co void VCLXDateField::setDate( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4679,7 +4679,7 @@ void VCLXDateField::setDate( sal_Int32 nDate ) throw(::com::sun::star::uno::Runt sal_Int32 VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nDate = 0; DateField* pDateField = (DateField*) GetWindow(); @@ -4691,7 +4691,7 @@ sal_Int32 VCLXDateField::getDate() throw(::com::sun::star::uno::RuntimeException void VCLXDateField::setMin( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4700,7 +4700,7 @@ void VCLXDateField::setMin( sal_Int32 nDate ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nDate = 0; DateField* pDateField = (DateField*) GetWindow(); @@ -4712,7 +4712,7 @@ sal_Int32 VCLXDateField::getMin() throw(::com::sun::star::uno::RuntimeException) void VCLXDateField::setMax( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4721,7 +4721,7 @@ void VCLXDateField::setMax( sal_Int32 nDate ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nDate = 0; DateField* pDateField = (DateField*) GetWindow(); @@ -4733,7 +4733,7 @@ sal_Int32 VCLXDateField::getMax() throw(::com::sun::star::uno::RuntimeException) void VCLXDateField::setFirst( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4742,7 +4742,7 @@ void VCLXDateField::setFirst( sal_Int32 nDate ) throw(::com::sun::star::uno::Run sal_Int32 VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nDate = 0; DateField* pDateField = (DateField*) GetWindow(); @@ -4754,7 +4754,7 @@ sal_Int32 VCLXDateField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio void VCLXDateField::setLast( sal_Int32 nDate ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4763,7 +4763,7 @@ void VCLXDateField::setLast( sal_Int32 nDate ) throw(::com::sun::star::uno::Runt sal_Int32 VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nDate = 0; DateField* pDateField = (DateField*) GetWindow(); @@ -4775,7 +4775,7 @@ sal_Int32 VCLXDateField::getLast() throw(::com::sun::star::uno::RuntimeException void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4784,7 +4784,7 @@ void VCLXDateField::setLongFormat( sal_Bool bLong ) throw(::com::sun::star::uno: sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); return pDateField ? pDateField->IsLongFormat() : sal_False; @@ -4792,7 +4792,7 @@ sal_Bool VCLXDateField::isLongFormat() throw(::com::sun::star::uno::RuntimeExcep void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); if ( pDateField ) @@ -4809,7 +4809,7 @@ void VCLXDateField::setEmpty() throw(::com::sun::star::uno::RuntimeException) sal_Bool VCLXDateField::isEmpty() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); DateField* pDateField = (DateField*) GetWindow(); return pDateField ? pDateField->IsEmptyDate() : sal_False; @@ -4889,7 +4889,7 @@ IMPL_XTYPEPROVIDER_END void VCLXTimeField::setTime( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -4906,7 +4906,7 @@ void VCLXTimeField::setTime( sal_Int32 nTime ) throw(::com::sun::star::uno::Runt sal_Int32 VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nTime = 0; TimeField* pTimeField = (TimeField*) GetWindow(); @@ -4918,7 +4918,7 @@ sal_Int32 VCLXTimeField::getTime() throw(::com::sun::star::uno::RuntimeException void VCLXTimeField::setMin( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -4927,7 +4927,7 @@ void VCLXTimeField::setMin( sal_Int32 nTime ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nTime = 0; TimeField* pTimeField = (TimeField*) GetWindow(); @@ -4939,7 +4939,7 @@ sal_Int32 VCLXTimeField::getMin() throw(::com::sun::star::uno::RuntimeException) void VCLXTimeField::setMax( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -4948,7 +4948,7 @@ void VCLXTimeField::setMax( sal_Int32 nTime ) throw(::com::sun::star::uno::Runti sal_Int32 VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nTime = 0; TimeField* pTimeField = (TimeField*) GetWindow(); @@ -4960,7 +4960,7 @@ sal_Int32 VCLXTimeField::getMax() throw(::com::sun::star::uno::RuntimeException) void VCLXTimeField::setFirst( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -4969,7 +4969,7 @@ void VCLXTimeField::setFirst( sal_Int32 nTime ) throw(::com::sun::star::uno::Run sal_Int32 VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nTime = 0; TimeField* pTimeField = (TimeField*) GetWindow(); @@ -4981,7 +4981,7 @@ sal_Int32 VCLXTimeField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio void VCLXTimeField::setLast( sal_Int32 nTime ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -4990,7 +4990,7 @@ void VCLXTimeField::setLast( sal_Int32 nTime ) throw(::com::sun::star::uno::Runt sal_Int32 VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); sal_Int32 nTime = 0; TimeField* pTimeField = (TimeField*) GetWindow(); @@ -5002,7 +5002,7 @@ sal_Int32 VCLXTimeField::getLast() throw(::com::sun::star::uno::RuntimeException void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); if ( pTimeField ) @@ -5011,7 +5011,7 @@ void VCLXTimeField::setEmpty() throw(::com::sun::star::uno::RuntimeException) sal_Bool VCLXTimeField::isEmpty() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); TimeField* pTimeField = (TimeField*) GetWindow(); return pTimeField ? pTimeField->IsEmptyTime() : sal_False; @@ -5030,7 +5030,7 @@ sal_Bool VCLXTimeField::isStrictFormat() throw(::com::sun::star::uno::RuntimeExc void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -5092,7 +5092,7 @@ void VCLXTimeField::setProperty( const ::rtl::OUString& PropertyName, const ::co ::com::sun::star::uno::Any VCLXTimeField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; if ( GetWindow() ) @@ -5193,7 +5193,7 @@ IMPL_XTYPEPROVIDER_END void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); if ( pNumericFormatter ) @@ -5217,7 +5217,7 @@ void VCLXNumericField::setValue( double Value ) throw(::com::sun::star::uno::Run double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); return pNumericFormatter @@ -5227,7 +5227,7 @@ double VCLXNumericField::getValue() throw(::com::sun::star::uno::RuntimeExceptio void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); if ( pNumericFormatter ) @@ -5237,7 +5237,7 @@ void VCLXNumericField::setMin( double Value ) throw(::com::sun::star::uno::Runti double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); return pNumericFormatter @@ -5247,7 +5247,7 @@ double VCLXNumericField::getMin() throw(::com::sun::star::uno::RuntimeException) void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); if ( pNumericFormatter ) @@ -5257,7 +5257,7 @@ void VCLXNumericField::setMax( double Value ) throw(::com::sun::star::uno::Runti double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); return pNumericFormatter @@ -5267,7 +5267,7 @@ double VCLXNumericField::getMax() throw(::com::sun::star::uno::RuntimeException) void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); if ( pNumericField ) @@ -5277,7 +5277,7 @@ void VCLXNumericField::setFirst( double Value ) throw(::com::sun::star::uno::Run double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); return pNumericField @@ -5287,7 +5287,7 @@ double VCLXNumericField::getFirst() throw(::com::sun::star::uno::RuntimeExceptio void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); if ( pNumericField ) @@ -5297,7 +5297,7 @@ void VCLXNumericField::setLast( double Value ) throw(::com::sun::star::uno::Runt double VCLXNumericField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); return pNumericField @@ -5318,7 +5318,7 @@ sal_Bool VCLXNumericField::isStrictFormat() throw(::com::sun::star::uno::Runtime void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); if ( pNumericField ) @@ -5328,7 +5328,7 @@ void VCLXNumericField::setSpinSize( double Value ) throw(::com::sun::star::uno:: double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericField* pNumericField = (NumericField*) GetWindow(); return pNumericField @@ -5338,7 +5338,7 @@ double VCLXNumericField::getSpinSize() throw(::com::sun::star::uno::RuntimeExcep void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); if ( pNumericFormatter ) @@ -5351,7 +5351,7 @@ void VCLXNumericField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::sta sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; @@ -5359,7 +5359,7 @@ sal_Int16 VCLXNumericField::getDecimalDigits() throw(::com::sun::star::uno::Runt void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -5428,7 +5428,7 @@ void VCLXNumericField::setProperty( const ::rtl::OUString& PropertyName, const : ::com::sun::star::uno::Any VCLXNumericField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); @@ -5553,12 +5553,12 @@ IMPL_XTYPEPROVIDER_END #define METRIC_MAP_PAIR(method,parent) \ sal_Int64 VCLXMetricField::get##method( sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) \ { \ - ::vos::OGuard aGuard( GetMutex() ); \ + ::osl::SolarMutexGuard aGuard( GetMutex() ); \ return GetMetric##parent()->Get##method( MetricUnitUnoToVcl( nUnit ) ); \ } \ void VCLXMetricField::set##method( sal_Int64 nValue, sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) \ { \ - ::vos::OGuard aGuard( GetMutex() ); \ + ::osl::SolarMutexGuard aGuard( GetMutex() ); \ GetMetric##parent()->Set##method( nValue, MetricUnitUnoToVcl( nUnit ) ); \ } @@ -5571,13 +5571,13 @@ METRIC_MAP_PAIR(Last, Field) ::sal_Int64 VCLXMetricField::getValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return GetMetricFormatter()->GetValue( MetricUnitUnoToVcl( nUnit ) ); } ::sal_Int64 VCLXMetricField::getCorrectedValue( ::sal_Int16 nUnit ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return GetMetricFormatter()->GetCorrectedValue( MetricUnitUnoToVcl( nUnit ) ); } @@ -5597,14 +5597,14 @@ void VCLXMetricField::CallListeners() void VCLXMetricField::setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetMetricFormatter()->SetValue( Value, MetricUnitUnoToVcl( Unit ) ); CallListeners(); } void VCLXMetricField::setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetMetricFormatter()->SetUserValue( Value, MetricUnitUnoToVcl( Unit ) ); CallListeners(); } @@ -5621,25 +5621,25 @@ sal_Bool VCLXMetricField::isStrictFormat() throw(::com::sun::star::uno::RuntimeE void VCLXMetricField::setSpinSize( sal_Int64 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetMetricField()->SetSpinSize( Value ); } sal_Int64 VCLXMetricField::getSpinSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); return GetMetricField()->GetSpinSize(); } void VCLXMetricField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); GetMetricFormatter()->SetDecimalDigits( Value ); } sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); NumericFormatter* pNumericFormatter = (NumericFormatter*) GetFormatter(); return pNumericFormatter ? pNumericFormatter->GetDecimalDigits() : 0; @@ -5647,7 +5647,7 @@ sal_Int16 VCLXMetricField::getDecimalDigits() throw(::com::sun::star::uno::Runti void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -5693,7 +5693,7 @@ void VCLXMetricField::setProperty( const ::rtl::OUString& PropertyName, const :: ::com::sun::star::uno::Any VCLXMetricField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); @@ -5788,7 +5788,7 @@ IMPL_XTYPEPROVIDER_END void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); if ( pCurrencyFormatter ) @@ -5812,7 +5812,7 @@ void VCLXCurrencyField::setValue( double Value ) throw(::com::sun::star::uno::Ru double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); return pCurrencyFormatter @@ -5822,7 +5822,7 @@ double VCLXCurrencyField::getValue() throw(::com::sun::star::uno::RuntimeExcepti void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); if ( pCurrencyFormatter ) @@ -5832,7 +5832,7 @@ void VCLXCurrencyField::setMin( double Value ) throw(::com::sun::star::uno::Runt double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); return pCurrencyFormatter @@ -5842,7 +5842,7 @@ double VCLXCurrencyField::getMin() throw(::com::sun::star::uno::RuntimeException void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); if ( pCurrencyFormatter ) @@ -5852,7 +5852,7 @@ void VCLXCurrencyField::setMax( double Value ) throw(::com::sun::star::uno::Runt double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); return pCurrencyFormatter @@ -5862,7 +5862,7 @@ double VCLXCurrencyField::getMax() throw(::com::sun::star::uno::RuntimeException void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); if ( pCurrencyField ) @@ -5872,7 +5872,7 @@ void VCLXCurrencyField::setFirst( double Value ) throw(::com::sun::star::uno::Ru double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); return pCurrencyField @@ -5882,7 +5882,7 @@ double VCLXCurrencyField::getFirst() throw(::com::sun::star::uno::RuntimeExcepti void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); if ( pCurrencyField ) @@ -5892,7 +5892,7 @@ void VCLXCurrencyField::setLast( double Value ) throw(::com::sun::star::uno::Run double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); return pCurrencyField @@ -5902,7 +5902,7 @@ double VCLXCurrencyField::getLast() throw(::com::sun::star::uno::RuntimeExceptio void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); if ( pCurrencyField ) @@ -5912,7 +5912,7 @@ void VCLXCurrencyField::setSpinSize( double Value ) throw(::com::sun::star::uno: double VCLXCurrencyField::getSpinSize() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyField* pCurrencyField = (LongCurrencyField*) GetWindow(); return pCurrencyField @@ -5933,7 +5933,7 @@ sal_Bool VCLXCurrencyField::isStrictFormat() throw(::com::sun::star::uno::Runtim void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); if ( pCurrencyFormatter ) @@ -5946,7 +5946,7 @@ void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value ) throw(::com::sun::st sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); LongCurrencyFormatter* pCurrencyFormatter = (LongCurrencyFormatter*) GetFormatter(); return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0; @@ -5954,7 +5954,7 @@ sal_Int16 VCLXCurrencyField::getDecimalDigits() throw(::com::sun::star::uno::Run void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -6030,7 +6030,7 @@ void VCLXCurrencyField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any VCLXCurrencyField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; FormatterBase* pFormatter = GetFormatter(); @@ -6136,7 +6136,7 @@ IMPL_XTYPEPROVIDER_END void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) @@ -6147,7 +6147,7 @@ void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::O void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) @@ -6159,7 +6159,7 @@ void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& Lit void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) @@ -6170,7 +6170,7 @@ void VCLXPatternField::setString( const ::rtl::OUString& Str ) throw(::com::sun: ::rtl::OUString VCLXPatternField::getString() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::rtl::OUString aString; PatternField* pPatternField = (PatternField*) GetWindow(); @@ -6191,7 +6191,7 @@ sal_Bool VCLXPatternField::isStrictFormat() throw(::com::sun::star::uno::Runtime void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -6224,7 +6224,7 @@ void VCLXPatternField::setProperty( const ::rtl::OUString& PropertyName, const : ::com::sun::star::uno::Any VCLXPatternField::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); ::com::sun::star::uno::Any aProp; if ( GetWindow() ) diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx index 79ced87dacb0..0eb0c365d9a0 100644 --- a/toolkit/source/awt/xsimpleanimation.cxx +++ b/toolkit/source/awt/xsimpleanimation.cxx @@ -103,7 +103,7 @@ namespace toolkit void SAL_CALL XSimpleAnimation::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value ) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -139,7 +139,7 @@ namespace toolkit uno::Any SAL_CALL XSimpleAnimation::getProperty( const ::rtl::OUString& PropertyName ) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); uno::Any aReturn; diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx index caa7c9857a66..1a988211c0fa 100644 --- a/toolkit/source/awt/xthrobber.cxx +++ b/toolkit/source/awt/xthrobber.cxx @@ -109,7 +109,7 @@ namespace toolkit void SAL_CALL XThrobber::setProperty( const ::rtl::OUString& PropertyName, const uno::Any& Value ) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( GetWindow() ) { @@ -121,7 +121,7 @@ namespace toolkit uno::Any SAL_CALL XThrobber::getProperty( const ::rtl::OUString& PropertyName ) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); uno::Any aReturn; @@ -136,7 +136,7 @@ namespace toolkit void SAL_CALL XThrobber::InitImageList() throw( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); uno::Sequence< uno::Reference< graphic::XGraphic > > aImageList(12); sal_uInt16 nIconIdStart = RID_TK_ICON_THROBBER_START; diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index faf17948eac9..b80222108594 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -32,7 +32,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wall.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/controls/dialogcontrol.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 872b80be1e32..d078aa358e60 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -40,7 +40,7 @@ #include <cppuhelper/typeprovider.hxx> #include <rtl/memory.h> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/table.hxx> #include <tools/date.hxx> @@ -56,7 +56,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/controls/accessiblecontrolcontext.hxx> #include <comphelper/container.hxx> diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx index 3df4988481ec..9f5de20466cc 100644 --- a/toolkit/source/helper/externallock.cxx +++ b/toolkit/source/helper/externallock.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_toolkit.hxx" #include <toolkit/helper/externallock.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> // ----------------------------------------------------------------------------- diff --git a/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx index 735226a44b54..6c1028615518 100644 --- a/toolkit/source/helper/throbberimpl.cxx +++ b/toolkit/source/helper/throbberimpl.cxx @@ -60,7 +60,7 @@ namespace toolkit //-------------------------------------------------------------------- void Throbber_Impl::start() throw ( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); mnCurStep = 0; maWaitTimer.Start(); @@ -69,7 +69,7 @@ namespace toolkit //-------------------------------------------------------------------- void Throbber_Impl::stop() throw ( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maWaitTimer.Stop(); } @@ -78,7 +78,7 @@ namespace toolkit void Throbber_Impl::setImageList( const uno::Sequence< uno::Reference< graphic::XGraphic > >& rImageList ) throw ( uno::RuntimeException ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); maImageList = rImageList; @@ -116,7 +116,7 @@ namespace toolkit // ----------------------------------------------------------------------- IMPL_LINK( Throbber_Impl, TimeOutHdl, Throbber_Impl*, EMPTYARG ) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); FixedImage* pImage = static_cast< FixedImage* >( mxParent->GetWindow() ); diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx index 4ea6e3959a00..50451b0b85fb 100644 --- a/toolkit/source/layout/core/localized-string.cxx +++ b/toolkit/source/layout/core/localized-string.cxx @@ -61,7 +61,7 @@ uno::Any LocalizedString::queryInterface( uno::Type const& rType ) void LocalizedString::setText( OUString const& s ) throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( Window *w = GetWindow() ) return w->SetText( s ); @@ -70,7 +70,7 @@ void LocalizedString::setText( OUString const& s ) OUString LocalizedString::getText() throw(uno::RuntimeException) { - ::vos::OGuard aGuard( GetMutex() ); + ::osl::SolarMutexGuard aGuard( GetMutex() ); if ( Window *w = GetWindow() ) return w->GetText(); diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx index d6ad0ab7c74c..d2203bba1384 100644 --- a/toolkit/workben/unodialog.cxx +++ b/toolkit/workben/unodialog.cxx @@ -57,7 +57,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::connection; -using namespace ::vos; using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::registry; @@ -217,7 +216,8 @@ void Main( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMult xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "PositionX" ) ), aValue ); MyWin * pWindow; - ::osl::Guard< vos::IMutex > aVclGuard( Application::GetSolarMutex() ); + ::SolarMutexGuard aVclGuard; + pWindow = new MyWin(); pWindow->Show(); diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index f2a7dbb4eae7..8dfd3c421aff 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -31,7 +31,7 @@ #include <stdlib.h> #include <stdio.h> #include "bootstrp/sstring.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <tools/geninfo.hxx> diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 3f7bdf78f809..e45fd11b0495 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -32,7 +32,7 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include "bootstrp/listmacr.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define OS_NONE 0x0000 #define OS_WIN16 0x0001 @@ -265,7 +265,7 @@ private: static Link aDBNotFoundHdl; protected: - NAMESPACE_VOS( OMutex ) aMutex; + osl::Mutex aMutex; USHORT nStarMode; SolarFileList aFileList; diff --git a/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx index b0028b0b2de1..210cfb1ac2a7 100644 --- a/tools/inc/pch/precompiled_tools.hxx +++ b/tools/inc/pch/precompiled_tools.hxx @@ -88,7 +88,7 @@ #include "sys/types.h" #include "vos/macros.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "vos/process.hxx" //---MARKER--- #endif diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx index 16b8b028a715..00767880c915 100644 --- a/tools/inc/tools/simplerm.hxx +++ b/tools/inc/tools/simplerm.hxx @@ -36,7 +36,7 @@ #ifndef _TOOLS_SIMPLERESMGR_HXX_ #define _TOOLS_SIMPLERESMGR_HXX_ -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/resid.hxx> #include <i18npool/lang.h> #include <tools/string.hxx> @@ -47,7 +47,7 @@ class InternalResMgr; class TOOLS_DLLPUBLIC SimpleResMgr { protected: - NAMESPACE_VOS(OMutex) m_aAccessSafety; + osl::Mutex m_aAccessSafety; InternalResMgr* m_pResImpl; public: diff --git a/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx index a5faf89bbe40..eef67455a6bb 100644 --- a/tools/inc/tools/solarmutex.hxx +++ b/tools/inc/tools/solarmutex.hxx @@ -29,15 +29,15 @@ #define _TOOLS_SOLARMUTEX_HXX #include "tools/toolsdllapi.h" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> namespace tools { class TOOLS_DLLPUBLIC SolarMutex { public: - static ::vos::IMutex* GetSolarMutex(); - static void SetSolarMutex( ::vos::IMutex* pMutex ); + static ::osl::SolarMutex* GetSolarMutex(); + static void SetSolarMutex( ::osl::SolarMutex* pMutex ); static bool Acquire(); static void Release(); }; diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 6342f9bcb6aa..ec167bacc846 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -58,7 +58,7 @@ #endif #include <tools/stream.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/file.hxx> #include <rtl/instance.hxx> @@ -135,13 +135,13 @@ BOOL bInRedirection = TRUE; #else BOOL bInRedirection = FALSE; #endif -static NAMESPACE_VOS( OMutex )* pRedirectMutex = 0; +static osl::Mutex* pRedirectMutex = 0; //------------------------------------------------------------------------ void FSysRedirector::Register( FSysRedirector *pRedirector ) { if ( pRedirector ) - pRedirectMutex = new NAMESPACE_VOS( OMutex ); + pRedirectMutex = new osl::Mutex; else DELETEZ( pRedirectMutex ); _pRedirector = pRedirector; @@ -164,7 +164,7 @@ void FSysRedirector::DoRedirect( String &rPath ) // Redirection is acessible only by one thread per time // dont move the guard behind the bInRedirection check!!! // think of nested calls (when called from callback) - NAMESPACE_VOS( OGuard ) aGuard( pRedirectMutex ); + osl::MutexGuard aGuard( pRedirectMutex ); // if already in redirection, dont redirect if ( bInRedirection ) @@ -1039,8 +1039,8 @@ DirEntry* DirEntry::ImpChangeParent( DirEntry* pNewParent, BOOL bNormalize ) BOOL DirEntry::Exists( FSysAccess nAccess ) const { #ifndef BOOTSTRAP - static NAMESPACE_VOS(OMutex) aLocalMutex; - NAMESPACE_VOS(OGuard) aGuard( aLocalMutex ); + static osl::Mutex aLocalMutex; + osl::MutexGuard aGuard( aLocalMutex ); #endif if ( !IsValid() ) return FALSE; diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx index 3cc3918fe5a6..c552720fb2c8 100644 --- a/tools/source/fsys/os2.cxx +++ b/tools/source/fsys/os2.cxx @@ -42,7 +42,7 @@ #include "comdep.hxx" #ifdef OS2 -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #endif int Sys2SolarError_Impl( int nSysErr ); diff --git a/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx index 89abad90e025..8bede4e6869a 100644 --- a/tools/source/misc/solarmutex.cxx +++ b/tools/source/misc/solarmutex.cxx @@ -32,14 +32,14 @@ namespace tools { - static ::vos::IMutex* pSolarMutex = 0; + static ::osl::SolarMutex* pSolarMutex = 0; - ::vos::IMutex* SolarMutex::GetSolarMutex() + ::osl::SolarMutex* SolarMutex::GetSolarMutex() { return pSolarMutex; } - void SolarMutex::SetSolarMutex( ::vos::IMutex* pMutex ) + void SolarMutex::SetSolarMutex( ::osl::SolarMutex* pMutex ) { pSolarMutex = pMutex; } diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 110b62aaf4ed..29c6f9411786 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1919,7 +1919,7 @@ SimpleResMgr* SimpleResMgr::Create( const sal_Char* pPrefixName, com::sun::star: // ----------------------------------------------------------------------- bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + osl::MutexGuard aGuard(m_aAccessSafety); if ( ( RSC_STRING != _resourceType ) && ( RSC_RESOURCE != _resourceType ) ) return false; @@ -1931,7 +1931,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc // ----------------------------------------------------------------------- UniString SimpleResMgr::ReadString( sal_uInt32 nId ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + osl::MutexGuard aGuard(m_aAccessSafety); DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadString : have no impl class !" ); // perhaps constructed with an invalid filename ? @@ -2002,7 +2002,7 @@ const ::com::sun::star::lang::Locale& SimpleResMgr::GetLocale() const sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer ) { - NAMESPACE_VOS(OGuard) aGuard(m_aAccessSafety); + osl::MutexGuard aGuard(m_aAccessSafety); DBG_ASSERT( m_pResImpl, "SimpleResMgr::ReadBlob : have no impl class !" ); diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 1736adf6f28a..5734cad12c35 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -41,7 +41,7 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/thread.h> // osl_getThreadTextEncoding // class FileBase @@ -61,7 +61,7 @@ DECLARE_LIST( InternalStreamLockList, InternalStreamLock* ) namespace { struct LockList : public rtl::Static< InternalStreamLockList, LockList > {}; } #ifndef BOOTSTRAP -namespace { struct LockMutex : public rtl::Static< NAMESPACE_VOS(OMutex), LockMutex > {}; } +namespace { struct LockMutex : public rtl::Static< osl::Mutex, LockMutex > {}; } #endif class InternalStreamLock @@ -112,7 +112,7 @@ InternalStreamLock::~InternalStreamLock() sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream ) { #ifndef BOOTSTRAP - NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() ); + osl::MutexGuard aGuard( LockMutex::get() ); #endif ByteString aFileName(pStream->GetFileName(), osl_getThreadTextEncoding()); struct stat aStat; @@ -162,7 +162,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart, sal_Size nEnd, SvFileStr void InternalStreamLock::UnlockFile( sal_Size nStart, sal_Size nEnd, SvFileStream* pStream ) { #ifndef BOOTSTRAP - NAMESPACE_VOS( OGuard ) aGuard( LockMutex::get() ); + osl::MutexGuard aGuard( LockMutex::get() ); #endif InternalStreamLock* pLock = NULL; InternalStreamLockList &rLockList = LockList::get(); diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx index edc05d1a54a7..7c20ed7a8281 100644 --- a/unotools/inc/unotools/accessiblerelationsethelper.hxx +++ b/unotools/inc/unotools/accessiblerelationsethelper.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> @@ -147,7 +147,7 @@ public: protected: /// Mutex guarding this object. - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; private: /// The implementation of this helper interface. diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx index b7b830a4a247..5ef72a89f7eb 100644 --- a/unotools/inc/unotools/accessiblestatesethelper.hxx +++ b/unotools/inc/unotools/accessiblestatesethelper.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceName.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> @@ -169,7 +169,7 @@ public: protected: /// Mutex guarding this object. - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; private: /// The implementation of this helper interface. diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index f06f9d9522e5..a7090d5efebc 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -36,7 +36,7 @@ #include <osl/thread.hxx> #include <osl/conditn.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <tools/link.hxx> #include <tools/errcode.hxx> @@ -107,7 +107,7 @@ class UNOTOOLS_DLLPUBLIC UcbLockBytes : public virtual SvLockBytes { osl::Condition m_aInitialized; osl::Condition m_aTerminated; - vos::OMutex m_aMutex; + osl::Mutex m_aMutex; String m_aContentType; String m_aRealURL; @@ -184,25 +184,25 @@ public: NS_UNO::Reference < NS_IO::XInputStream > getInputStream_Impl() const { - vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); return m_xInputStream; } NS_UNO::Reference < NS_IO::XOutputStream > getOutputStream_Impl() const { - vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); return m_xOutputStream; } NS_UNO::Reference < NS_IO::XSeekable > getSeekable_Impl() const { - vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); return m_xSeekable; } sal_Bool hasInputStream_Impl() const { - vos::OGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); return m_xInputStream.is(); } diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index 20fffdf7070f..55cfa3e6ef42 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx @@ -168,7 +168,7 @@ sal_Int32 SAL_CALL AccessibleRelationSetHelper::getRelationCount( ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->getRelationCount(); } @@ -190,7 +190,7 @@ sal_Int32 SAL_CALL throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->getRelation(nIndex); } @@ -210,7 +210,7 @@ sal_Bool SAL_CALL AccessibleRelationSetHelper::containsRelation( sal_Int16 aRelationType ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->containsRelation(aRelationType); } @@ -229,14 +229,14 @@ AccessibleRelation SAL_CALL AccessibleRelationSetHelper::getRelationByType( sal_Int16 aRelationType ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->getRelationByType(aRelationType); } void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelation) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); mpHelperImpl->AddRelation(rRelation); } @@ -246,7 +246,7 @@ uno::Sequence< ::com::sun::star::uno::Type> AccessibleRelationSetHelper::getTypes (void) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); const ::com::sun::star::uno::Type aTypeList[] = { ::getCppuType((const uno::Reference< XAccessibleRelationSet>*)0), @@ -262,7 +262,7 @@ uno::Sequence<sal_Int8> SAL_CALL AccessibleRelationSetHelper::getImplementationId (void) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); static uno::Sequence<sal_Int8> aId; if (aId.getLength() == 0) { diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 8927f3cfb6e0..d2f1e50960f6 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -207,7 +207,7 @@ AccessibleStateSetHelper::~AccessibleStateSetHelper(void) sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty () throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->IsEmpty(); } @@ -225,7 +225,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty () sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->Contains(aState); } @@ -248,7 +248,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll (const uno::Sequence<sal_Int16>& rStateSet) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); sal_Int32 nCount(rStateSet.getLength()); const sal_Int16* pStates = rStateSet.getConstArray(); sal_Int32 i = 0; @@ -264,21 +264,21 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSetHelper::getStates() throw (uno::RuntimeException) { - ::vos::OGuard aGuard(maMutex); + osl::MutexGuard aGuard(maMutex); return mpHelperImpl->GetStates(); } void AccessibleStateSetHelper::AddState(sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); mpHelperImpl->AddState(aState); } void AccessibleStateSetHelper::RemoveState(sal_Int16 aState) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); mpHelperImpl->RemoveState(aState); } @@ -288,7 +288,7 @@ sal_Bool AccessibleStateSetHelper::Compare( AccessibleStateSetHelper& rNewStates) throw (uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); return mpHelperImpl->Compare(rComparativeValue.mpHelperImpl, rOldStates.mpHelperImpl, rNewStates.mpHelperImpl); } @@ -314,7 +314,7 @@ uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId (void) throw (::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard (maMutex); + osl::MutexGuard aGuard (maMutex); static uno::Sequence<sal_Int8> aId; if (aId.getLength() == 0) { diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 5935cde25d1e..c11403f47a26 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -39,7 +39,7 @@ #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/beans/XPropertySet.hpp" #include <rtl/uri.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> #include <tools/string.hxx> diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 06db4a8da4ce..bb09c47fe887 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <rtl/logfile.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx index 7674a0ed05f7..f7e985c71318 100644 --- a/unotools/source/config/undoopt.cxx +++ b/unotools/source/config/undoopt.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <rtl/logfile.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 01cdc1867904..57f23586e6e7 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/instance.hxx> #include <rtl/logfile.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 0403eab0af31..272412d39fe2 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -29,6 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_unotools.hxx" +#include <sal/macros.h> #include <unotools/ucblockbytes.hxx> #include <comphelper/processfactory.hxx> #include <salhelper/condition.hxx> @@ -1317,14 +1318,14 @@ UcbLockBytes::~UcbLockBytes() Reference < XInputStream > UcbLockBytes::getInputStream() { - vos::OClearableGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); m_bDontClose = sal_True; return m_xInputStream; } Reference < XStream > UcbLockBytes::getStream() { - vos::OClearableGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); Reference < XStream > xStream( m_xSeekable, UNO_QUERY ); if ( xStream.is() ) m_bDontClose = sal_True; @@ -1335,7 +1336,7 @@ Reference < XStream > UcbLockBytes::getStream() sal_Bool UcbLockBytes::setStream_Impl( const Reference<XStream>& aStream ) { - vos::OClearableGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); if ( aStream.is() ) { m_xOutputStream = aStream->getOutputStream(); @@ -1357,7 +1358,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp try { - vos::OClearableGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); if ( !m_bDontClose && m_xInputStream.is() ) m_xInputStream->closeInput(); @@ -1384,7 +1385,6 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp } bRet = m_xInputStream.is(); - // aGuard.clear(); } catch( Exception& ) {} @@ -1466,7 +1466,7 @@ ErrCode UcbLockBytes::ReadAt ( ULONG nPos, void *pBuffer, ULONG nCount, ULONG *p Sequence<sal_Int8> aData; sal_Int32 nSize; - nCount = VOS_MIN(nCount, 0x7FFFFFFF); + nCount = SAL_MIN(nCount, 0x7FFFFFFF); try { if ( !m_bTerminated && !IsSynchronMode() ) diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h index 1a4ad9425113..b82f4ff3eb82 100644 --- a/vcl/aqua/inc/salinst.h +++ b/vcl/aqua/inc/salinst.h @@ -29,7 +29,7 @@ #define _SV_SALINST_H #include "vcl/sv.h" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "osl/thread.hxx" #include "vcl/salinst.hxx" #include "osl/conditn.h" @@ -46,7 +46,7 @@ class Image; // - SalYieldMutex - // ----------------- -class SalYieldMutex : public vos::OMutex +class SalYieldMutex : public vcl::SolarMutexObject { ULONG mnCount; oslThreadIdentifier mnThreadId; @@ -60,7 +60,7 @@ public: oslThreadIdentifier GetThreadId() const { return mnThreadId; } }; -#define YIELD_GUARD vos::OGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() ) +//#define YIELD_GUARD vos::OGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() ) // ------------------- @@ -131,7 +131,7 @@ public: virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); virtual SalBitmap* CreateSalBitmap(); - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index c8461c39db60..bf8c79d8cea9 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -41,6 +41,7 @@ #include "vcl/window.hxx" #include "vcl/timer.hxx" #include "vcl/impbmp.hxx" +#include "vcl/solarmutex.hxx" #include "saldata.hxx" #include "salinst.h" @@ -371,7 +372,7 @@ SalYieldMutex::SalYieldMutex() void SalYieldMutex::acquire() { - OMutex::acquire(); + SolarMutexObject::acquire(); mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; } @@ -384,12 +385,12 @@ void SalYieldMutex::release() mnThreadId = 0; mnCount--; } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool SalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; @@ -526,7 +527,7 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* p // ----------------------------------------------------------------------- -vos::IMutex* AquaSalInstance::GetYieldMutex() +osl::SolarMutex* AquaSalInstance::GetYieldMutex() { return mpSalYieldMutex; } diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 5dfb9e359c3e..5061a90d41e2 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -46,7 +46,7 @@ #include "osl/file.hxx" #include "osl/process.h" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "rtl/bootstrap.h" #include "rtl/strbuf.hxx" diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx index 5863fb824313..30187dde2108 100644 --- a/vcl/inc/vcl/salinst.hxx +++ b/vcl/inc/vcl/salinst.hxx @@ -62,8 +62,6 @@ class SalSession; struct SystemGraphicsData; struct SystemWindowData; -namespace vos { class IMutex; } - // --------------- // - SalInstance - // --------------- @@ -131,7 +129,7 @@ public: virtual SalBitmap* CreateSalBitmap() = 0; // YieldMutex - virtual vos::IMutex* GetYieldMutex() = 0; + virtual osl::SolarMutex* GetYieldMutex() = 0; virtual ULONG ReleaseYieldMutex() = 0; virtual void AcquireYieldMutex( ULONG nCount ) = 0; diff --git a/vcl/inc/vcl/solarmutex.hxx b/vcl/inc/vcl/solarmutex.hxx new file mode 100644 index 000000000000..c4fa5d6de2e6 --- /dev/null +++ b/vcl/inc/vcl/solarmutex.hxx @@ -0,0 +1,76 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _VCL_SOLARMUTEX_HXX_ +#define _VCL_SOLARMUTEX_HXX_ + +#include <osl/mutex.hxx> +#include <vcl/dllapi.h> + +namespace vcl +{ + +/** Implementation of the SolarMutex interface. + */ +class VCL_DLLPUBLIC SolarMutexObject : public osl::SolarMutex +{ +public: + //static SolarMutex& SAL_CALL getGlobalMutex(); + + /** Creates mutex + */ + SolarMutexObject(); + + /** Implicitly destroys mutex + */ + virtual ~SolarMutexObject(); + + /** Blocks if Mutex is already in use + */ + virtual void SAL_CALL acquire(); + + /** Tries to get the mutex without blocking. + @return True if mutex could be obtained, otherwise False + */ + virtual sal_Bool SAL_CALL tryToAcquire(); + + /** Releases the mutex. + */ + virtual void SAL_CALL release(); + +protected: + oslMutex m_solarMutex; + +private: + /* Disable copy/assignment + */ + SolarMutexObject( const SolarMutexObject& ); + SolarMutexObject& SAL_CALL operator=( const SolarMutexObject& ); +}; + +} + +#endif // _VCL_SOLARMUTEX_HXX_ diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 55c424d050c2..e608b61d0b7f 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -30,7 +30,7 @@ #define _SV_SVAPP_HXX #include <osl/thread.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/unqid.hxx> @@ -279,7 +279,7 @@ public: static void Reschedule( bool bAllEvents = false ); static void Yield( bool bAllEvents = false ); static void EndYield(); - static vos::IMutex& GetSolarMutex(); + static osl::SolarMutex& GetSolarMutex(); static oslThreadIdentifier GetMainThreadIdentifier(); static ULONG ReleaseSolarMutex(); static void AcquireSolarMutex( ULONG nCount ); @@ -504,7 +504,7 @@ class VCL_DLLPUBLIC SolarMutexGuard private: SolarMutexGuard( const SolarMutexGuard& ); const SolarMutexGuard& operator = ( const SolarMutexGuard& ); - ::vos::IMutex& m_solarMutex; + ::osl::SolarMutex& m_solarMutex; public: @@ -557,7 +557,7 @@ public: } } protected: - vos::IMutex& m_solarMutex; + osl::SolarMutex& m_solarMutex; }; diff --git a/vcl/os2/inc/salinst.h b/vcl/os2/inc/salinst.h index 0948f605c286..ddb2050b33e3 100644 --- a/vcl/os2/inc/salinst.h +++ b/vcl/os2/inc/salinst.h @@ -30,6 +30,7 @@ #include <vcl/sv.h> #include <vcl/salinst.hxx> +#include <vcl/solarmutex.hxx> namespace vos { class OMutex; } @@ -52,7 +53,7 @@ public: char** mpArgv; // commandline HWND mhComWnd; // window, for communication (between threads and the main thread) SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex - vos::OMutex* mpSalWaitMutex; // Sal-Wait-Mutex + osl::Mutex* mpSalWaitMutex; // Sal-Wait-Mutex USHORT mnYieldWaitCount; // Wait-Count public: @@ -82,7 +83,7 @@ public: virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); virtual SalBitmap* CreateSalBitmap(); - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); virtual void Yield( bool, bool ); diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index e89c345edc9a..90483bdb3a9b 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -36,7 +36,7 @@ #define _SV_SALINST_CXX -#include <vos/mutex.hxx> +#include <vcl/solarmutex.hxx> #include <tools/debug.hxx> #include <salids.hrc> @@ -82,7 +82,7 @@ MRESULT EXPENTRY SalComWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nMP2 // ======================================================================= -class SalYieldMutex : public vos::OMutex +class SalYieldMutex : public vcl::SolarMutexObject { public: Os2SalInstance* mpInstData; @@ -112,7 +112,7 @@ SalYieldMutex::SalYieldMutex( Os2SalInstance* pInstData ) void SalYieldMutex::acquire() { - OMutex::acquire(); + SolarMutexObject::acquire(); mnCount++; mnThreadId = GetCurrentThreadId(); } @@ -123,7 +123,7 @@ void SalYieldMutex::release() { ULONG nThreadId = GetCurrentThreadId(); if ( mnThreadId != nThreadId ) - OMutex::release(); + SolarMutexObject::release(); else { SalData* pSalData = GetSalData(); @@ -136,13 +136,13 @@ void SalYieldMutex::release() WinPostMsg( mpInstData->mhComWnd, SAL_MSG_RELEASEWAITYIELD, 0, 0 ); mnThreadId = 0; mnCount--; - OMutex::release(); + SolarMutexObject::release(); mpInstData->mpSalWaitMutex->release(); } else { mnCount--; - OMutex::release(); + SolarMutexObject::release(); } } else @@ -150,7 +150,7 @@ void SalYieldMutex::release() if ( mnCount == 1 ) mnThreadId = 0; mnCount--; - OMutex::release(); + SolarMutexObject::release(); } } } @@ -159,7 +159,7 @@ void SalYieldMutex::release() sal_Bool SalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { mnCount++; mnThreadId = GetCurrentThreadId(); @@ -493,7 +493,7 @@ Os2SalInstance::Os2SalInstance() { mhComWnd = 0; mpSalYieldMutex = new SalYieldMutex( this ); - mpSalWaitMutex = new vos::OMutex; + mpSalWaitMutex = new osl::Mutex; mnYieldWaitCount = 0; mpSalYieldMutex->acquire(); ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex ); @@ -512,7 +512,7 @@ Os2SalInstance::~Os2SalInstance() // ----------------------------------------------------------------------- -vos::IMutex* Os2SalInstance::GetYieldMutex() +osl::SolarMutex* Os2SalInstance::GetYieldMutex() { return mpSalYieldMutex; } diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 38c025b5a5af..b0e1aa2cd807 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -99,6 +99,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\settings.hxx %_DEST%\inc%_EXT%\vcl\settings.hxx ..\inc\vcl\slider.hxx %_DEST%\inc%_EXT%\vcl\slider.hxx ..\inc\vcl\sndstyle.hxx %_DEST%\inc%_EXT%\vcl\sndstyle.hxx +..\inc\vcl\solarmutex.hxx %_DEST%\inc%_EXT%\vcl\solarmutex.hxx ..\inc\vcl\sound.hxx %_DEST%\inc%_EXT%\vcl\sound.hxx ..\inc\vcl\spin.h %_DEST%\inc%_EXT%\vcl\spin.h ..\inc\vcl\spin.hxx %_DEST%\inc%_EXT%\vcl\spin.hxx diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 65b7e2283361..cee78645b9f2 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -63,7 +63,7 @@ #include <vcl/unohelp.hxx> #include <vcl/unohelp2.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <map> #include <algorithm> diff --git a/vcl/source/app/makefile.mk b/vcl/source/app/makefile.mk index f0884a96a3ee..6e9c91f3c2e7 100644 --- a/vcl/source/app/makefile.mk +++ b/vcl/source/app/makefile.mk @@ -60,6 +60,7 @@ SLOFILES= $(SLO)$/dbggui.obj \ $(SLO)$/vclevent.obj \ $(SLO)$/i18nhelp.obj \ $(SLO)$/salvtables.obj \ + $(SLO)$/solarmutex.obj \ $(SLO)$/session.obj # --- Targets ------------------------------------------------------ diff --git a/vos/source/mutex.cxx b/vcl/source/app/solarmutex.cxx index 55eb313903c4..6423a74e6c61 100644 --- a/vos/source/mutex.cxx +++ b/vcl/source/app/solarmutex.cxx @@ -26,49 +26,32 @@ * ************************************************************************/ -#include <osl/diagnose.h> -#include <vos/object.hxx> -#include <vos/mutex.hxx> +#include <vcl/solarmutex.hxx> -using namespace vos; +using namespace vcl; -///////////////////////////////////////////////////////////////////////////// -// -// class Mutex -// - -VOS_IMPLEMENT_CLASSINFO(VOS_CLASSNAME(OMutex, vos), VOS_NAMESPACE(OMutex, vos), VOS_NAMESPACE(OObject, vos), 0); - -IMutex& OMutex::getGlobalMutex() -{ - static OMutex theGlobalMutex; - - return theGlobalMutex; -} - -OMutex::OMutex() +SolarMutexObject::SolarMutexObject() : m_solarMutex( osl_createMutex() ) { - m_Impl= osl_createMutex(); } -OMutex::~OMutex() +SolarMutexObject::~SolarMutexObject() { - osl_destroyMutex(m_Impl); + osl_destroyMutex( m_solarMutex ); } -void OMutex::acquire() +void SolarMutexObject::acquire() { - osl_acquireMutex(m_Impl); + osl_acquireMutex( m_solarMutex ); } -sal_Bool OMutex::tryToAcquire() +sal_Bool SolarMutexObject::tryToAcquire() { - return osl_tryToAcquireMutex(m_Impl); + return osl_tryToAcquireMutex( m_solarMutex ); } -void OMutex::release() +void SolarMutexObject::release() { - osl_releaseMutex(m_Impl); + osl_releaseMutex( m_solarMutex ); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index cef68ca7ea1d..2bba83d0d287 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -34,7 +34,6 @@ #include "vcl/salframe.hxx" #include "vcl/salsys.hxx" #include "vos/process.hxx" -#include "vos/mutex.hxx" #include "tools/tools.h" #include "tools/debug.hxx" #include "tools/time.hxx" @@ -67,7 +66,7 @@ #include "osl/module.h" #include "osl/file.hxx" - +#include "osl/mutex.hxx" #include "osl/thread.h" #include "rtl/tencinfo.h" #include "rtl/instance.hxx" @@ -527,7 +526,7 @@ void Application::Quit() // ----------------------------------------------------------------------- -vos::IMutex& Application::GetSolarMutex() +osl::SolarMutex& Application::GetSolarMutex() { ImplSVData* pSVData = ImplGetSVData(); return *(pSVData->mpDefInst->GetYieldMutex()); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 771b1a8ba360..9fa919802728 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -34,7 +34,7 @@ #include <vcl/salinst.hxx> #include <vcl/salframe.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/process.h> #include <osl/file.hxx> diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 84609aae7bbf..b46e33686b9b 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -45,7 +45,7 @@ #include "vcl/svapp.hxx" #include "vcl/svdata.hxx" #include "vcl/salinst.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "osl/mutex.hxx" #include "cppuhelper/compbase1.hxx" diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 39d572c5f107..0ef45ccabd94 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -45,7 +45,7 @@ #include <vcl/msgbox.hxx> #include <vcl/window.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx index bd683ce62ee8..c47b3ca4908d 100644 --- a/vcl/source/gdi/bmpconv.cxx +++ b/vcl/source/gdi/bmpconv.cxx @@ -32,7 +32,7 @@ #include <vcl/bitmap.hxx> #include <vcl/impbmpconv.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/stream.hxx> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 3589bf6e9165..32f5ea768066 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/rendering/RenderingIntent.hpp> #include <rtl/instance.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/diagnose_ex.h> #include <vcl/canvasbitmap.hxx> diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index 05ec366a509b..d9417e3bacf0 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -33,11 +33,9 @@ #include <vcl/dndlcon.hxx> #include <vcl/window.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/svdata.hxx> -using namespace ::osl; -using namespace ::vos; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -91,7 +89,7 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { - MutexGuard aImplGuard( m_aMutex ); + osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtde.LocationX, dtde.LocationY ); @@ -131,7 +129,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException) { - MutexGuard aImplGuard( m_aMutex ); + osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtdee.LocationX, dtdee.LocationY ); Window * pChildWindow = findTopLevelWindow(location); @@ -159,7 +157,7 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) throw(RuntimeException) { - MutexGuard aImplGuard( m_aMutex ); + osl::MutexGuard aImplGuard( m_aMutex ); fireDragExitEvent( m_pCurrentWindow ); @@ -175,7 +173,7 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException) { - MutexGuard aImplGuard( m_aMutex ); + osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtde.LocationX, dtde.LocationY ); sal_Int32 nListeners; @@ -216,7 +214,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException) { - MutexGuard aImplGuard( m_aMutex ); + osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtde.LocationX, dtde.LocationY ); sal_Int32 nListeners; @@ -257,7 +255,8 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException) -{ MutexGuard aImplGuard( m_aMutex ); +{ + osl::MutexGuard aImplGuard( m_aMutex ); Point origin( dge.DragOriginX, dge.DragOriginY ); @@ -370,7 +369,7 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime if( pWindow && pWindow->IsInputEnabled() && ! pWindow->IsInModalMode() ) { - OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aGuard; // query DropTarget from window Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget(); @@ -401,7 +400,7 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, if( pWindow && pWindow->IsInputEnabled() && ! pWindow->IsInModalMode() ) { - OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aGuard; // query DropTarget from window Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget(); @@ -434,7 +433,7 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, if( pWindow && pWindow->IsInputEnabled() && ! pWindow->IsInModalMode() ) { - OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aGuard; // query DropTarget from window Reference< XDropTarget > xDropTarget = pWindow->GetDropTarget(); @@ -479,7 +478,7 @@ sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, if( pWindow && pWindow->IsInputEnabled() && ! pWindow->IsInModalMode() ) { - OClearableGuard aGuard( Application::GetSolarMutex() ); + SolarMutexClearableGuard aGuard; // query DropTarget from window Reference< XDragGestureRecognizer > xDragGestureRecognizer = pWindow->GetDragGestureRecognizer(); diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index ed55c84e5b1b..ecca58011c49 100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx @@ -50,7 +50,6 @@ #include <stdio.h> using namespace ::rtl; -using namespace ::vos; using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index d851a4da9565..9896456f91ec 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> // <-- #include <cppuhelper/implbase1.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/ref.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index deb880c44bcc..159820ec3dbd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -245,30 +245,30 @@ void GtkYieldMutex::acquire() { oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); // protect member manipulation - OMutex::acquire(); + SolarMutexObject::acquire(); if( mnCount > 0 && mnThreadId == aCurrentThread ) { mnCount++; - OMutex::release(); + SolarMutexObject::release(); return; } - OMutex::release(); + SolarMutexObject::release(); // obtain gdk mutex gdk_threads_enter(); // obtained gdk mutex, now lock count is one by definition - OMutex::acquire(); + SolarMutexObject::acquire(); mnCount = 1; mnThreadId = aCurrentThread; - OMutex::release(); + SolarMutexObject::release(); } void GtkYieldMutex::release() { oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); // protect member manipulation - OMutex::acquire(); + SolarMutexObject::acquire(); // strange things happen, do nothing if we don't own the mutex if( mnThreadId == aCurrentThread ) { @@ -279,29 +279,29 @@ void GtkYieldMutex::release() mnThreadId = 0; } } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool GtkYieldMutex::tryToAcquire() { oslThreadIdentifier aCurrentThread = osl::Thread::getCurrentIdentifier(); // protect member manipulation - OMutex::acquire(); + SolarMutexObject::acquire(); if( mnCount > 0 ) { if( mnThreadId == aCurrentThread ) { mnCount++; - OMutex::release(); + SolarMutexObject::release(); return sal_True; } else { - OMutex::release(); + SolarMutexObject::release(); return sal_False; } } - OMutex::release(); + SolarMutexObject::release(); // HACK: gdk_threads_mutex is private, we shouldn't use it. // how to we do a try_lock without having a gdk_threads_try_enter ? @@ -309,10 +309,10 @@ sal_Bool GtkYieldMutex::tryToAcquire() return sal_False; // obtained gdk mutex, now lock count is one by definition - OMutex::acquire(); + SolarMutexObject::acquire(); mnCount = 1; mnThreadId = aCurrentThread; - OMutex::release(); + SolarMutexObject::release(); return sal_True; } @@ -325,7 +325,7 @@ int GtkYieldMutex::Grab() // is now locked again by gtk implicitly // obtained gdk mutex, now lock count is one by definition - OMutex::acquire(); + SolarMutexObject::acquire(); int nRet = mnCount; if( mnCount == 0 ) // recursive else mnThreadId = osl::Thread::getCurrentIdentifier(); @@ -337,7 +337,7 @@ int GtkYieldMutex::Grab() } #endif mnCount = 1; - OMutex::release(); + SolarMutexObject::release(); return nRet; } @@ -345,11 +345,11 @@ void GtkYieldMutex::Ungrab( int nGrabs ) { // this MUST only be called when leaving the callback // that locked the mutex with Grab() - OMutex::acquire(); + SolarMutexObject::acquire(); mnCount = nGrabs; if( mnCount == 0 ) mnThreadId = 0; - OMutex::release(); + SolarMutexObject::release(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index a9b862bab609..10faf81434ba 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -41,6 +41,7 @@ #include <vcl/svdata.hxx> #include <vcl/salatype.hxx> #include <vcl/saldatabasic.hxx> +#include <vcl/solarmutex.hxx> #include <sal/types.h> // plugin factory function @@ -295,7 +296,7 @@ SalBitmap* SvpSalInstance::CreateSalBitmap() return new SvpSalBitmap(); } -vos::IMutex* SvpSalInstance::GetYieldMutex() +osl::SolarMutex* SvpSalInstance::GetYieldMutex() { return &m_aYieldMutex; } @@ -464,7 +465,7 @@ SvpSalYieldMutex::SvpSalYieldMutex() void SvpSalYieldMutex::acquire() { - OMutex::acquire(); + SolarMutexObject::acquire(); mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; } @@ -477,12 +478,12 @@ void SvpSalYieldMutex::release() mnThreadId = 0; mnCount--; } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool SvpSalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 198cc9cb613c..ace3ac7c236c 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -32,7 +32,9 @@ #include <vcl/salinst.hxx> #include <vcl/salwtype.hxx> #include <vcl/saltimer.hxx> -#include <vos/mutex.hxx> +#include <vcl/solarmutex.hxx> + +#include <osl/mutex.hxx> #include <osl/thread.hxx> #include <list> @@ -47,7 +49,7 @@ // SalYieldMutex // ------------------------------------------------------------------------- -class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex) +class SvpSalYieldMutex : public ::vcl::SolarMutexObject { protected: ULONG mnCount; @@ -174,7 +176,7 @@ public: virtual SalBitmap* CreateSalBitmap(); // YieldMutex - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h index e79648700272..6b578594e4a7 100644 --- a/vcl/unx/inc/salinst.h +++ b/vcl/unx/inc/salinst.h @@ -30,16 +30,12 @@ #define _SV_SALINST_H #include <vcl/sv.h> -#ifndef _VOS_MUTEX_HXX -#include <vos/mutex.hxx> -#endif -#ifndef _THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <vcl/dllapi.h> #include <vcl/salinst.hxx> +#include <vcl/solarmutex.hxx> -class VCL_DLLPUBLIC SalYieldMutex : public NAMESPACE_VOS(OMutex) +class VCL_DLLPUBLIC SalYieldMutex : public vcl::SolarMutexObject { protected: ULONG mnCount; @@ -99,7 +95,7 @@ public: virtual SalBitmap* CreateSalBitmap(); virtual SalSession* CreateSalSession(); - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); diff --git a/vcl/unx/inc/salsys.h b/vcl/unx/inc/salsys.h index 102c90182cea..c74d11306e01 100644 --- a/vcl/unx/inc/salsys.h +++ b/vcl/unx/inc/salsys.h @@ -31,7 +31,7 @@ #include <vcl/sv.h> #ifndef _VOS_MUTEX_HXX -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #endif #ifndef _THREAD_HXX_ #include <osl/thread.hxx> diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index b3a7c953ffa0..9c4f43fc9db7 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -55,7 +55,7 @@ #include "i18n_im.hxx" #include "i18n_xkb.hxx" #include <vos/process.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> /* #i59042# override KApplications method for session management * since it will interfere badly with our own. diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx index 9b685aa552f0..657bacb7bb03 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/source/app/saldata.cxx @@ -58,7 +58,7 @@ #include <unistd.h> #endif #include <vos/process.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "Xproto.h" #include <saldisp.hxx> diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index e3a52772c3da..8a209d126a75 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -613,10 +613,12 @@ fd if( ! pDisplay->IsDisplay() ) return 0; - vos::IMutex* pSalInstYieldMutex = - GetSalData()->m_pInstance->GetYieldMutex(); - ::vos::OGuard aGuard( *pSalInstYieldMutex ); - return pDisplay->IsEvent(); + int result; + + GetSalData()->m_pInstance->GetYieldMutex()->acquire(); + result = pDisplay->IsEvent(); + GetSalData()->m_pInstance->GetYieldMutex()->release(); + return result; } static int DisplayQueue( int #ifdef DBG_UTIL @@ -626,11 +628,14 @@ fd { DBG_ASSERT( ConnectionNumber( pDisplay->GetDisplay() ) == fd, "wrong fd in DisplayHasEvent" ); - vos::IMutex* pSalInstYieldMutex = - GetSalData()->m_pInstance->GetYieldMutex(); - ::vos::OGuard aGuard( *pSalInstYieldMutex ); - return XEventsQueued( pDisplay->GetDisplay(), + int result; + + GetSalData()->m_pInstance->GetYieldMutex()->acquire(); + result = XEventsQueued( pDisplay->GetDisplay(), QueuedAfterReading ); + GetSalData()->m_pInstance->GetYieldMutex()->release(); + + return result; } static int DisplayYield( int #ifdef DBG_UTIL @@ -640,10 +645,10 @@ fd { DBG_ASSERT( ConnectionNumber( pDisplay->GetDisplay() ) == fd, "wrong fd in DisplayHasEvent" ); - vos::IMutex* pSalInstYieldMutex = - GetSalData()->m_pInstance->GetYieldMutex(); - ::vos::OGuard aGuard( *pSalInstYieldMutex ); + + GetSalData()->m_pInstance->GetYieldMutex()->acquire(); pDisplay->Yield(); + GetSalData()->m_pInstance->GetYieldMutex()->release(); return TRUE; } diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx index 20b23ae571b9..57f8d891a8a6 100644 --- a/vcl/unx/source/app/salinst.cxx +++ b/vcl/unx/source/app/salinst.cxx @@ -49,7 +49,7 @@ #include "vcl/salatype.hxx" #include "vcl/helper.hxx" #include <tools/solarmutex.hxx> -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include <sal/macros.h> // ------------------------------------------------------------------------- @@ -67,7 +67,7 @@ SalYieldMutex::SalYieldMutex() void SalYieldMutex::acquire() { - OMutex::acquire(); + SolarMutexObject::acquire(); mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; } @@ -80,12 +80,12 @@ void SalYieldMutex::release() mnThreadId = 0; mnCount--; } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool SalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; @@ -222,7 +222,7 @@ bool X11SalInstance::AnyInput(USHORT nType) return bRet; } -vos::IMutex* X11SalInstance::GetYieldMutex() +osl::SolarMutex* X11SalInstance::GetYieldMutex() { return mpSalYieldMutex; } diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index 707928c9c6a8..74d23b94f57f 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -74,7 +74,7 @@ #include <osl/process.h> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #define DRAG_EVENT_MASK ButtonPressMask |\ ButtonReleaseMask |\ @@ -89,7 +89,6 @@ using namespace com::sun::star::awt; using namespace com::sun::star::uno; using namespace com::sun::star::frame; using namespace cppu; -using namespace osl; using namespace rtl; using namespace x11; @@ -326,7 +325,7 @@ XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::com::sun::star::uno::Exception) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); if( ! m_xDisplayConnection.is() ) { @@ -478,7 +477,7 @@ SelectionManager::~SelectionManager() fprintf( stderr, "SelectionManager::~SelectionManager (%s)\n", m_pDisplay ? DisplayString(m_pDisplay) : "no display" ); #endif { - MutexGuard aGuard( *Mutex::getGlobalMutex() ); + osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); ::std::hash_map< OUString, SelectionManager*, OUStringHash >::iterator it; for( it = getInstances().begin(); it != getInstances().end(); ++it ) @@ -504,7 +503,7 @@ SelectionManager::~SelectionManager() // thread handle is freed in dragDoDispatch() } - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "shutting down SelectionManager\n" ); @@ -554,7 +553,7 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection ) OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); OUString aRet; if( nLen < 0 ) nLen = strlen( pText ); @@ -585,7 +584,7 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen ) OString SelectionManager::convertToCompound( const OUString& rText ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); XTextProperty aProp; aProp.value = NULL; aProp.encoding = XA_STRING; @@ -705,7 +704,7 @@ bool SelectionManager::convertData( SelectionManager& SelectionManager::get( const OUString& rDisplayName ) { - MutexGuard aGuard( *Mutex::getGlobalMutex() ); + osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() ); OUString aDisplayName( rDisplayName ); if( ! aDisplayName.getLength() ) @@ -724,7 +723,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName ) const OUString& SelectionManager::getString( Atom aAtom ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); ::std::hash_map< Atom, OUString >::const_iterator it; if( ( it = m_aAtomToString.find( aAtom ) ) == m_aAtomToString.end() ) @@ -745,7 +744,7 @@ const OUString& SelectionManager::getString( Atom aAtom ) Atom SelectionManager::getAtom( const OUString& rString ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); ::std::hash_map< OUString, Atom, OUStringHash >::const_iterator it; if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() ) @@ -765,7 +764,7 @@ bool SelectionManager::requestOwnership( Atom selection ) bool bSuccess = false; if( m_pDisplay && m_aWindow ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); SelectionAdaptor* pAdaptor = getAdaptor( selection ); if( pAdaptor ) @@ -901,7 +900,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData ) { - ResettableMutexGuard aGuard(m_aMutex); + osl::ResettableMutexGuard aGuard(m_aMutex); ::std::hash_map< Atom, Selection* >::iterator it; bool bSuccess = false; @@ -1045,7 +1044,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp ::std::hash_map< Atom, Selection* >::iterator it; { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); it = m_aSelections.find( selection ); if( it == m_aSelections.end() ) @@ -1141,7 +1140,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp Atom pTypes[4] = { XA_PIXMAP, XA_PIXMAP, XA_COLORMAP, XA_COLORMAP }; { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); XChangeProperty( m_pDisplay, m_aWindow, @@ -1159,7 +1158,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp Atom* pReturnedTypes = (Atom*)aData.getArray(); if( pReturnedTypes[0] == XA_PIXMAP && pReturnedTypes[1] == XA_PIXMAP ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); Atom type = None; int format = 0; @@ -1207,7 +1206,7 @@ bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rTyp // convert data if possible if( aPixmap != None ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); sal_Int32 nOutSize = 0; sal_uInt8* pBytes = X11_getBmpFromPixmap( m_pDisplay, aPixmap, aColormap, nOutSize ); @@ -1254,7 +1253,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > { ::std::hash_map< Atom, Selection* >::iterator it; { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); it = m_aSelections.find( selection ); if( it != m_aSelections.end() && @@ -1285,7 +1284,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > { const unsigned int atomcount = 256; // more than three types; look in property - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); Atom nType; int nFormat; @@ -1416,7 +1415,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > } { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); it = m_aSelections.find( selection ); if( it != m_aSelections.end() ) @@ -1478,7 +1477,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, Atom property, Atom selection ) { - ResettableMutexGuard aGuard( m_aMutex ); + osl::ResettableMutexGuard aGuard( m_aMutex ); // handle targets related to image/bmp if( target == XA_COLORMAP || target == XA_PIXMAP || target == XA_BITMAP || target == XA_VISUALID ) @@ -1638,7 +1637,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest ) { - ResettableMutexGuard aGuard( m_aMutex ); + osl::ResettableMutexGuard aGuard( m_aMutex ); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "handleSelectionRequest for selection %s and target %s\n", OUStringToOString( getString( rRequest.selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr(), @@ -1846,7 +1845,7 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); // data we requested arrived #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "handleReceivePropertyNotify for property %s\n", @@ -1965,7 +1964,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify ) bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); // ready for next part of a IncrementalTransfer #if OSL_DEBUG_LEVEL > 1 @@ -2065,7 +2064,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); bool bHandled = false; @@ -2158,7 +2157,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify ) bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { - ResettableMutexGuard aGuard(m_aMutex); + osl::ResettableMutexGuard aGuard(m_aMutex); // handle drop related events XLIB_Window aSource = rMessage.data.l[0]; @@ -2340,7 +2339,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); if( aDropWindow == m_aCurrentDropWindow ) { @@ -2408,7 +2407,7 @@ void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, void SelectionManager::sendDragStatus( Atom nDropAction ) { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); if( m_xDragSourceListener.is() ) { @@ -2537,7 +2536,7 @@ bool SelectionManager::updateDragAction( int modifierState ) void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); if( m_bDropSent ) return; @@ -2600,7 +2599,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) if( ! m_xDragSourceListener.is() ) return false; - ResettableMutexGuard aGuard(m_aMutex); + osl::ResettableMutexGuard aGuard(m_aMutex); bool bHandled = false; @@ -3057,7 +3056,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) { - ResettableMutexGuard aGuard( m_aMutex ); + osl::ResettableMutexGuard aGuard( m_aMutex ); Reference< XDragSourceListener > xListener( m_xDragSourceListener ); @@ -3252,7 +3251,7 @@ void SelectionManager::startDrag( SalFrame* pCaptureFrame = NULL; { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); // first get the current pointer position and the window that // the pointer is located in. since said window should be one @@ -3328,7 +3327,7 @@ void SelectionManager::startDrag( */ if( nPointerGrabSuccess != GrabSuccess ) { - vos::IMutex& rSolarMutex( Application::GetSolarMutex() ); + osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) { pCaptureFrame = GetX11SalData()->GetDisplay()->GetCaptureFrame(); @@ -3369,7 +3368,7 @@ void SelectionManager::startDrag( listener->dragDropEnd( aDragFailedEvent ); if( pCaptureFrame ) { - vos::IMutex& rSolarMutex( Application::GetSolarMutex() ); + osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 @@ -3458,7 +3457,7 @@ void SelectionManager::startDrag( if( pCaptureFrame ) { - vos::IMutex& rSolarMutex( Application::GetSolarMutex() ); + osl::SolarMutex& rSolarMutex( Application::GetSolarMutex() ); if( rSolarMutex.tryToAcquire() ) GetX11SalData()->GetDisplay()->CaptureMouse( pCaptureFrame ); #if OSL_DEBUG_LEVEL > 0 @@ -3502,7 +3501,7 @@ void SelectionManager::dragDoDispatch() fprintf( stderr, "end executeDrag dispatching\n" ); #endif { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); Reference< XDragSourceListener > xListener( m_xDragSourceListener ); Reference< XTransferable > xTransferable( m_xDragSourceTransferable ); @@ -3562,7 +3561,7 @@ sal_Int32 SelectionManager::getCurrentCursor() void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) { - MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); if( aDropWindow == m_aDropWindow && XLIB_Cursor(cursor) != m_aCurrentCursor ) { if( m_xDragSourceListener.is() && ! m_bDropSent ) @@ -3584,7 +3583,7 @@ void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time ) void SelectionManager::transferablesFlavorsChanged() { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); m_aDragFlavors = m_xDragSourceTransferable->getTransferDataFlavors(); int i; @@ -3660,7 +3659,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent ) { case SelectionClear: { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "SelectionClear for selection %s\n", OUStringToOString( getString( rEvent.xselectionclear.selection ), RTL_TEXTENCODING_ISO_8859_1 ).getStr() @@ -3736,7 +3735,7 @@ void SelectionManager::dispatchEvent( int millisec ) { // now acquire the mutex to prevent other threads // from using the same X connection - ResettableMutexGuard aGuard(m_aMutex); + osl::ResettableMutexGuard aGuard(m_aMutex); // prevent that another thread already ate the input // this can happen if e.g. another thread does @@ -3792,7 +3791,7 @@ void SelectionManager::run( void* pThis ) if( (aNow.tv_sec - aLast.tv_sec) > 0 ) { - ClearableMutexGuard aGuard(This->m_aMutex); + osl::ClearableMutexGuard aGuard(This->m_aMutex); std::list< std::pair< SelectionAdaptor*, Reference< XInterface > > > aChangeList; for( std::hash_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it ) @@ -3825,7 +3824,7 @@ void SelectionManager::run( void* pThis ) void SelectionManager::shutdown() throw() { - ResettableMutexGuard aGuard(m_aMutex); + osl::ResettableMutexGuard aGuard(m_aMutex); // stop dispatching if( m_aThread ) { @@ -3880,7 +3879,7 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw() if( nTimestamp != CurrentTime ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); m_nSelectionTimestamp = nTimestamp; } @@ -3928,7 +3927,7 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang: void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); Selection* pNewSelection = new Selection(); pNewSelection->m_pAdaptor = &rAdaptor; @@ -3940,7 +3939,7 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt void SelectionManager::deregisterHandler( Atom selection ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); ::std::hash_map< Atom, Selection* >::iterator it = m_aSelections.find( selection ); @@ -3968,7 +3967,7 @@ extern "C" void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTarget ) { - MutexGuard aGuard(m_aMutex); + osl::MutexGuard aGuard(m_aMutex); // sanity check ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it = @@ -4012,7 +4011,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) { - ClearableMutexGuard aGuard(m_aMutex); + osl::ClearableMutexGuard aGuard(m_aMutex); m_aDropTargets.erase( aWindow ); if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() ) diff --git a/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h index f3005e3ad30b..1388763db726 100644 --- a/vcl/win/inc/salinst.h +++ b/vcl/win/inc/salinst.h @@ -31,8 +31,6 @@ #include <vcl/sv.h> #include <vcl/salinst.hxx> -namespace vos { class OMutex; } - // ------------------- // - SalInstanceData - // ------------------- @@ -45,7 +43,7 @@ public: HINSTANCE mhInst; // Instance Handle HWND mhComWnd; // window, for communication (between threads and the main thread) SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex - vos::OMutex* mpSalWaitMutex; // Sal-Wait-Mutex + osl::Mutex* mpSalWaitMutex; // Sal-Wait-Mutex USHORT mnYieldWaitCount; // Wait-Count public: WinSalInstance(); @@ -74,7 +72,7 @@ public: virtual SalI18NImeStatus* CreateI18NImeStatus(); virtual SalSystem* CreateSalSystem(); virtual SalBitmap* CreateSalBitmap(); - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index eaa10b608269..ec8384cad451 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -38,7 +38,7 @@ #include <excpt.h> #endif #include <osl/file.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/debug.hxx> #include <wincomp.hxx> #include <salids.hrc> @@ -660,7 +660,7 @@ WinSalInstance::WinSalInstance() { mhComWnd = 0; mpSalYieldMutex = new SalYieldMutex( this ); - mpSalWaitMutex = new vos::OMutex; + mpSalWaitMutex = new osl::Mutex; mnYieldWaitCount = 0; mpSalYieldMutex->acquire(); ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex ); @@ -679,7 +679,7 @@ WinSalInstance::~WinSalInstance() // ----------------------------------------------------------------------- -vos::IMutex* WinSalInstance::GetYieldMutex() +osl::SolarMutex* WinSalInstance::GetYieldMutex() { return mpSalYieldMutex; } diff --git a/vos/inc/vos/mutex.hxx b/vos/inc/vos/mutex.hxx deleted file mode 100644 index f91547d73cf8..000000000000 --- a/vos/inc/vos/mutex.hxx +++ /dev/null @@ -1,185 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VOS_MUTEX_HXX_ -#define _VOS_MUTEX_HXX_ - -# include <vos/types.hxx> -# include <vos/object.hxx> -# include <osl/mutex.h> - -namespace vos -{ - - -/** IMutex interface - - @author Bernd Hofner - @version 1.0 -*/ - -class IMutex -{ -public: - - /// Blocks if Mutex is already in use - virtual void SAL_CALL acquire()= 0; - - // Tries to get the mutex without blocking. - virtual sal_Bool SAL_CALL tryToAcquire()= 0; - - /// releases the mutex. - virtual void SAL_CALL release()= 0; - -protected: - IMutex() { } - virtual ~IMutex() { } - -}; - -// ---------------------------------------------------------- - -/** OMutex - - @author Bernd Hofner - @version 1.0 -*/ - -class OMutex : public OObject, public IMutex -{ - VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OMutex, vos)); - -public: - static IMutex& SAL_CALL getGlobalMutex(); - - /// Creates mutex - OMutex(); - /// Implicitly destroys mutex - virtual ~OMutex(); - - /// Blocks if Mutex is already in use - virtual void SAL_CALL acquire(); - - /** Tries to get the mutex without blocking. - @return True if mutex could be obtained, otherwise False - */ - virtual sal_Bool SAL_CALL tryToAcquire(); - - /// releases the mutex. - virtual void SAL_CALL release(); - -protected: - oslMutex m_Impl; - -private: - // disable copy/assignment - OMutex(const OMutex&); - OMutex& SAL_CALL operator= (const OMutex&); -}; - -// ********************************************************************************* - -/** OGuard - - @author Bernd Hofner - @version 1.0 -*/ - -class OGuard -{ - OGuard( const OGuard& ); - const OGuard& operator = ( const OGuard& ); -public: - /** Acquires mutex - @param pMutex pointer to mutex which is to be acquired */ - OGuard(IMutex* pMutex) - : m_rMutex( *pMutex ) - { // only for compatible reasons - m_rMutex.acquire(); - } - OGuard(IMutex & rMutex) - : m_rMutex( rMutex ) - { - m_rMutex.acquire(); - } - - /** Releases mutex. */ - virtual ~OGuard() - { - m_rMutex.release(); - } - -protected: - IMutex& m_rMutex; -}; - -/** A guard that can release the mutex with the clear method. - - @author Bernd Hofner - @version 1.0 -*/ -class OClearableGuard -{ - OClearableGuard( const OClearableGuard& ); - const OClearableGuard& operator = ( const OClearableGuard& ); -public: - /** Acquires mutex - @param pMutex pointer to mutex which is to be acquired */ - OClearableGuard(IMutex & rMutex) - : m_pMutex( &rMutex ) - { - m_pMutex->acquire(); - } - - /** Releases mutex. */ - virtual ~OClearableGuard() - { - if( m_pMutex ) - m_pMutex->release(); - } - - /** Releases mutex. */ - void SAL_CALL clear() - { - if( m_pMutex ) - { - m_pMutex->release(); - m_pMutex = NULL; - } - } -protected: - IMutex* m_pMutex; -}; - -} - - -#endif //_VOS_MUTEX_HXX_ - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx index 1cf6d0fa2ecb..ddc1c918fac2 100644 --- a/vos/inc/vos/process.hxx +++ b/vos/inc/vos/process.hxx @@ -30,7 +30,7 @@ #define _VOS_PROCESS_HXX_ # include <rtl/ustring.hxx> -# include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/security.hxx> # include <vos/object.hxx> #include <osl/process.h> diff --git a/vos/source/makefile.mk b/vos/source/makefile.mk index 71faed51b33f..d890b7f554d0 100644 --- a/vos/source/makefile.mk +++ b/vos/source/makefile.mk @@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- -SLOFILES= $(SLO)$/mutex.obj \ +SLOFILES= \ $(SLO)$/object.obj \ $(SLO)$/refernce.obj \ $(SLO)$/thread.obj \ @@ -48,7 +48,7 @@ SLOFILES= $(SLO)$/mutex.obj \ .IF "$(UPDATER)"=="YES" -OBJFILES= $(OBJ)$/mutex.obj \ +OBJFILES= \ $(OBJ)$/object.obj \ $(OBJ)$/refernce.obj \ $(OBJ)$/thread.obj \ diff --git a/vos/source/process.cxx b/vos/source/process.cxx index a062e1585ad7..71cee3525bec 100644 --- a/vos/source/process.cxx +++ b/vos/source/process.cxx @@ -486,7 +486,7 @@ void OExtCommandLineImpl::init() namespace { - struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {}; + struct lclMutex : public rtl::Static< ::osl::Mutex, lclMutex > {}; } OExtCommandLineImpl* OExtCommandLine::pExtImpl=0; @@ -499,7 +499,7 @@ VOS_IMPLEMENT_CLASSINFO( OExtCommandLine::OExtCommandLine() { - OGuard Guard(lclMutex::get()); + ::osl::MutexGuard Guard(lclMutex::get()); if ( pExtImpl == NULL ) { |