diff options
Diffstat (limited to 'sd/source/ui/slidesorter/cache')
22 files changed, 101 insertions, 101 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 1bbecbef3d66..3040eb1e2bd8 100755 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -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 @@ -93,8 +93,8 @@ class CacheEntry; class CacheHash { public: - size_t operator()(const BitmapCache::CacheKey& p) const - { return (size_t)p; } + size_t operator()(const BitmapCache::CacheKey& p) const + { return (size_t)p; } }; class BitmapCache::CacheBitmapContainer @@ -295,7 +295,7 @@ void BitmapCache::InvalidateCache (void) void BitmapCache::SetBitmap ( - const CacheKey& rKey, + const CacheKey& rKey, const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious) { @@ -317,7 +317,7 @@ void BitmapCache::SetBitmap ( CacheEntry (rpPreview, mnCurrentAccessTime++, bIsPrecious)) ).first; } - + if (iEntry != mpBitmapContainer->end()) UpdateCacheSize(iEntry->second, ADD); } @@ -427,7 +427,7 @@ void BitmapCache::Recycle (const BitmapCache& rCache) if ( ! bIncludeNoPreview && ! iEntry->second.HasPreview()) continue; - + aSortedContainer.push_back(SortableBitmapContainer::value_type( iEntry->first,iEntry->second)); } @@ -476,7 +476,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if ( ! rEntry.IsPrecious() && mnNormalCacheSize>mnMaximalNormalCacheSize) { mbIsFull = true; -#ifdef VERBOSE +#ifdef VERBOSE OSL_TRACE("cache size is %d > %d", mnNormalCacheSize,mnMaximalNormalCacheSize); #endif mpCacheCompactor->RequestCompaction(); @@ -488,7 +488,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry& rEntry, CacheOperation eOpe if (mnNormalCacheSize < mnMaximalNormalCacheSize) mbIsFull = false; break; - + default: OSL_ASSERT(false); break; @@ -514,10 +514,10 @@ BitmapCache::CacheEntry::CacheEntry( BitmapCache::CacheEntry::CacheEntry( - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, sal_Int32 nLastAccessTime, bool bIsPrecious) - : mpPreview(rpPreview), + : mpPreview(rpPreview), mbIsUpToDate(true), mnLastAccessTime(nLastAccessTime), mbIsPrecious(bIsPrecious) @@ -576,7 +576,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress nNewSize, nRatio); #endif - + mpCompressor = rpCompressor; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 2c33e042342f..5d08005d50eb 100755 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.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 @@ -116,7 +116,7 @@ public: */ void SetBitmap ( const CacheKey& rKey, - const ::boost::shared_ptr<BitmapEx>& rpPreview, + const ::boost::shared_ptr<BitmapEx>& rpPreview, bool bIsPrecious); /** Mark the specified preview bitmap as precious, i.e. that it must not @@ -129,7 +129,7 @@ public: bitmaps. */ void ReCalculateTotalCacheSize (void); - + /** Use the previews in the given cache to initialize missing previews. */ void Recycle (const BitmapCache& rCache); @@ -195,7 +195,7 @@ private: size to the allowed value. */ bool mbIsFull; - + /** Update mnNormalCacheSize or mnPreciousCacheSize according to the precious flag of the specified preview bitmap and the specified operation. diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index 86fc72885414..616446c41e89 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -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 @@ -132,7 +132,7 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - + virtual sal_Int32 GetMemorySize (void) const; }; @@ -171,7 +171,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void const BitmapReplacement& rBitmapData) const { ::boost::shared_ptr<BitmapEx> pResult; - + const ResolutionReducedReplacement* pData ( dynamic_cast<const ResolutionReducedReplacement*>(&rBitmapData)); @@ -181,7 +181,7 @@ sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void if (pData->maOriginalSize.Width() > mnWidth) pResult->Scale(pData->maOriginalSize); } - + return pResult; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index cd564ddddcfd..07216cbf334b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.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 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 5ad30ef43c1f..47a6a6fa3337 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 87cd1f268f80..b596f6c9ad66 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.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 diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 520ce4ce2cf8..f67eb7963fda 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -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 @@ -108,7 +108,7 @@ namespace sd { namespace slidesorter { namespace cache { static const ::rtl::OUString sErase (RTL_CONSTASCII_USTRINGPARAM("Erase")); static const ::rtl::OUString sResolution (RTL_CONSTASCII_USTRINGPARAM("ResolutionReduction")); static const ::rtl::OUString sPNGCompression (RTL_CONSTASCII_USTRINGPARAM("PNGCompression")); - + ::boost::shared_ptr<BitmapCompressor> pCompressor; ::rtl::OUString sCompressionPolicy(sPNGCompression); Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue( @@ -123,7 +123,7 @@ namespace sd { namespace slidesorter { namespace cache { pCompressor.reset(new ResolutionReduction()); else pCompressor.reset(new PngCompression()); - + ::std::auto_ptr<CacheCompactor> pCompactor (NULL); ::rtl::OUString sCompactionPolicy(sCompress); Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue( @@ -168,14 +168,14 @@ CacheCompactor::CacheCompactor( IMPL_LINK(CacheCompactor, CompactionCallback, Timer*, EMPTYARG) { mbIsCompactionRunning = true; - + try { Run(); } catch(::com::sun::star::uno::RuntimeException e) { } catch(::com::sun::star::uno::Exception e) { } - + mbIsCompactionRunning = false; return 1; } diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 84e450dcfbc9..80e9d2aaa9f2 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.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 @@ -38,7 +38,7 @@ class BitmapCache; class BitmapCompressor; /** This is an interface class whose implementations are created via the - Create() factory method. + Create() factory method. */ class CacheCompactor { @@ -69,7 +69,7 @@ public: cache. This calls via a timer the Run() method. */ virtual void RequestCompaction (void); - + protected: BitmapCache& mrCache; sal_Int32 mnMaximalCacheSize; @@ -82,7 +82,7 @@ protected: by the off-screen preview bitmaps. */ virtual void Run (void) = 0; - + private: /** This timer is used to collect calles to RequestCompaction() and eventually call Run(). diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 942a3e762acb..589b681dc210 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -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 @@ -87,7 +87,7 @@ CacheConfiguration::CacheConfiguration (void) const ::rtl::OUString sPathToNode( RTL_CONSTASCII_USTRINGPARAM( "MultiPaneGUI/SlideSorter/PreviewCache")); - + try { do @@ -105,17 +105,17 @@ CacheConfiguration::CacheConfiguration (void) aCreationArguments[0] = makeAny(beans::PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("nodepath")), - 0, + 0, makeAny(sPathToImpressConfigurationRoot), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[1] = makeAny(beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), - 0, + 0, makeAny((sal_Int32)-1), beans::PropertyState_DIRECT_VALUE)); aCreationArguments[2] = makeAny(beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), - 0, + 0, makeAny(true), beans::PropertyState_DIRECT_VALUE)); ::rtl::OUString sAccessService (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( @@ -151,7 +151,7 @@ CacheConfiguration::CacheConfiguration (void) Any CacheConfiguration::GetValue (const ::rtl::OUString& rName) { Any aResult; - + if (mxCacheNode != NULL) { try diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 034480298006..d683afae8d6f 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.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 @@ -53,7 +53,7 @@ public: does not exist then an empty Any is returned. */ ::com::sun::star::uno::Any GetValue (const ::rtl::OUString& rName); - + private: static ::boost::shared_ptr<CacheConfiguration> mpInstance; /** When a caller holds a reference after we have released ours we use diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 780a429df29e..ae13d582bfad 100755 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -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 @@ -206,7 +206,7 @@ void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey) // Suspend the queue processing temporarily to avoid the reinsertion // of the request that is to be deleted. mpQueueProcessor->Stop(); - + maRequestQueue.RemoveRequest(aKey); mpQueueProcessor->RemoveRequest(aKey); diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 89fc657004e8..5b065b60d566 100755 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.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 @@ -51,7 +51,7 @@ public: GenericPageCache ( const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); - + ~GenericPageCache (void); /** Change the size of the preview bitmaps. This may be caused by a @@ -107,7 +107,7 @@ public: /** Call this method when all preview bitmaps have to be generated anew. This is the case when the size of the page objects on the screen has - changed or when the model has changed. + changed or when the model has changed. */ void InvalidateCache (bool bUpdateCache); @@ -129,7 +129,7 @@ private: ::boost::scoped_ptr<QueueProcessor> mpQueueProcessor; SharedCacheContext mpCacheContext; - + /** The current size of preview bitmaps. */ Size maPreviewSize; diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 714e1f008329..acf347cf3027 100755 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 3c8a15892e7c..4a3aa88be2a4 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -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 @@ -47,7 +47,7 @@ class CacheDescriptor public: ::sd::slidesorter::cache::PageCacheManager::DocumentKey mpDocument; Size maPreviewSize; - + CacheDescriptor( ::sd::slidesorter::cache::PageCacheManager::DocumentKey pDocument, const Size& rPreviewSize) @@ -119,7 +119,7 @@ public: return (rElement1.first.Width()*rElement1.first.Height() > rElement2.first.Width()*rElement2.first.Height()); } - + private: Size maPreferredSize; }; @@ -181,7 +181,7 @@ public: ::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) { ::boost::shared_ptr<PageCacheManager> pInstance; - + ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); pInstance = mpInstance.lock(); @@ -192,7 +192,7 @@ public: PageCacheManager::Deleter()); mpInstance = pInstance; } - + return pInstance; } @@ -240,7 +240,7 @@ PageCacheManager::~PageCacheManager (void) // contain previews that are not up-to-date. Recycle previews from // other caches to fill in the holes. Recycle(pResult, pDocument,rPreviewSize); - + // Put the new (or old) cache into the container. if (pResult.get() != NULL) mpPageCaches->insert(PageCacheContainer::value_type(aKey, pResult)); @@ -295,13 +295,13 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) mpPageCaches->begin(), mpPageCaches->end(), PageCacheContainer::CompareWithCache(rpCache))); - + if (iCache != mpPageCaches->end()) { OSL_ASSERT(iCache->second == rpCache); PutRecentlyUsedCache(iCache->first.mpDocument,iCache->first.maPreviewSize,rpCache); - + mpPageCaches->erase(iCache); } } @@ -315,7 +315,7 @@ void PageCacheManager::ReleaseCache (const ::boost::shared_ptr<Cache>& rpCache) const Size& rNewPreviewSize) { (void)rOldPreviewSize; - + ::boost::shared_ptr<Cache> pResult; if (rpCache.get() != NULL) @@ -399,7 +399,7 @@ void PageCacheManager::InvalidateAllCaches (void) const Size& rPreviewSize) { ::boost::shared_ptr<Cache> pCache; - + // Look for the cache in the list of recently used caches. RecentlyUsedPageCaches::iterator iQueue (mpRecentlyUsedPageCaches->find(pDocument)); if (iQueue != mpRecentlyUsedPageCaches->end()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index bec9c7fa369d..6d84e528512c 100755 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -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 @@ -59,7 +59,7 @@ QueueProcessor::QueueProcessor ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenHighPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; - + aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenLowPriorityRequests"))); if (aTimeBetweenReqeusts.has<sal_Int32>()) diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index e42ad092d0e2..6a0f952ca008 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.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 @@ -38,7 +38,7 @@ #include "SlsBitmapCache.hxx" #include "sdpage.hxx" #include "Window.hxx" - + #include <svx/svdpagv.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -63,12 +63,12 @@ class RequestQueue; timer is started that eventually calls ProcessRequest(). This is repeated until the queue is empty or Stop() is called. */ -class QueueProcessor +class QueueProcessor { public: typedef ::boost::function<bool()> IdleDetectionCallback; QueueProcessor ( - RequestQueue& rQueue, + RequestQueue& rQueue, const ::boost::shared_ptr<BitmapCache>& rpCache, const Size& rPreviewSize, const SharedCacheContext& rpCacheContext); 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 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index 8030558759f3..f7b9e47265d8 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -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 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx index d2872c2ad7bf..0e802055e9f7 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.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 diff --git a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx index ebf6284a8f8b..cf05e5bb7d79 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestPriorityClass.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 @@ -38,14 +38,14 @@ namespace sd { namespace slidesorter { namespace cache { enum RequestPriorityClass { MIN__CLASS = 0, - + // The slide is visible. A preview does not yet exist. VISIBLE_NO_PREVIEW = MIN__CLASS, // The slide is visible. A preview exists but is not up-to-date anymore. VISIBLE_OUTDATED_PREVIEW, // The slide is not visible. NOT_VISIBLE, - + MAX__CLASS = NOT_VISIBLE }; diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index ccd590131343..5c37789aeda3 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -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 @@ -213,7 +213,7 @@ CacheKey RequestQueue::GetFront (void) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RequestQueue::GetFront(): queue is empty")), NULL); - + return mpRequestQueue->begin()->maKey; } diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index f59ec702ac01..e1a618b1cef6 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.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 @@ -62,7 +62,7 @@ public: with lowest priority. */ void AddRequest ( - CacheKey aKey, + CacheKey aKey, RequestPriorityClass eRequestClass, bool bInsertWithHighestPriority = false); |