diff options
Diffstat (limited to 'vcl/aqua/source')
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/aqua/source/window/salframeview.mm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 5a3ad3304768..b97bbd555387 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -102,7 +102,7 @@ class AquaDelayedSettingsChanged : public Timer void AquaSalInstance::delayedSettingsChanged( bool bInvalidate ) { - osl::SolarGuard aGuard( *mpSalYieldMutex ); + osl::Guard< comphelper::SolarMutex > aGuard( *mpSalYieldMutex ); AquaDelayedSettingsChanged* pTimer = new AquaDelayedSettingsChanged( bInvalidate ); pTimer->SetTimeout( 50 ); pTimer->Start(); @@ -460,7 +460,7 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi // ----------------------------------------------------------------------- -osl::SolarMutex* AquaSalInstance::GetYieldMutex() +comphelper::SolarMutex* AquaSalInstance::GetYieldMutex() { return mpSalYieldMutex; } diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index d8ccd17e996a..2a35a4b32551 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -161,7 +161,7 @@ static AquaSalFrame* getMouseContainerFrame() { if( GetSalData() && GetSalData()->mpFirstInstance ) { - osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex(); + comphelper::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex(); if( pMutex ) { pMutex->acquire(); @@ -438,9 +438,9 @@ static AquaSalFrame* getMouseContainerFrame() return NO; } -// helper class similar to a osl::SolarGuard for the SalYieldMutex -// the difference is that it only does tryToAcquire instead of aquire -// so dreaded deadlocks like #i93512# are prevented +// helper class similar to a osl::Guard< comphelper::SolarMutex > for the +// SalYieldMutex; the difference is that it only does tryToAcquire instead of +// acquire so dreaded deadlocks like #i93512# are prevented class TryGuard { public: |