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/jobs/jobresult.cxx | |
| 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/jobs/jobresult.cxx')
| -rw-r--r-- | framework/source/jobs/jobresult.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 19c91426f9aa..749f03367a40 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -19,8 +19,7 @@ #include <jobs/jobresult.hxx> #include <jobs/jobconst.hxx> -#include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> +#include <threadhelp/guard.hxx> #include <general.h> #include <services.h> @@ -167,7 +166,7 @@ JobResult::~JobResult() void JobResult::operator=( const JobResult& rCopy ) { /* SAFE { */ - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); m_aPureResult = rCopy.m_aPureResult ; m_eParts = rCopy.m_eParts ; m_lArguments = rCopy.m_lArguments ; @@ -193,7 +192,7 @@ void JobResult::operator=( const JobResult& rCopy ) sal_Bool JobResult::existPart( sal_uInt32 eParts ) const { /* SAFE { */ - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); return ((m_eParts & eParts) == eParts); /* } SAFE */ } @@ -210,7 +209,7 @@ sal_Bool JobResult::existPart( sal_uInt32 eParts ) const css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const { /* SAFE { */ - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); return m_lArguments; /* } SAFE */ } @@ -220,7 +219,7 @@ css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const css::frame::DispatchResultEvent JobResult::getDispatchResult() const { /* SAFE { */ - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); return m_aDispatchResult; /* } SAFE */ } |