diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
commit | 0553d10867217e30a86c88c17ccb15a06030ce07 (patch) | |
tree | 4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | |
parent | d0ac8f1e7866c637be15f081b59ef456aacb954a (diff) |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:26 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962
Merge: 7234327 29a7259
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:03 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7)
Merge: 10146e0 6b04480
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:10:03 2010 +0200
CWS-TOOLING: integrate CWS impress197
commit 6b04480dd88a5bd048d12874dc8c07630670c239
Author: sj <sj@openoffice.org>
Date: Mon Aug 9 14:11:58 2010 +0200
impress197: #163250# fixed string handling, improved polygon splitting
sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 45 deletions(-)
commit a37d85f979d1616b158c918762821ed82b1e0691
Merge: 1380a03 d766efe
Author: Christian Lippka <christian.lippka@sun.com>
Date: Fri Aug 6 14:53:07 2010 +0200
merge
commit 1380a03aaf7464643eb99de1488ab5b372663ccd
Author: Christian Lippka <christian.lippka@sun.com>
Date: Wed Aug 4 10:48:35 2010 +0200
#i113603# only change layout shape size on init or of user call is set
sd/source/core/sdpage.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor.
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++--
sd/source/ui/view/sdwindow.cxx | 4 ++--
2 files changed, 17 insertions(+), 4 deletions(-)
Notes
Notes:
split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx')
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx index 08ca63284ea6..d3a6a7443001 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,17 +40,17 @@ class SlideSorterView; namespace sd { namespace slidesorter { namespace cache { -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> -class QueueProcessorThread +class QueueProcessorThread : public ::osl::Thread { public: QueueProcessorThread ( - view::SlideSorterView& rView, - Queue& rQueue, + view::SlideSorterView& rView, + Queue& rQueue, BitmapCache& rCache); ~QueueProcessorThread (void); @@ -80,19 +80,19 @@ public: void SAL_CALL Terminate (void); protected: - /** This virutal method is called (among others?) from the + /** This virutal method is called (among others?) from the inherited create method and acts as the main function of this thread. */ virtual void SAL_CALL run (void); - /** Called after the thread is terminated via the terminate + /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. - */ + */ virtual void SAL_CALL onTerminated (void); private: - /** Flag that indicates wether the onTerminated method has been already + /** Flag that indicates wether the onTerminated method has been already called. If so then a subsequent call to detach deletes the thread. */ volatile bool mbIsTerminated; @@ -168,7 +168,7 @@ void SAL_CALL QueueProcessorThread<Queue, Request, Cache, Factory>::run (void) TimeValue aTimeToWait; aTimeToWait.Seconds = 0; aTimeToWait.Nanosec = 50*1000*1000; - OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", + OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", aTimeToWait.Nanosec); wait (aTimeToWait); } @@ -193,7 +193,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> Request* pRequest = NULL; int nPriorityClass; bool bRequestIsValid = false; - + do { OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): testing for mbIsTerminated %p", this); @@ -214,7 +214,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> break; OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): have mutexes %p", this); - + // Get the requeuest with the highest priority from the queue. nPriorityClass = mrQueue.GetFrontPriorityClass(); pRequest = &mrQueue.GetFront(); @@ -223,7 +223,7 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():using request %p for creating bitmap", pRequest); - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", + OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", pRequest->GetPage()->GetPageNum(), nPriorityClass); try { @@ -252,9 +252,9 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -267,9 +267,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -282,9 +282,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -298,9 +298,9 @@ void QueueProcessorThread< -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory @@ -322,9 +322,9 @@ void QueueProcessorThread< /** This callback method is called when the run() method terminates. */ -template <class Queue, - class RequestData, - class BitmapCache, +template <class Queue, + class RequestData, + class BitmapCache, class BitmapFactory> void SAL_CALL QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory |