diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 02:47:36 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:33 -0500 |
commit | f4f4a8ed4f56035cc9f536d00f62a552af974cf0 (patch) | |
tree | e247bfb2431e1413704de1286952e8e5d6eb1bfd /uui | |
parent | 3a81649a55a49705d907a6ee72c92e26d2d4f2ee (diff) |
use SolarMutexGuard to guard the SolarMutex
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 6 | ||||
-rw-r--r-- | uui/source/iahndl-cookies.cxx | 2 | ||||
-rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 6 | ||||
-rw-r--r-- | uui/source/iahndl-filter.cxx | 2 | ||||
-rw-r--r-- | uui/source/iahndl-locking.cxx | 6 | ||||
-rw-r--r-- | uui/source/iahndl-ssl.cxx | 4 | ||||
-rw-r--r-- | uui/source/iahndl.cxx | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 7c9a470aa5d6..3f669c3f8da7 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -71,7 +71,7 @@ executeLoginDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; bool bAccount = (rInfo.GetFlags() & LOGINERROR_FLAG_MODIFY_ACCOUNT) != 0; bool bSavePassword = rInfo.GetCanRememberPassword(); @@ -424,7 +424,7 @@ executeMasterPasswordDialog( rtl::OString aMaster; try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -526,7 +526,7 @@ executePasswordDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx index 50dceedd8d57..64b1999b7a38 100644 --- a/uui/source/iahndl-cookies.cxx +++ b/uui/source/iahndl-cookies.cxx @@ -61,7 +61,7 @@ executeCookieDialog(Window * pParent, CntHTTPCookieRequest & rRequest) { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index f06962988f8e..50f0308b7990 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -58,7 +58,7 @@ executeErrorDialog( WinBits nButtonMask) SAL_THROW((uno::RuntimeException)) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; rtl::OUStringBuffer aText(rContext); if (rContext.getLength() != 0 && rMessage.getLength() != 0) @@ -183,7 +183,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( SOURCE_SVX : SOURCE_UUI; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager; xManager.reset(ResMgr::CreateResMgr(aManager[eSource])); if (!xManager.get()) @@ -267,7 +267,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( rtl::OUString aContext(getContextProperty()); if (aContext.getLength() == 0 && nErrorCode != 0) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ErrorContext * pContext = ErrorContext::GetContext(); if (pContext) { diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 81a62e8db30c..3c7ababf9225 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -63,7 +63,7 @@ executeFilterDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 0c74b064d6c3..e8be19b1eddd 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -81,7 +81,7 @@ handleLockedDocumentRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -172,7 +172,7 @@ handleChangedByOthersRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) @@ -211,7 +211,7 @@ handleLockFileIgnoreRequest_( try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 044e28f3a2c2..7ef7bbf317fd 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -138,7 +138,7 @@ executeUnknownAuthDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); @@ -187,7 +187,7 @@ executeSSLWarnDialog( { try { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index c649056c52a5..f557808f3b56 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1152,7 +1152,7 @@ executeMessageBox( WinBits nButtonMask ) SAL_THROW((uno::RuntimeException)) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; MessBox xBox( pParent, nButtonMask, rTitle, rMessage ); @@ -1410,7 +1410,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( ::rtl::OUString aMessage; { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui))); if (!xManager.get()) |