INTEGRATION: CWS jsc9 (1.3.2); FILE MERGED

2006/04/26 14:15:33 jsc 1.3.2.1: #134738# move fixes back to previous version

1 files changed, 7 insertions, 11 deletions

diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index 95cc56e2e7a3..e35857fd1a2c 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: threadpool.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2006-04-19 13:49:44 $
+ *  last change: $Author: kz $ $Date: 2006-04-26 20:50:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,9 +38,6 @@
 
 #include <rtl/byteseq.hxx>
 
-#include "rtl/ref.hxx"
-#include "salhelper/simplereferenceobject.hxx"
-
 #include "jobqueue.hxx"
 
 
@@ -92,6 +89,8 @@ namespace cppu_threadpool {
     public:
         ~DisposedCallerAdmin();
 
+        static DisposedCallerAdmin *getInstance();
+
         void dispose( sal_Int64 nDisposeId );
         void stopDisposing( sal_Int64 nDisposeId );
         sal_Bool isDisposed( sal_Int64 nDisposeId );
@@ -101,10 +100,11 @@ namespace cppu_threadpool {
         DisposedCallerList m_lst;
     };
 
-    class ThreadPool: public salhelper::SimpleReferenceObject
+    class ThreadPool
     {
     public:
-        ThreadPool();
+        ~ThreadPool();
+        static ThreadPool *getInstance();
 
         void dispose( sal_Int64 nDisposeId );
         void stopDisposing( sal_Int64 nDisposeId );
@@ -123,11 +123,7 @@ namespace cppu_threadpool {
         sal_Bool revokeQueue( const ByteSequence & aThreadId , sal_Bool bAsynchron );
 
         void waitInPool( ORequestThread *pThread );
-
-        DisposedCallerAdmin m_disposedCallerAdmin;
-
     private:
-        ~ThreadPool();
         void createThread( JobQueue *pQueue, const ByteSequence &aThreadId, sal_Bool bAsynchron);