diff options
Diffstat (limited to 'framework/source/dispatch/helpagentdispatcher.cxx')
| -rw-r--r-- | framework/source/dispatch/helpagentdispatcher.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index a67dbd71f596..4ae8ac15ee6f 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -229,7 +229,7 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() // show the right help content // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; Help* pHelp = Application::GetHelp(); if (pHelp) pHelp->Start(sAcceptedURL, NULL); @@ -266,7 +266,7 @@ void HelpAgentDispatcher::implts_stopTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (! m_aTimer.IsActive()) return; m_aTimer.Stop(); @@ -281,7 +281,7 @@ void HelpAgentDispatcher::implts_startTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; if (m_aTimer.IsActive()) return; } @@ -302,7 +302,7 @@ void HelpAgentDispatcher::implts_startTimer() // Timer access needs no "own lock" ! It lives if we live ... // But it requires locking of the solar mutex ... because it's a vcl based timer. { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; m_aTimer.SetTimeout(nTime*1000); // sec => ms ! m_aTimer.Start(); } @@ -411,7 +411,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent ::svt::HelpAgentWindow* pAgentWindow = 0; // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // create the agent window Window* pContainerWindow = VCLUnoHelper::GetWindow(xContainerWindow); pAgentWindow = new ::svt::HelpAgentWindow(pContainerWindow); @@ -431,7 +431,7 @@ css::uno::Reference< css::awt::XWindow > HelpAgentDispatcher::implts_ensureAgent // SOLAR SAFE -> { - ::vos::OGuard aSolarLock(Application::GetSolarMutex()); + SolarMutexGuard aSolarLock; // establish callback for our internal used timer. // Note: Its only active, if the timer will be started ... m_aTimer.SetTimeoutHdl(LINK(this, HelpAgentDispatcher, implts_timerExpired)); |