diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 01:47:23 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:36 -0500 |
| commit | 18a9a87a805b94ad8f7b8a67d63a8568bfd295e7 (patch) | |
| tree | 5114eb2cabf9872df50dfb0ca8fd23c7378cd4f0 /svtools/source/java | |
| parent | b450a32890184a18ed176dbf717e944190cbe643 (diff) | |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'svtools/source/java')
| -rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 92172c9c5bc5..d2ae5bae8b95 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -146,7 +146,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque if( ! (m_bShowErrorsOnce && m_bJavaNotFound_Handled)) { // No suitable JRE found - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bJavaNotFound_Handled = true; //We first try to get the patch resource svp680xxx.res //If the resource is not found then svt680xxx.res is used @@ -181,7 +181,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque if( !(m_bShowErrorsOnce && m_bInvalidSettings_Handled)) { // javavendors.xml was updated and Java has not been configured yet - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bInvalidSettings_Handled = true; //We first try to get the patch resource svp680xxx.res //If the resource is not found then svt680xxx.res is used @@ -214,7 +214,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque { if( !(m_bShowErrorsOnce && m_bJavaDisabled_Handled)) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. //We first try to get the patch resource svp680xxx.res @@ -259,7 +259,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque if( !(m_bShowErrorsOnce && m_bVMCreationFailure_Handled)) { // Java not correctly installed, or damaged - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bVMCreationFailure_Handled = true; //We first try to get the patch resource svp680xxx.res //If the resource is not found then svt680xxx.res is used @@ -294,7 +294,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque { // a new JRE was selected, but office needs to be restarted //before it can be used. - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bRestartRequired_Handled = true; //We first try to get the patch resource svp680xxx.res //If the resource is not found then svt680xxx.res is used |