diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 09:17:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 09:43:17 +0100 |
| commit | 445ec65a85624e4505c91c31f81c978a3d639c18 (patch) | |
| tree | 975fc64b7c6eb6cdd5ab6234d7f31b8749ceff4d /framework/source/interaction | |
| parent | 15bb864ea81b64ecfdd69e8831fb729ca44a542e (diff) | |
Use SolarMutexGuard directly
Change-Id: Iddb38d3404a8b1a4e33e291e1f51ad63cacaa255
Diffstat (limited to 'framework/source/interaction')
| -rw-r--r-- | framework/source/interaction/quietinteraction.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 2ec220c5ccdf..1717bf0cc17f 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -19,7 +19,6 @@ #include "interaction/quietinteraction.hxx" -#include <threadhelp/guard.hxx> #include <macros/generic.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> @@ -43,8 +42,7 @@ namespace framework{ QuietInteraction::QuietInteraction() - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , m_aRequest ( ) + : m_aRequest ( ) { } @@ -54,11 +52,10 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI { // safe the request for outside analyzing everytime! css::uno::Any aRequest = xRequest->getRequest(); - /* SAFE { */ - Guard aWriteLock(m_aLock); - m_aRequest = aRequest; - aWriteLock.unlock(); - /* } SAFE */ + { + SolarMutexGuard g; + m_aRequest = aRequest; + } // analyze the request // We need XAbort as possible continuation as minimum! @@ -141,20 +138,16 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI css::uno::Any QuietInteraction::getRequest() const { - /* SAFE { */ - Guard aReadLock(m_aLock); + SolarMutexGuard g; return m_aRequest; - /* } SAFE */ } sal_Bool QuietInteraction::wasUsed() const { - /* SAFE { */ - Guard aReadLock(m_aLock); + SolarMutexGuard g; return m_aRequest.hasValue(); - /* } SAFE */ } } // namespace framework |