From ab3acb7ef79fcae8776b8d1ce0e81da5698ef516 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 17 Mar 2014 16:14:27 +0100
Subject: Consolidate framework::{Read,Write}Guard

...now that it is obvious that they both do the same

Change-Id: I6878acca4750ef4204fe32a695b6d9e1c5140115
---
 framework/source/jobs/jobresult.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'framework/source/jobs/jobresult.cxx')

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 */
 }
-- 
cgit