From ed15977626b71ad4e23461596ee4994f79557470 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 20 Mar 2014 11:30:51 +0100
Subject: Access safe members directly

Change-Id: I184f6450dc436b37fefe6c6ca35f61296ec10dd6
---
 framework/inc/helper/wakeupthread.hxx    |  4 +---
 framework/source/helper/wakeupthread.cxx | 11 ++---------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'framework')

diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 4c46bebbe67c..8265b7c825b2 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -23,7 +23,6 @@
 
 // include files of own module
 
-#include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
 
 #include <general.h>
@@ -45,8 +44,7 @@ namespace framework{
 
 /** @short  implements a "sleeping" thread, which try to sleep
             without a using cpu consumption :-) */
-class WakeUpThread : public ThreadHelpBase
-                   , public ::osl::Thread
+class WakeUpThread : public ::osl::Thread
 {
 
     // member
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 97b60f778ad2..b0cd2a94e851 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -23,15 +23,13 @@
 
 // include files of own module
 #include <helper/wakeupthread.hxx>
-#include <threadhelp/guard.hxx>
 
 namespace framework{
 
 
 
 WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener)
-    : ThreadHelpBase(         )
-    , m_xListener   (xListener)
+    : m_xListener   (xListener)
 {
 }
 
@@ -49,12 +47,7 @@ void SAL_CALL WakeUpThread::run()
         aSleeper.reset();
         aSleeper.wait(&aTime);
 
-        // SAFE ->
-        Guard aReadLock(m_aLock);
-        css::uno::Reference< css::util::XUpdatable > xListener(m_xListener.get(), css::uno::UNO_QUERY);
-        aReadLock.unlock();
-        // <- SAFE
-
+        css::uno::Reference< css::util::XUpdatable > xListener(m_xListener);
         if (xListener.is())
             xListener->update();
     }
-- 
cgit