diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 16:14:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 16:52:34 +0100 |
| commit | ab3acb7ef79fcae8776b8d1ce0e81da5698ef516 (patch) | |
| tree | 0dad3a5d6c6897887cc8ff5c6837d83b7e89a070 /framework/source/interaction | |
| parent | 803a8a04e980d24bf6c336e4416615a49614367f (diff) | |
Consolidate framework::{Read,Write}Guard
...now that it is obvious that they both do the same
Change-Id: I6878acca4750ef4204fe32a695b6d9e1c5140115
Diffstat (limited to 'framework/source/interaction')
| -rw-r--r-- | framework/source/interaction/quietinteraction.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 4c359121a438..2ec220c5ccdf 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -19,8 +19,7 @@ #include "interaction/quietinteraction.hxx" -#include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> +#include <threadhelp/guard.hxx> #include <macros/generic.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> @@ -56,7 +55,7 @@ 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 { */ - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); m_aRequest = aRequest; aWriteLock.unlock(); /* } SAFE */ @@ -143,7 +142,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI css::uno::Any QuietInteraction::getRequest() const { /* SAFE { */ - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); return m_aRequest; /* } SAFE */ } @@ -153,7 +152,7 @@ css::uno::Any QuietInteraction::getRequest() const sal_Bool QuietInteraction::wasUsed() const { /* SAFE { */ - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); return m_aRequest.hasValue(); /* } SAFE */ } |