diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
91 files changed, 709 insertions, 709 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 7cc55952c95c..eabd8aeb0176 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -40,28 +40,28 @@ class BitmapCache::CacheEntry public: CacheEntry(const Bitmap& rBitmap, sal_Int32 nLastAccessTime, bool bIsPrecious); CacheEntry(sal_Int32 nLastAccessTime, bool bIsPrecious); - ~CacheEntry (void) {}; + ~CacheEntry() {}; inline void Recycle (const CacheEntry& rEntry); - inline sal_Int32 GetMemorySize (void) const; + inline sal_Int32 GetMemorySize() const; void Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor); - inline void Decompress (void); + inline void Decompress(); - bool IsUpToDate (void) const { return mbIsUpToDate; } + bool IsUpToDate() const { return mbIsUpToDate; } void SetUpToDate (bool bIsUpToDate) { mbIsUpToDate = bIsUpToDate; } - sal_Int32 GetAccessTime (void) const { return mnLastAccessTime; } + sal_Int32 GetAccessTime() const { return mnLastAccessTime; } void SetAccessTime (sal_Int32 nAccessTime) { mnLastAccessTime = nAccessTime; } - Bitmap GetPreview (void) const { return maPreview; } + Bitmap GetPreview() const { return maPreview; } inline void SetPreview (const Bitmap& rPreview); - bool HasPreview (void) const; + bool HasPreview() const; - Bitmap GetMarkedPreview (void) const { return maMarkedPreview; } + Bitmap GetMarkedPreview() const { return maMarkedPreview; } inline void SetMarkedPreview (const Bitmap& rMarkePreview); - bool HasReplacement (void) const { return (mpReplacement.get() != NULL); } - inline bool HasLosslessReplacement (void) const; - void Invalidate (void) { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } - bool IsPrecious (void) const { return mbIsPrecious; } + bool HasReplacement() const { return (mpReplacement.get() != NULL); } + inline bool HasLosslessReplacement() const; + void Invalidate() { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } + bool IsPrecious() const { return mbIsPrecious; } void SetPrecious (bool bIsPrecious) { mbIsPrecious = bIsPrecious; } private: @@ -88,7 +88,7 @@ class BitmapCache::CacheBitmapContainer : public std::unordered_map<CacheKey, CacheEntry, CacheHash> { public: - CacheBitmapContainer (void) {} + CacheBitmapContainer() {} }; namespace { @@ -138,12 +138,12 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize) mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize); } -BitmapCache::~BitmapCache (void) +BitmapCache::~BitmapCache() { Clear(); } -void BitmapCache::Clear (void) +void BitmapCache::Clear() { ::osl::MutexGuard aGuard (maMutex); @@ -251,7 +251,7 @@ bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) return false; } -void BitmapCache::InvalidateCache (void) +void BitmapCache::InvalidateCache() { ::osl::MutexGuard aGuard (maMutex); @@ -330,7 +330,7 @@ void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) } } -void BitmapCache::ReCalculateTotalCacheSize (void) +void BitmapCache::ReCalculateTotalCacheSize() { ::osl::MutexGuard aGuard (maMutex); @@ -494,7 +494,7 @@ inline void BitmapCache::CacheEntry::Recycle (const CacheEntry& rEntry) } } -inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize (void) const +inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() const { sal_Int32 nSize (0); nSize += maPreview.GetSizeBytes(); @@ -529,7 +529,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress } } -inline void BitmapCache::CacheEntry::Decompress (void) +inline void BitmapCache::CacheEntry::Decompress() { if (mpReplacement.get()!=NULL && mpCompressor.get()!=NULL && maPreview.IsEmpty()) { @@ -548,7 +548,7 @@ inline void BitmapCache::CacheEntry::SetPreview (const Bitmap& rPreview) mpCompressor.reset(); } -bool BitmapCache::CacheEntry::HasPreview (void) const +bool BitmapCache::CacheEntry::HasPreview() const { return ! maPreview.IsEmpty(); } @@ -558,7 +558,7 @@ inline void BitmapCache::CacheEntry::SetMarkedPreview (const Bitmap& rMarkedPrev maMarkedPreview = rMarkedPreview; } -inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const +inline bool BitmapCache::CacheEntry::HasLosslessReplacement() const { return mpReplacement.get()!=NULL && mpCompressor.get()!=NULL diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index c6165450f101..fe022d4ace48 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -68,22 +68,22 @@ public: /** The destructor clears the cache and relases all bitmaps still in it. */ - ~BitmapCache (void); + ~BitmapCache(); /** Remove all preview bitmaps from the cache. After this call the cache is empty. */ - void Clear (void); + void Clear(); /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const { return mbIsFull;} + bool IsFull() const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void) { return mnNormalCacheSize;} + sal_Int32 GetSize() { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ @@ -118,7 +118,7 @@ public: /** Mark all preview bitmaps as not being up-to-date anymore. */ - void InvalidateCache (void); + void InvalidateCache(); /** Add or replace a bitmap for the given key. */ @@ -142,7 +142,7 @@ public: the cache size is tracked with each modification of preview bitmaps. */ - void ReCalculateTotalCacheSize (void); + void ReCalculateTotalCacheSize(); /** Use the previews in the given cache to initialize missing previews. */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index dcb3f669731c..c124dc7923d2 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -39,8 +39,8 @@ public: Size maOriginalSize; DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { } - virtual ~DummyReplacement(void) {} - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } + virtual ~DummyReplacement() {} + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } }; ::boost::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const @@ -53,7 +53,7 @@ Bitmap NoBitmapCompression::Decompress (const BitmapReplacement& rBitmapData) co return dynamic_cast<const DummyReplacement&>(rBitmapData).maPreview; } -bool NoBitmapCompression::IsLossless (void) const +bool NoBitmapCompression::IsLossless() const { return true; } @@ -72,7 +72,7 @@ Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const return Bitmap(); } -bool CompressionByDeletion::IsLossless (void) const +bool CompressionByDeletion::IsLossless() const { return false; } @@ -88,14 +88,14 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE; + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE; }; ResolutionReduction::ResolutionReducedReplacement::~ResolutionReducedReplacement() { } -sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void) const +sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize() const { return maPreview.GetSizeBytes(); } @@ -133,7 +133,7 @@ Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) co return aResult; } -bool ResolutionReduction::IsLossless (void) const +bool ResolutionReduction::IsLossless() const { return false; } @@ -146,16 +146,16 @@ public: void* mpData; sal_Int32 mnDataSize; Size maImageSize; - PngReplacement (void) + PngReplacement() : mpData(NULL), mnDataSize(0), maImageSize(0,0) {} - virtual ~PngReplacement (void) + virtual ~PngReplacement() { delete [] static_cast<char*>(mpData); } - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return mnDataSize; } @@ -191,7 +191,7 @@ Bitmap PngCompression::Decompress ( return aResult; } -bool PngCompression::IsLossless (void) const +bool PngCompression::IsLossless() const { return true; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index 1a218ae831db..6c40c0d4d4c4 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -53,7 +53,7 @@ public: value is used by the caller of Decompress() to decide whether to use the returned bitmap as is or if a new preview has to be created. */ - virtual bool IsLossless (void) const = 0; + virtual bool IsLossless() const = 0; protected: ~BitmapCompressor() {} @@ -66,7 +66,7 @@ protected: class BitmapReplacement { public: - virtual sal_Int32 GetMemorySize (void) const { return 0; } + virtual sal_Int32 GetMemorySize() const { return 0; } protected: ~BitmapReplacement() {} @@ -84,7 +84,7 @@ public: virtual ~NoBitmapCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** This is another trivial bitmap compressor. Instead of compressing a @@ -99,7 +99,7 @@ public: virtual ~CompressionByDeletion() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress a preview bitmap by reducing its resolution. While the aspect @@ -118,7 +118,7 @@ public: /** Scale the replacement bitmap up to the original size. */ virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress preview bitmaps using the PNG format. @@ -132,7 +132,7 @@ public: virtual ~PngCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index d0297df50b7c..14dd577c216b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -38,12 +38,12 @@ class PageObjectViewObjectContact; namespace sd { namespace slidesorter { namespace cache { -BitmapFactory::BitmapFactory (void) +BitmapFactory::BitmapFactory() : maRenderer(NULL, false) { } -BitmapFactory::~BitmapFactory (void) +BitmapFactory::~BitmapFactory() { } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 9e84e05f8208..80805787be51 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -34,8 +34,8 @@ namespace sd { namespace slidesorter { namespace cache { class BitmapFactory { public: - BitmapFactory (void); - ~BitmapFactory (void); + BitmapFactory(); + ~BitmapFactory(); Bitmap CreateBitmap ( const SdPage& rPage, diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 1c3af1ba1fbe..55595e165bbd 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -45,10 +45,10 @@ public: : CacheCompactor(rCache, nMaximalCacheSize) {} - virtual void RequestCompaction (void) SAL_OVERRIDE { /* Ignored */ }; + virtual void RequestCompaction() SAL_OVERRIDE { /* Ignored */ }; protected: - virtual void Run (void) SAL_OVERRIDE { /* Do nothing */ }; + virtual void Run() SAL_OVERRIDE { /* Do nothing */ }; }; /** This implementation of the CacheCompactor interface class uses one of @@ -67,7 +67,7 @@ public: const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor); protected: - virtual void Run (void) SAL_OVERRIDE; + virtual void Run() SAL_OVERRIDE; private: ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor; @@ -114,7 +114,7 @@ namespace sd { namespace slidesorter { namespace cache { return pCompactor; } -void CacheCompactor::RequestCompaction (void) +void CacheCompactor::RequestCompaction() { if ( ! mbIsCompactionRunning && ! maCompactionTimer.IsActive()) maCompactionTimer.Start(); @@ -166,7 +166,7 @@ CacheCompactionByCompression::CacheCompactionByCompression ( { } -void CacheCompactionByCompression::Run (void) +void CacheCompactionByCompression::Run() { if (mrCache.GetSize() > mnMaximalCacheSize) { diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index aab64e2fea21..481a92165cf2 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -34,7 +34,7 @@ class BitmapCache; class CacheCompactor { public: - virtual ~CacheCompactor (void) {}; + virtual ~CacheCompactor() {}; /** Create a new instance of the CacheCompactor interface class. The type of compaction algorithm used depends on values from the @@ -59,7 +59,7 @@ public: /** Request a compaction of the off-screen previews in the bitmap cache. This calls via a timer the Run() method. */ - virtual void RequestCompaction (void); + virtual void RequestCompaction(); protected: BitmapCache& mrCache; @@ -72,7 +72,7 @@ protected: /** This method actually tries to reduce the total number of bytes used by the off-screen preview bitmaps. */ - virtual void Run (void) = 0; + virtual void Run() = 0; private: /** This timer is used to collect calles to RequestCompaction() and diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 1c842e8ec5c9..6baa2ef9b122 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -43,7 +43,7 @@ namespace ::boost::weak_ptr<CacheConfiguration> CacheConfiguration::mpWeakInstance; Timer CacheConfiguration::maReleaseTimer; -::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance (void) +::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance() { SolarMutexGuard aSolarGuard; CacheConfigSharedPtr &rInstancePtr = theInstance::get(); @@ -67,7 +67,7 @@ Timer CacheConfiguration::maReleaseTimer; return rInstancePtr; } -CacheConfiguration::CacheConfiguration (void) +CacheConfiguration::CacheConfiguration() { // Get the cache size from configuration. const OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 6003e2da39e0..ff6cc9d2ee32 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -38,7 +38,7 @@ public: seconds. Subsequent calls to this function will create a new instance. */ - static ::boost::shared_ptr<CacheConfiguration> Instance (void); + static ::boost::shared_ptr<CacheConfiguration> Instance(); /** Look up the specified value in MultiPaneGUI/SlideSorter/PreviewCache. When the specified value @@ -55,7 +55,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> mxCacheNode; - CacheConfiguration (void); + CacheConfiguration(); DECL_LINK(TimerCallback, void *); }; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index eae56decc898..fe4a6dda6116 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -47,7 +47,7 @@ GenericPageCache::GenericPageCache ( "This may indicate an error."); } -GenericPageCache::~GenericPageCache (void) +GenericPageCache::~GenericPageCache() { if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Stop(); @@ -59,7 +59,7 @@ GenericPageCache::~GenericPageCache (void) mpBitmapCache.reset(); } -void GenericPageCache::ProvideCacheAndProcessor (void) +void GenericPageCache::ProvideCacheAndProcessor() { if (mpBitmapCache.get() == NULL) mpBitmapCache = PageCacheManager::Instance()->GetCache( @@ -274,14 +274,14 @@ void GenericPageCache::SetPreciousFlag ( mpBitmapCache->SetPrecious(mpCacheContext->GetPage(aKey), bIsPrecious); } -void GenericPageCache::Pause (void) +void GenericPageCache::Pause() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Pause(); } -void GenericPageCache::Resume (void) +void GenericPageCache::Resume() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 93c9ade141ea..207dceeb531e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -48,7 +48,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~GenericPageCache (void); + ~GenericPageCache(); /** Change the size of the preview bitmaps. This may be caused by a resize of the slide sorter window or a change of the number of @@ -124,8 +124,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::shared_ptr<BitmapCache> mpBitmapCache; @@ -145,7 +145,7 @@ private: /** Both bitmap cache and queue processor are created on demand by this method. */ - void ProvideCacheAndProcessor (void); + void ProvideCacheAndProcessor(); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 34da19a50ec7..c369500f9fdf 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -41,7 +41,7 @@ PageCache::PageCache ( { } -PageCache::~PageCache (void) +PageCache::~PageCache() { } @@ -98,12 +98,12 @@ void PageCache::SetPreciousFlag ( mpImplementation->SetPreciousFlag(aKey, bIsPrecious); } -void PageCache::Pause (void) +void PageCache::Pause() { mpImplementation->Pause(); } -void PageCache::Resume (void) +void PageCache::Resume() { mpImplementation->Resume(); } diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 453683e85ca5..9e8624bb3add 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -117,7 +117,7 @@ class PageCacheManager::PageCacheContainer CacheDescriptor::Equal> { public: - PageCacheContainer (void) {} + PageCacheContainer() {} /** Compare entries in the cache container with respect to the cache address only. @@ -162,7 +162,7 @@ public: ::boost::weak_ptr<PageCacheManager> PageCacheManager::mpInstance; -::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) +::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance() { ::boost::shared_ptr<PageCacheManager> pInstance; @@ -180,14 +180,14 @@ public: return pInstance; } -PageCacheManager::PageCacheManager (void) +PageCacheManager::PageCacheManager() : mpPageCaches(new PageCacheContainer()), mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()), mnMaximalRecentlyCacheCount(2) { } -PageCacheManager::~PageCacheManager (void) +PageCacheManager::~PageCacheManager() { } @@ -368,7 +368,7 @@ void PageCacheManager::InvalidateAllPreviewBitmaps (DocumentKey pDocument) } } -void PageCacheManager::InvalidateAllCaches (void) +void PageCacheManager::InvalidateAllCaches() { // Iterate over all caches that are currently in use and invalidate // them. diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 0391a785c003..61a662f92982 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -62,7 +62,7 @@ QueueProcessor::QueueProcessor ( maTimer.SetTimeout (10); } -QueueProcessor::~QueueProcessor (void) +QueueProcessor::~QueueProcessor() { } @@ -80,18 +80,18 @@ void QueueProcessor::Start (int nPriorityClass) } } -void QueueProcessor::Stop (void) +void QueueProcessor::Stop() { if (maTimer.IsActive()) maTimer.Stop(); } -void QueueProcessor::Pause (void) +void QueueProcessor::Pause() { mbIsPaused = true; } -void QueueProcessor::Resume (void) +void QueueProcessor::Resume() { mbIsPaused = false; if ( ! mrQueue.IsEmpty()) @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) return 1; } -void QueueProcessor::ProcessRequests (void) +void QueueProcessor::ProcessRequests() { OSL_ASSERT(mpCacheContext.get()!=NULL); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 2044fdbf2056..c472383def83 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -70,9 +70,9 @@ public: of 1.) When the timer is already running it is not modified. */ void Start (int nPriorityClass = 0); - void Stop (void); - void Pause (void); - void Resume (void); + void Stop(); + void Pause(); + void Resume(); void SetPreviewSize ( const Size& rSize, @@ -103,7 +103,7 @@ private: BitmapFactory maBitmapFactory; bool mbIsPaused; - void ProcessRequests (void); + void ProcessRequests(); void ProcessOneRequest ( CacheKey aKey, const RequestPriorityClass ePriorityClass); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index daacee5be8ff..63f25e5ca932 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -91,7 +91,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext) { } -RequestQueue::~RequestQueue (void) +RequestQueue::~RequestQueue() { Clear(); } @@ -199,7 +199,7 @@ void RequestQueue::ChangeClass ( } } -CacheKey RequestQueue::GetFront (void) +CacheKey RequestQueue::GetFront() { ::osl::MutexGuard aGuard (maMutex); @@ -210,7 +210,7 @@ CacheKey RequestQueue::GetFront (void) return mpRequestQueue->begin()->maKey; } -RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) +RequestPriorityClass RequestQueue::GetFrontPriorityClass() { ::osl::MutexGuard aGuard (maMutex); @@ -221,7 +221,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) return mpRequestQueue->begin()->meClass; } -void RequestQueue::PopFront (void) +void RequestQueue::PopFront() { ::osl::MutexGuard aGuard (maMutex); @@ -243,13 +243,13 @@ void RequestQueue::PopFront (void) } } -bool RequestQueue::IsEmpty (void) +bool RequestQueue::IsEmpty() { ::osl::MutexGuard aGuard (maMutex); return mpRequestQueue->empty(); } -void RequestQueue::Clear (void) +void RequestQueue::Clear() { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index be9b5909bb6d..476e21cd2d61 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -77,27 +77,27 @@ public: /** Get the request with the highest priority int the highest priority class. */ - CacheKey GetFront (void); + CacheKey GetFront(); // For debugging. - RequestPriorityClass GetFrontPriorityClass (void); + RequestPriorityClass GetFrontPriorityClass(); /** Really a synonym for RemoveRequest(GetFront()); */ - void PopFront (void); + void PopFront(); /** Returns <TRUE/> when there is no element in the queue. */ - bool IsEmpty (void); + bool IsEmpty(); /** Remove all requests from the queue. This resets the minimum and maximum priorities to their default values. */ - void Clear (void); + void Clear(); /** Return the mutex that guards the access to the priority queue. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Ensure we don't hand out a page deleted before anyone got a chance to process it diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index ad76ae766faf..aae8a7eec2b7 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -136,7 +136,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) } } -void SlideSorterController::Init (void) +void SlideSorterController::Init() { mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); @@ -159,7 +159,7 @@ void SlideSorterController::Init (void) GetSelectionManager()->SelectionHasChanged(); } -SlideSorterController::~SlideSorterController (void) +SlideSorterController::~SlideSorterController() { try { @@ -177,7 +177,7 @@ SlideSorterController::~SlideSorterController (void) // to shut down cleanly. } -void SlideSorterController::Dispose (void) +void SlideSorterController::Dispose() { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); mpClipboard.reset(); @@ -214,50 +214,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } -PageSelector& SlideSorterController::GetPageSelector (void) +PageSelector& SlideSorterController::GetPageSelector() { OSL_ASSERT(mpPageSelector.get()!=NULL); return *mpPageSelector.get(); } -FocusManager& SlideSorterController::GetFocusManager (void) +FocusManager& SlideSorterController::GetFocusManager() { OSL_ASSERT(mpFocusManager.get()!=NULL); return *mpFocusManager.get(); } -Clipboard& SlideSorterController::GetClipboard (void) +Clipboard& SlideSorterController::GetClipboard() { OSL_ASSERT(mpClipboard.get()!=NULL); return *mpClipboard.get(); } -ScrollBarManager& SlideSorterController::GetScrollBarManager (void) +ScrollBarManager& SlideSorterController::GetScrollBarManager() { OSL_ASSERT(mpScrollBarManager.get()!=NULL); return *mpScrollBarManager.get(); } -::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager (void) const +::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); return mpCurrentSlideManager; } -::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager (void) const +::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=NULL); return mpSlotManager; } -::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager (void) const +::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=NULL); return mpSelectionManager; } ::boost::shared_ptr<InsertionIndicatorHandler> - SlideSorterController::GetInsertionIndicatorHandler (void) const + SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=NULL); return mpInsertionIndicatorHandler; @@ -464,12 +464,12 @@ bool SlideSorterController::Command ( return bEventHasBeenHandled; } -void SlideSorterController::LockModelChange (void) +void SlideSorterController::LockModelChange() { mnModelChangeLockCount += 1; } -void SlideSorterController::UnlockModelChange (void) +void SlideSorterController::UnlockModelChange() { mnModelChangeLockCount -= 1; if (mnModelChangeLockCount==0 && mbPostModelChangePending) @@ -478,7 +478,7 @@ void SlideSorterController::UnlockModelChange (void) } } -void SlideSorterController::PreModelChange (void) +void SlideSorterController::PreModelChange() { // Prevent PreModelChange to execute more than once per model lock. if (mbPostModelChangePending) @@ -497,7 +497,7 @@ void SlideSorterController::PreModelChange (void) mbPostModelChangePending = true; } -void SlideSorterController::PostModelChange (void) +void SlideSorterController::PostModelChange() { mbPostModelChangePending = false; mrModel.Resync(); @@ -523,7 +523,7 @@ void SlideSorterController::PostModelChange (void) ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END)); } -void SlideSorterController::HandleModelChange (void) +void SlideSorterController::HandleModelChange() { // Ignore this call when the document is not in a valid state, i.e. has // not the same number of regular and notes pages. @@ -680,7 +680,7 @@ void SlideSorterController::GetAttrState (SfxItemSet& rSet) mpSlotManager->GetAttrState (rSet); } -void SlideSorterController::UpdateAllPages (void) +void SlideSorterController::UpdateAllPages() { // Do a redraw. mrSlideSorter.GetContentWindow()->Invalidate(); @@ -760,13 +760,13 @@ rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxReques return xFunc; } -::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction (void) +::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction() { rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction()); return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get())); } -void SlideSorterController::PrepareEditModeChange (void) +void SlideSorterController::PrepareEditModeChange() { // Before we throw away the page descriptors we prepare for selecting // descriptors in the other mode and for restoring the current @@ -814,7 +814,7 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) return bResult; } -void SlideSorterController::FinishEditModeChange (void) +void SlideSorterController::FinishEditModeChange() { if (mrModel.GetEditMode() == EM_MASTERPAGE) { @@ -912,13 +912,13 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex } } -VisibleAreaManager& SlideSorterController::GetVisibleAreaManager (void) const +VisibleAreaManager& SlideSorterController::GetVisibleAreaManager() const { OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } -void SlideSorterController::CheckForMasterPageAssignment (void) +void SlideSorterController::CheckForMasterPageAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -935,7 +935,7 @@ void SlideSorterController::CheckForMasterPageAssignment (void) } } -void SlideSorterController::CheckForSlideTransitionAssignment (void) +void SlideSorterController::CheckForSlideTransitionAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -961,12 +961,12 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } -SlideSorterController::ModelChangeLock::~ModelChangeLock (void) +SlideSorterController::ModelChangeLock::~ModelChangeLock() { Release(); } -void SlideSorterController::ModelChangeLock::Release (void) +void SlideSorterController::ModelChangeLock::Release() { if (mpController != NULL) { diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 99a838866192..e2f909075953 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -37,7 +37,7 @@ public: const double nGlobalTime, const Animator::AnimationId nAnimationId, const Animator::FinishFunctor& rFinishFunctor); - ~Animation (void); + ~Animation(); /** Run next animation step. If animation has reached its end it is expired. */ @@ -47,8 +47,8 @@ public: Animator::Disposed(). The finish functor is called and the animation is marked as expired to prevent another run. */ - void Expire (void); - bool IsExpired (void) { return mbIsExpired;} + void Expire(); + bool IsExpired() { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -72,7 +72,7 @@ Animator::Animator (SlideSorter& rSlideSorter) maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler)); } -Animator::~Animator (void) +Animator::~Animator() { if ( ! mbIsDisposed) { @@ -81,7 +81,7 @@ Animator::~Animator (void) } } -void Animator::Dispose (void) +void Animator::Dispose() { mbIsDisposed = true; @@ -154,7 +154,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) } } -void Animator::RemoveAllAnimations (void) +void Animator::RemoveAllAnimations() { ::std::for_each( maAnimations.begin(), @@ -188,7 +188,7 @@ bool Animator::ProcessAnimations (const double nTime) return bExpired; } -void Animator::CleanUpAnimationList (void) +void Animator::CleanUpAnimationList() { OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) @@ -256,7 +256,7 @@ Animator::Animation::Animation ( Run(nGlobalTime); } -Animator::Animation::~Animation (void) +Animator::Animation::~Animation() { } @@ -286,7 +286,7 @@ bool Animator::Animation::Run (const double nGlobalTime) return mbIsExpired; } -void Animator::Animation::Expire (void) +void Animator::Animation::Expire() { if ( ! mbIsExpired) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1157b2973e3d..d7898c1a3d9f 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -95,7 +95,7 @@ public: if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - ~TemporarySlideTrackingDeactivator (void) + ~TemporarySlideTrackingDeactivator() { if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().ActivateCurrentSlideTracking(); @@ -125,7 +125,7 @@ public: } } - ~UndoContext (void) + ~UndoContext() { if (mpDocument!=NULL && mpDocument->IsUndoEnabled()) mpDocument->EndUndo(); @@ -154,7 +154,7 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter) { } -Clipboard::~Clipboard (void) +Clipboard::~Clipboard() { if (mnDragFinishedUserEventId != 0) Application::RemoveUserEvent(mnDragFinishedUserEventId); @@ -795,7 +795,7 @@ bool Clipboard::IsInsertionTrivial ( return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction); } -void Clipboard::Abort (void) +void Clipboard::Abort() { if (mxSelectionObserverContext) { diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ab4885a33be1..61973a7e3d71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -49,7 +49,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback)); } -CurrentSlideManager::~CurrentSlideManager (void) +CurrentSlideManager::~CurrentSlideManager() { } @@ -85,7 +85,7 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) } } -void CurrentSlideManager::ReleaseCurrentSlide (void) +void CurrentSlideManager::ReleaseCurrentSlide() { if (mpCurrentSlide.get() != NULL) mrSlideSorter.GetView().SetState(mpCurrentSlide, PageDescriptor::ST_Current, false); @@ -94,7 +94,7 @@ void CurrentSlideManager::ReleaseCurrentSlide (void) mnCurrentSlideIndex = -1; } -bool CurrentSlideManager::IsCurrentSlideIsValid (void) +bool CurrentSlideManager::IsCurrentSlideIsValid() { return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); } @@ -224,12 +224,12 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript } } -void CurrentSlideManager::PrepareModelChange (void) +void CurrentSlideManager::PrepareModelChange() { mpCurrentSlide.reset(); } -void CurrentSlideManager::HandleModelChange (void) +void CurrentSlideManager::HandleModelChange() { if (mnCurrentSlideIndex >= 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 3338bfeac24e..3faf316f1dda 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -63,12 +63,12 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); } -DragAndDropContext::~DragAndDropContext (void) +DragAndDropContext::~DragAndDropContext() { SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); } -void DragAndDropContext::Dispose (void) +void DragAndDropContext::Dispose() { mnInsertionIndex = -1; } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 9af4797e3478..c7f6f1ee6c57 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -43,13 +43,13 @@ public: when provided, the pages in the transferable. */ DragAndDropContext (SlideSorter& rSlideSorter); - ~DragAndDropContext (void); + ~DragAndDropContext(); /** Call this method (for example as reaction to ESC key press) to avoid processing (ie moving or inserting) the substition when the called DragAndDropContext object is destroyed. */ - void Dispose (void); + void Dispose(); /** Move the substitution display by the distance the mouse has travelled since the last call to this method or to diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1b9a3dc17ef6..b0acdd6ed90f 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -45,7 +45,7 @@ FocusManager::FocusManager (SlideSorter& rSlideSorter) mnPageIndex = 0; } -FocusManager::~FocusManager (void) +FocusManager::~FocusManager() { } @@ -159,13 +159,13 @@ void FocusManager::ShowFocus (const bool bScrollToFocus) ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } -void FocusManager::HideFocus (void) +void FocusManager::HideFocus() { mbPageIsFocused = false; HideFocusIndicator(GetFocusedPageDescriptor()); } -bool FocusManager::ToggleFocus (void) +bool FocusManager::ToggleFocus() { if (mnPageIndex >= 0) { @@ -177,12 +177,12 @@ bool FocusManager::ToggleFocus (void) return mbPageIsFocused; } -bool FocusManager::HasFocus (void) const +bool FocusManager::HasFocus() const { return mrSlideSorter.GetContentWindow()->HasFocus(); } -model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const +model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor() const { return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex); } @@ -202,12 +202,12 @@ void FocusManager::SetFocusedPage (sal_Int32 nPageIndex) mnPageIndex = nPageIndex; } -void FocusManager::SetFocusedPageToCurrentPage (void) +void FocusManager::SetFocusedPageToCurrentPage() { SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -bool FocusManager::IsFocusShowing (void) const +bool FocusManager::IsFocusShowing() const { return HasFocus() && mbPageIsFocused; } @@ -258,7 +258,7 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener) ::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)); } -void FocusManager::NotifyFocusChangeListeners (void) const +void FocusManager::NotifyFocusChangeListeners() const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); @@ -279,7 +279,7 @@ FocusManager::FocusHider::FocusHider (FocusManager& rManager) mrManager.HideFocus(); } -FocusManager::FocusHider::~FocusHider (void) +FocusManager::FocusHider::~FocusHider() { if (mbFocusVisible) mrManager.ShowFocus(); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index fd8dcef357da..42b932e640a8 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -47,7 +47,7 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } -InsertionIndicatorHandler::~InsertionIndicatorHandler (void) +InsertionIndicatorHandler::~InsertionIndicatorHandler() { } @@ -81,12 +81,12 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter)); } -void InsertionIndicatorHandler::ForceShow (void) +void InsertionIndicatorHandler::ForceShow() { mbIsForcedShow = true; } -void InsertionIndicatorHandler::ForceEnd (void) +void InsertionIndicatorHandler::ForceEnd() { mbIsForcedShow = false; End(Animator::AM_Immediate); @@ -129,7 +129,7 @@ void InsertionIndicatorHandler::UpdatePosition ( UpdatePosition(rMouseModelPosition, GetModeFromDndAction(nDndAction)); } -sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const +sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex() const { if (mbIsReadOnly) return -1; @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator (void) +::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); @@ -240,7 +240,7 @@ InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( mpHandler->ForceShow(); } -InsertionIndicatorHandler::ForceShowContext::~ForceShowContext (void) +InsertionIndicatorHandler::ForceShowContext::~ForceShowContext() { mpHandler->ForceEnd(); } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index b821f77a081e..149edf879839 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -136,13 +136,13 @@ Listener::Listener ( } } -Listener::~Listener (void) +Listener::~Listener() { DBG_ASSERT( !mbListeningToDocument && !mbListeningToUNODocument && !mbListeningToFrame, "sd::Listener::~Listener(), disposing() was not called, ask DBO!" ); } -void Listener::ReleaseListeners (void) +void Listener::ReleaseListeners() { if (mbListeningToDocument) { @@ -196,7 +196,7 @@ void Listener::ReleaseListeners (void) } } -void Listener::ConnectToController (void) +void Listener::ConnectToController() { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -241,7 +241,7 @@ void Listener::ConnectToController (void) } } -void Listener::DisconnectFromController (void) +void Listener::DisconnectFromController() { if (mbListeningToController) { @@ -527,12 +527,12 @@ void SAL_CALL Listener::notifyEvent ( { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { ReleaseListeners(); } -void Listener::UpdateEditMode (void) +void Listener::UpdateEditMode() { // When there is a new controller then the edit mode may have changed at // the same time. @@ -631,7 +631,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -void Listener::ThrowIfDisposed (void) +void Listener::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index fe2d018129ca..c00ce5680014 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -72,7 +72,7 @@ class Listener { public: Listener (SlideSorter& rSlideSorter); - virtual ~Listener (void); + virtual ~Listener(); /** Connect to the current controller of the view shell as listener. This method is called once during initialization and every time a @@ -80,7 +80,7 @@ public: When the connection is successful then the flag mbListeningToController is set to <TRUE/>. */ - void ConnectToController (void); + void ConnectToController(); /** Disconnect from the current controller of the view shell as listener. This method is called once during initialization and @@ -88,7 +88,7 @@ public: exchanged. When this method terminates then mbListeningToController is <FALSE/>. */ - void DisconnectFromController (void); + void DisconnectFromController(); virtual void Notify ( SfxBroadcaster& rBroadcaster, @@ -127,7 +127,7 @@ public: frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; @@ -153,11 +153,11 @@ private: */ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock; - void ReleaseListeners (void); + void ReleaseListeners(); /** Called when the edit mode has changed. Update model accordingly. */ - void UpdateEditMode (void); + void UpdateEditMode(); /** Handle a change in the order of slides or when the set of slides has changed, i.e. a slide has been created. @@ -173,7 +173,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent*); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 3e6e9f9959c0..b9563ae7b814 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -62,7 +62,7 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) CountSelectedPages (); } -void PageSelector::SelectAllPages (void) +void PageSelector::SelectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -72,7 +72,7 @@ void PageSelector::SelectAllPages (void) SelectPage(nPageIndex); } -void PageSelector::DeselectAllPages (void) +void PageSelector::DeselectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -87,7 +87,7 @@ void PageSelector::DeselectAllPages (void) mpSelectionAnchor.reset(); } -void PageSelector::GetCoreSelection (void) +void PageSelector::GetCoreSelection() { PageSelector::UpdateLock aLock (*this); @@ -118,7 +118,7 @@ void PageSelector::GetCoreSelection (void) } } -void PageSelector::SetCoreSelection (void) +void PageSelector::SetCoreSelection() { model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel)); @@ -199,7 +199,7 @@ void PageSelector::DeselectPage ( } } -void PageSelector::CheckConsistency (void) const +void PageSelector::CheckConsistency() const { int nSelectionCount (0); for (int nPageIndex=0,nPageCount=mrModel.GetPageCount(); nPageIndex<nPageCount; nPageIndex++) @@ -228,12 +228,12 @@ bool PageSelector::IsPageSelected (int nPageIndex) return false; } -int PageSelector::GetPageCount (void) const +int PageSelector::GetPageCount() const { return mrModel.GetPageCount(); } -void PageSelector::CountSelectedPages (void) +void PageSelector::CountSelectedPages() { mnSelectedPageCount = 0; model::PageEnumeration aSelectedPages ( @@ -245,7 +245,7 @@ void PageSelector::CountSelectedPages (void) } } -void PageSelector::EnableBroadcasting (void) +void PageSelector::EnableBroadcasting() { if (mnBroadcastDisableLevel > 0) mnBroadcastDisableLevel --; @@ -256,12 +256,12 @@ void PageSelector::EnableBroadcasting (void) } } -void PageSelector::DisableBroadcasting (void) +void PageSelector::DisableBroadcasting() { mnBroadcastDisableLevel ++; } -::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection (void) const +::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const { ::boost::shared_ptr<PageSelection> pSelection (new PageSelection()); pSelection->reserve(GetSelectedPageCount()); @@ -346,12 +346,12 @@ PageSelector::UpdateLock::UpdateLock (PageSelector& rSelector) ++mpSelector->mnUpdateLockCount; } -PageSelector::UpdateLock::~UpdateLock (void) +PageSelector::UpdateLock::~UpdateLock() { Release(); } -void PageSelector::UpdateLock::Release (void) +void PageSelector::UpdateLock::Release() { if (mpSelector != NULL) { @@ -378,7 +378,7 @@ PageSelector::BroadcastLock::BroadcastLock (PageSelector& rSelector) mrSelector.DisableBroadcasting(); } -PageSelector::BroadcastLock::~BroadcastLock (void) +PageSelector::BroadcastLock::~BroadcastLock() { mrSelector.EnableBroadcasting(); } diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 5165a5f14de6..a876bd2ae37f 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -23,7 +23,7 @@ namespace sd { namespace slidesorter { namespace controller { -Properties::Properties (void) +Properties::Properties() : mbIsHighlightCurrentSlide(false), mbIsShowSelection(true), mbIsShowFocus(true), @@ -41,11 +41,11 @@ Properties::Properties (void) { } -Properties::~Properties (void) +Properties::~Properties() { } -void Properties::HandleDataChangeEvent (void) +void Properties::HandleDataChangeEvent() { maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor(); diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 971c7e75aebb..5fcebfb83746 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -66,11 +66,11 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) LINK(this, ScrollBarManager, AutoScrollTimeoutHandler)); } -ScrollBarManager::~ScrollBarManager (void) +ScrollBarManager::~ScrollBarManager() { } -void ScrollBarManager::Connect (void) +void ScrollBarManager::Connect() { if (mpVerticalScrollBar != 0) { @@ -84,7 +84,7 @@ void ScrollBarManager::Connect (void) } } -void ScrollBarManager::Disconnect (void) +void ScrollBarManager::Disconnect() { if (mpVerticalScrollBar != 0) { @@ -429,7 +429,7 @@ void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft) mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); } -int ScrollBarManager::GetVerticalScrollBarWidth (void) const +int ScrollBarManager::GetVerticalScrollBarWidth() const { if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible()) return mpVerticalScrollBar->GetSizePixel().Width(); @@ -437,7 +437,7 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const return 0; } -int ScrollBarManager::GetHorizontalScrollBarHeight (void) const +int ScrollBarManager::GetHorizontalScrollBarHeight() const { if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible()) return mpHorizontalScrollBar->GetSizePixel().Height(); @@ -501,7 +501,7 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) bool ScrollBarManager::AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor) + const ::boost::function<void()>& rAutoScrollFunctor) { maAutoScrollFunctor = rAutoScrollFunctor; CalcAutoScrollOffset(rMouseWindowPosition); @@ -512,13 +512,13 @@ bool ScrollBarManager::AutoScroll ( return bResult; } -void ScrollBarManager::StopAutoScroll (void) +void ScrollBarManager::StopAutoScroll() { maAutoScrollTimer.Stop(); mbIsAutoScrollActive = false; } -bool ScrollBarManager::RepeatAutoScroll (void) +bool ScrollBarManager::RepeatAutoScroll() { if (maAutoScrollOffset != Size(0,0)) { @@ -546,7 +546,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) void ScrollBarManager::clearAutoScrollFunctor() { - maAutoScrollFunctor = ::boost::function<void(void)>(); + maAutoScrollFunctor = ::boost::function<void()>(); } IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 64ee5effc7e8..8bef190c0ecf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -133,7 +133,7 @@ private: whether the selection rectangle is visible or whether the page under the mouse or the one that has the focus is selected. */ - sal_uInt32 EncodeState (void) const; + sal_uInt32 EncodeState() const; }; //===== SelectionFunction::ModeHandler ======================================== @@ -145,10 +145,10 @@ public: SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction, const bool bIsMouseOverIndicatorAllowed); - virtual ~ModeHandler (void); + virtual ~ModeHandler(); - virtual Mode GetMode (void) const = 0; - virtual void Abort (void) = 0; + virtual Mode GetMode() const = 0; + virtual void Abort() = 0; virtual void ProcessEvent (EventDescriptor& rDescriptor); /** Set the selection to exactly the specified page and also set it as @@ -157,7 +157,7 @@ public: void SetCurrentPage (const model::SharedPageDescriptor& rpDescriptor); /// Deselect all pages. - void DeselectAllPages (void); + void DeselectAllPages(); void SelectOnePage (const model::SharedPageDescriptor& rpDescriptor); /** When the view on which this selection function is working is the @@ -169,7 +169,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} + bool IsMouseOverIndicatorAllowed() const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -196,12 +196,12 @@ public: NormalModeHandler ( SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction); - virtual ~NormalModeHandler (void); + virtual ~NormalModeHandler(); - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; - void ResetButtonDownLocation (void); + void ResetButtonDownLocation(); protected: virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -235,14 +235,14 @@ public: const Point& rMouseModelPosition, const sal_uInt32 nEventCode); #endif - virtual ~MultiSelectionModeHandler (void); + virtual ~MultiSelectionModeHandler(); #ifndef MACOSX void Initialize(const sal_uInt32 nEventCode); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; enum SelectionMode { SM_Normal, SM_Add, SM_Toggle }; @@ -264,7 +264,7 @@ private: sal_Int32 mnSecondIndex; void UpdateModelPosition (const Point& rMouseModelPosition); - void UpdateSelection (void); + void UpdateSelection(); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. @@ -292,14 +292,14 @@ public: const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual ~DragAndDropModeHandler (void); + virtual ~DragAndDropModeHandler(); #ifndef MACOSX void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; protected: virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -332,7 +332,7 @@ SelectionFunction::SelectionFunction ( { } -SelectionFunction::~SelectionFunction (void) +SelectionFunction::~SelectionFunction() { mpModeHandler.reset(); } @@ -376,7 +376,7 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) return true; } -void SelectionFunction::NotifyDragFinished (void) +void SelectionFunction::NotifyDragFinished() { SwitchToNormalMode(); } @@ -599,7 +599,7 @@ void SelectionFunction::Deactivate() FuPoor::Deactivate(); } -void SelectionFunction::DoCut (void) +void SelectionFunction::DoCut() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -607,12 +607,12 @@ void SelectionFunction::DoCut (void) } } -void SelectionFunction::DoCopy (void) +void SelectionFunction::DoCopy() { mrController.GetClipboard().DoCopy(); } -void SelectionFunction::DoPaste (void) +void SelectionFunction::DoPaste() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -620,7 +620,7 @@ void SelectionFunction::DoPaste (void) } } -bool SelectionFunction::cancel (void) +bool SelectionFunction::cancel() { mrController.GetFocusManager().ToggleFocus(); return true; @@ -694,7 +694,7 @@ bool Match ( return (nEventCode & nPositivePattern)==nPositivePattern; } -void SelectionFunction::SwitchToNormalMode (void) +void SelectionFunction::SwitchToNormalMode() { if (mpModeHandler->GetMode() != NormalMode) SwitchMode(::boost::shared_ptr<ModeHandler>( @@ -756,12 +756,12 @@ void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHa mpModeHandler = rpHandler; } -void SelectionFunction::ResetShiftKeySelectionAnchor (void) +void SelectionFunction::ResetShiftKeySelectionAnchor() { mnShiftKeySelectionAnchor = -1; } -void SelectionFunction::ResetMouseAnchor (void) +void SelectionFunction::ResetMouseAnchor() { if (mpModeHandler && mpModeHandler->GetMode() == NormalMode) { @@ -866,7 +866,7 @@ sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( return nEventCode; } -sal_uInt32 SelectionFunction::EventDescriptor::EncodeState (void) const +sal_uInt32 SelectionFunction::EventDescriptor::EncodeState() const { sal_uInt32 nEventCode (0); @@ -894,7 +894,7 @@ SelectionFunction::ModeHandler::ModeHandler ( { } -SelectionFunction::ModeHandler::~ModeHandler (void) +SelectionFunction::ModeHandler::~ModeHandler() { } @@ -977,7 +977,7 @@ void SelectionFunction::ModeHandler::SetCurrentPage ( mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(rpDescriptor); } -void SelectionFunction::ModeHandler::DeselectAllPages (void) +void SelectionFunction::ModeHandler::DeselectAllPages() { mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSelectionFunction.ResetShiftKeySelectionAnchor(); @@ -1039,16 +1039,16 @@ NormalModeHandler::NormalModeHandler ( { } -NormalModeHandler::~NormalModeHandler (void) +NormalModeHandler::~NormalModeHandler() { } -SelectionFunction::Mode NormalModeHandler::GetMode (void) const +SelectionFunction::Mode NormalModeHandler::GetMode() const { return SelectionFunction::NormalMode; } -void NormalModeHandler::Abort (void) +void NormalModeHandler::Abort() { } @@ -1259,7 +1259,7 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri } } -void NormalModeHandler::ResetButtonDownLocation (void) +void NormalModeHandler::ResetButtonDownLocation() { maButtonDownLocation = ::boost::optional<Point>(); } @@ -1294,7 +1294,7 @@ void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) SetSelectionModeFromModifier(nEventCode); } -MultiSelectionModeHandler::~MultiSelectionModeHandler (void) +MultiSelectionModeHandler::~MultiSelectionModeHandler() { if (mbAutoScrollInstalled) { @@ -1305,12 +1305,12 @@ MultiSelectionModeHandler::~MultiSelectionModeHandler (void) mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer); } -SelectionFunction::Mode MultiSelectionModeHandler::GetMode (void) const +SelectionFunction::Mode MultiSelectionModeHandler::GetMode() const { return SelectionFunction::MultiSelectionMode; } -void MultiSelectionModeHandler::Abort (void) +void MultiSelectionModeHandler::Abort() { mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } @@ -1470,7 +1470,7 @@ void MultiSelectionModeHandler::UpdateModelPosition (const Point& rMouseModelPos UpdateSelection(); } -void MultiSelectionModeHandler::UpdateSelection (void) +void MultiSelectionModeHandler::UpdateSelection() { view::SlideSorterView::DrawLock aLock (mrSlideSorter); @@ -1533,7 +1533,7 @@ void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Wind && pDragTransferable->GetView()==&mrSlideSorter.GetView()); } -DragAndDropModeHandler::~DragAndDropModeHandler (void) +DragAndDropModeHandler::~DragAndDropModeHandler() { if (mpDragAndDropContext) { @@ -1544,12 +1544,12 @@ DragAndDropModeHandler::~DragAndDropModeHandler (void) mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); } -SelectionFunction::Mode DragAndDropModeHandler::GetMode (void) const +SelectionFunction::Mode DragAndDropModeHandler::GetMode() const { return SelectionFunction::DragAndDropMode; } -void DragAndDropModeHandler::Abort (void) +void DragAndDropModeHandler::Abort() { mrSlideSorter.GetController().GetClipboard().Abort(); if (mpDragAndDropContext) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 13246b7444ec..889e3510c940 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -75,7 +75,7 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter) { } -SelectionManager::~SelectionManager (void) +SelectionManager::~SelectionManager() { if (mnAnimationId != Animator::NotAnAnimationId) mrController.GetAnimator()->RemoveAnimation(mnAnimationId); @@ -269,7 +269,7 @@ void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) rListener)); } -sal_Int32 SelectionManager::GetInsertionPosition (void) const +sal_Int32 SelectionManager::GetInsertionPosition() const { sal_Int32 nInsertionPosition (mnInsertionPosition); if (nInsertionPosition < 0) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 2af4e0334cbf..9b2f8c9da7c6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -38,13 +38,13 @@ SelectionObserver::Context::Context (SlideSorter& rSlideSorter) mpSelectionObserver->StartObservation(); } -SelectionObserver::Context::~Context(void) +SelectionObserver::Context::~Context() { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); } -void SelectionObserver::Context::Abort(void) +void SelectionObserver::Context::Abort() { if (mpSelectionObserver) { @@ -63,7 +63,7 @@ SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) { } -SelectionObserver::~SelectionObserver (void) +SelectionObserver::~SelectionObserver() { } @@ -89,7 +89,7 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) } } -void SelectionObserver::StartObservation (void) +void SelectionObserver::StartObservation() { OSL_ASSERT(!mbIsOvservationActive); maInsertedPages.clear(); @@ -97,7 +97,7 @@ void SelectionObserver::StartObservation (void) mbIsOvservationActive = true; } -void SelectionObserver::AbortObservation (void) +void SelectionObserver::AbortObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; @@ -105,7 +105,7 @@ void SelectionObserver::AbortObservation (void) maDeletedPages.clear(); } -void SelectionObserver::EndObservation (void) +void SelectionObserver::EndObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d6ac365ef3fb..17eaee29fd1a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -117,7 +117,7 @@ SlotManager::SlotManager (SlideSorter& rSlideSorter) { } -SlotManager::~SlotManager (void) +SlotManager::~SlotManager() { } @@ -877,7 +877,7 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) slideshowhelp::ShowSlideShow(rReq, *mrSlideSorter.GetModel().GetDocument()); } -void SlotManager::RenameSlide (void) +void SlotManager::RenameSlide() { PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); View* pDrView = &mrSlideSorter.GetView(); @@ -1186,7 +1186,7 @@ void SlotManager::ChangeSlideExclusionState ( mrSlideSorter.GetModel().GetDocument()->SetChanged(); } -sal_Int32 SlotManager::GetInsertionPosition (void) +sal_Int32 SlotManager::GetInsertionPosition() { PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); @@ -1233,7 +1233,7 @@ sal_Int32 SlotManager::GetInsertionPosition (void) } } -void SlotManager::NotifyEditModeChange (void) +void SlotManager::NotifyEditModeChange() { SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings()); rBindings.Invalidate(SID_PRESENTATION); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index ea088a0b916d..85777682c4e2 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -62,7 +62,7 @@ TransferableData::TransferableData ( StartListening(*mpViewShell); } -TransferableData::~TransferableData (void) +TransferableData::~TransferableData() { if (mpViewShell != NULL) EndListening(*mpViewShell); diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 8ccb1106c5e6..4a29df00b43e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -59,16 +59,16 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) { } -VisibleAreaManager::~VisibleAreaManager (void) +VisibleAreaManager::~VisibleAreaManager() { } -void VisibleAreaManager::ActivateCurrentSlideTracking (void) +void VisibleAreaManager::ActivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = true; } -void VisibleAreaManager::DeactivateCurrentSlideTracking (void) +void VisibleAreaManager::DeactivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = false; } @@ -92,14 +92,14 @@ void VisibleAreaManager::RequestVisible ( } } -void VisibleAreaManager::RequestCurrentSlideVisible (void) +void VisibleAreaManager::RequestCurrentSlideVisible() { if (mbIsCurrentSlideTrackingActive && mnDisableCount==0) RequestVisible( mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -void VisibleAreaManager::MakeVisible (void) +void VisibleAreaManager::MakeVisible() { if (maVisibleRequests.empty()) return; @@ -146,7 +146,7 @@ void VisibleAreaManager::MakeVisible (void) meRequestedAnimationMode = Animator::AM_Immediate; } -::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft (void) const +::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft() const { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if ( ! pWindow) @@ -208,7 +208,7 @@ VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSor ++mrVisibleAreaManager.mnDisableCount; } -VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler (void) +VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler() { --mrVisibleAreaManager.mnDisableCount; } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index 3678648b58be..eb4b40520c6b 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -54,7 +54,7 @@ public: /** Called to determine whether the system is idle and a preview can be created without annoying the user. */ - virtual bool IsIdle (void) = 0; + virtual bool IsIdle() = 0; /** This method is used to determine whether a page is currently visible or not. It is called when the cache becomes to large and some @@ -89,7 +89,7 @@ public: same model but have different preview sizes may access previews of each other in order to create fast previews of the previews. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) = 0; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0; }; typedef ::boost::shared_ptr<CacheContext> SharedCacheContext; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 62daa10e03b3..27b8e9e35baf 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -77,7 +77,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~PageCache (void); + ~PageCache(); void ChangeSize( const Size& rPreviewSize, @@ -148,8 +148,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::scoped_ptr<GenericPageCache> mpImplementation; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 7a730034b98a..e6ed624f6032 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -47,7 +47,7 @@ public: /** Return the one instance of the PageCacheManager class. */ - static ::boost::shared_ptr<PageCacheManager> Instance (void); + static ::boost::shared_ptr<PageCacheManager> Instance(); /** Look up the cache for the given model in which the previews have the specified size. If no such cache exists, then one is created. When @@ -96,7 +96,7 @@ public: those that are not. This is used for example when the high contrast mode is turned on or off. */ - void InvalidateAllCaches (void); + void InvalidateAllCaches(); /** Call this method when a page has been deleted and its preview is not needed anymore. @@ -125,8 +125,8 @@ private: */ const sal_uInt32 mnMaximalRecentlyCacheCount; - PageCacheManager (void); - ~PageCacheManager (void); + PageCacheManager(); + ~PageCacheManager(); class Deleter; friend class Deleter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index f9ff6ca44e54..3658db1f3854 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -70,11 +70,11 @@ public: /** Late initialization. Call this method once a new new object has been created. */ - void Init (void); + void Init(); - virtual ~SlideSorterController (void); + virtual ~SlideSorterController(); - void Dispose (void); + void Dispose(); /** Place and size the scroll bars and the browser window so that the given rectangle is filled. @@ -106,18 +106,18 @@ public: */ model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition); - PageSelector& GetPageSelector (void); - FocusManager& GetFocusManager (void); - controller::Clipboard& GetClipboard (void); + PageSelector& GetPageSelector(); + FocusManager& GetFocusManager(); + controller::Clipboard& GetClipboard(); /** Return the object that manages the scroll bars. */ - ScrollBarManager& GetScrollBarManager (void); + ScrollBarManager& GetScrollBarManager(); - ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager (void) const; - ::boost::shared_ptr<SlotManager> GetSlotManager (void) const; - ::boost::shared_ptr<SelectionManager> GetSelectionManager (void) const; - ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler (void) const; + ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const; + ::boost::shared_ptr<SlotManager> GetSlotManager() const; + ::boost::shared_ptr<SelectionManager> GetSelectionManager() const; + ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const; /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. @@ -137,7 +137,7 @@ public: void ExecCtrl (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); - bool IsLocked (void) const; + bool IsLocked() const; /** Create an object of this inner class to prevent updates due to model changes. @@ -145,8 +145,8 @@ public: class ModelChangeLock {public: ModelChangeLock (SlideSorterController& rController); - ~ModelChangeLock (void); - void Release (void); + ~ModelChangeLock(); + void Release(); private: SlideSorterController* mpController; }; @@ -158,14 +158,14 @@ public: This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Update the display of all pages. This involves a redraw and releasing previews and caches. */ - void UpdateAllPages (void); + void UpdateAllPages(); /** This factory method creates a selection function. */ @@ -175,13 +175,13 @@ public: selection function then return a reference to it. Otherwise return an empty reference. */ - ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction (void); + ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction(); /** Prepare for a change of the edit mode. Depending on the current edit mode we may save the selection so that it can be restored when later changing back to the current edit mode. */ - void PrepareEditModeChange (void); + void PrepareEditModeChange(); /** Set a new edit mode and return whether the edit mode really has been changed. For proper saving and restoring of the selection @@ -196,7 +196,7 @@ public: /** Finish the change of the edit mode. Here we may select a page or restore a previously saved selection. */ - void FinishEditModeChange (void); + void FinishEditModeChange(); /** Call this method when the name of one of the pages has changed. This is then notified to the accessibility object, when that exists. @@ -215,12 +215,12 @@ public: /** Return an Animator object. */ - ::boost::shared_ptr<Animator> GetAnimator (void) const { return mpAnimator;} + ::boost::shared_ptr<Animator> GetAnimator() const { return mpAnimator;} - VisibleAreaManager& GetVisibleAreaManager (void) const; + VisibleAreaManager& GetVisibleAreaManager() const; - void CheckForMasterPageAssignment (void); - void CheckForSlideTransitionAssignment (void); + void CheckForMasterPageAssignment(); + void CheckForSlideTransitionAssignment(); private: SlideSorter& mrSlideSorter; @@ -295,26 +295,26 @@ private: called. Ciritcal operations like releasing references to pages that do not exist anymore are executed. */ - void LockModelChange (void); + void LockModelChange(); /** Further calls to HandleModelChange() will result in a full featured update of model, view, and controller. When HandleModelChange() has been called since the last LockModelChange() then this is done right away to bring the view up-to-date. */ - void UnlockModelChange (void); + void UnlockModelChange(); /** Prepare for a model change. This method does all the things that need to be done _before_ the model changes, e.g. because they need access to the model data before the change. */ - void PreModelChange (void); + void PreModelChange(); /** Complete a model change. This includes the recreation of data structures that depend on the model and the request for a repaint to show the changes. */ - void PostModelChange (void); + void PostModelChange(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 9bed85a76524..faf620cd9a0e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -47,12 +47,12 @@ public: enum AnimationMode { AM_Animated, AM_Immediate }; Animator (SlideSorter& rSlideSorter); - ~Animator (void); + ~Animator(); /** When disposed the animator will stop its work immediately and not process any timer events anymore. */ - void Dispose (void); + void Dispose(); /** An animation object is called with values between 0 and 1 as single argument to its operator() method. @@ -90,7 +90,7 @@ public: slidesorter when the slide sorter bar is put into a cache due to a change of the edit mode. */ - void RemoveAllAnimations (void); + void RemoveAllAnimations(); private: SlideSorter& mrSlideSorter; @@ -118,7 +118,7 @@ private: /** Remove animations that have expired. */ - void CleanUpAnimationList (void); + void CleanUpAnimationList(); void RequestNextFrame (const double nFrameStart = 0); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9421eef2c521..e4ffd2ff006d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -60,7 +60,7 @@ class Clipboard { public: Clipboard (SlideSorter& rSlideSorter); - virtual ~Clipboard (void); + virtual ~Clipboard(); /** Create a slide sorter transferable from the given sd transferable. The returned transferable is set up with all @@ -96,7 +96,7 @@ public: sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); - void Abort (void); + void Abort(); protected: virtual sal_uInt16 DetermineInsertPosition ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 8f767c198a93..87651fcf3f8a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -49,7 +49,7 @@ public: */ CurrentSlideManager (SlideSorter& rSlideSorter); - ~CurrentSlideManager (void); + ~CurrentSlideManager(); /** Call this when the current page of the main view shell has been switched. Use SwitchCurrentSlide() to initiate such a switch. @@ -76,15 +76,15 @@ public: /** Return the page descriptor for the current slide. Note, that when there is no current slide then the returned pointer is empty. */ - model::SharedPageDescriptor GetCurrentSlide (void) { return mpCurrentSlide;} + model::SharedPageDescriptor GetCurrentSlide() { return mpCurrentSlide;} /** Release all references to model data. */ - void PrepareModelChange (void); + void PrepareModelChange(); /** Modify inner state in reaction to a change of the SlideSorterModel. */ - void HandleModelChange (void); + void HandleModelChange(); private: SlideSorter& mrSlideSorter; @@ -95,7 +95,7 @@ private: */ Timer maSwitchPageDelayTimer; - bool IsCurrentSlideIsValid (void); + bool IsCurrentSlideIsValid(); void SetCurrentSlideAtViewShellBase (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtTabControl (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtXController (const model::SharedPageDescriptor& rpSlide); @@ -103,7 +103,7 @@ private: /** When switching from one slide to a new current slide then this method releases all ties to the old slide. */ - void ReleaseCurrentSlide (void); + void ReleaseCurrentSlide(); /** When switching from one slide to a new current slide then this method connects to the new current slide. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 12284bae8db3..c67fdf3e74bb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -47,7 +47,7 @@ public: */ FocusManager (SlideSorter& rSlideSorter); - ~FocusManager (void); + ~FocusManager(); enum FocusMoveDirection { @@ -83,25 +83,25 @@ public: /** Hide the focus indicator. */ - void HideFocus (void); + void HideFocus(); /** Toggle the focused state of the current slide. @return Returns the focused state of the focus page after the call. */ - bool ToggleFocus (void); + bool ToggleFocus(); /** Return whether the window managed by the called focus manager has the input focus of the application. */ - bool HasFocus (void) const; + bool HasFocus() const; /** Return the descriptor of the page that currently has the focus. @return When there is no page that currently has the focus then NULL is returned. */ - model::SharedPageDescriptor GetFocusedPageDescriptor (void) const; + model::SharedPageDescriptor GetFocusedPageDescriptor() const; /** Return the index of the page that currently has the focus as it is accepted by the slide sorter model. @@ -109,7 +109,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} + sal_Int32 GetFocusedPageIndex() const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. @@ -126,7 +126,7 @@ public: */ void SetFocusedPage (sal_Int32 nPageIndex); - void SetFocusedPageToCurrentPage (void); + void SetFocusedPageToCurrentPage(); /** Return <TRUE/> when the focus inidcator is currently shown. A prerequisite is that the window managed by this focus manager has @@ -134,7 +134,7 @@ public: HasFocus(). It is not necessary that the focus indicator is visible. It may have been scrolled outside the visible area. */ - bool IsFocusShowing (void) const; + bool IsFocusShowing() const; /** Add a listener that is called when the focus is shown or hidden or set to another page object. @@ -160,7 +160,7 @@ public: { public: FocusHider (FocusManager&); - ~FocusHider (void); + ~FocusHider(); private: bool mbFocusVisible; FocusManager& mrManager; @@ -211,7 +211,7 @@ private: happened. The focus may be hidden or shown or moved from one page object to another. */ - void NotifyFocusChangeListeners (void) const; + void NotifyFocusChangeListeners() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index b094c447fee6..d4084e6cc90d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -42,7 +42,7 @@ class InsertionIndicatorHandler { public: InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler (void); + ~InsertionIndicatorHandler(); enum Mode { CopyMode, MoveMode, UnknownMode }; static Mode GetModeFromDndAction (const sal_Int8 nDndAction); @@ -63,7 +63,7 @@ public: { public: ForceShowContext (const ::boost::shared_ptr<InsertionIndicatorHandler>& rpHandler); - ~ForceShowContext (void); + ~ForceShowContext(); private: const ::boost::shared_ptr<InsertionIndicatorHandler> mpHandler; }; @@ -84,12 +84,12 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const { return mbIsActive;} + bool IsActive() const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. */ - sal_Int32 GetInsertionPageIndex (void) const; + sal_Int32 GetInsertionPageIndex() const; /** Determine whether moving the current selection to the current position of the insertion marker would alter the document. This @@ -121,7 +121,7 @@ private: void SetPosition ( const Point& rPoint, const Mode eMode); - ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator (void); + ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator(); /** Make the insertion indicator visible (that is the show part) and keep it visible, even when the mouse leaves the window (that is the @@ -131,8 +131,8 @@ private: In effect all calls to End() are ignored until ForceEnd() is called. */ - void ForceShow (void); - void ForceEnd (void); + void ForceShow(); + void ForceEnd(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 5db5465be0e7..9f2051cff76e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -55,19 +55,19 @@ class PageSelector : private ::boost::noncopyable public: PageSelector (SlideSorter& rSlideSorter); - void SelectAllPages (void); - void DeselectAllPages (void); + void SelectAllPages(); + void DeselectAllPages(); /** Update the selection state of all page descriptors to be the same as that of the corresponding pages of the SdPage objects and issue redraw requests where necessary. */ - void GetCoreSelection (void); + void GetCoreSelection(); /** Update the selection state of the SdPage objects to be the same as that of the correspinding page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); /** Select the specified descriptor. The selection state of the other descriptors is not affected. @@ -106,15 +106,15 @@ public: that it is self contained for iterating over all pages to select or deselect them. */ - int GetPageCount (void) const; - int GetSelectedPageCount (void) const { return mnSelectedPageCount;} + int GetPageCount() const; + int GetSelectedPageCount() const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. @return The returned anchor may be NULL. */ - model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;} + model::SharedPageDescriptor GetSelectionAnchor() const { return mpSelectionAnchor;} typedef ::std::vector<SdPage*> PageSelection; @@ -125,7 +125,7 @@ public: even if pages are exchanged a later call to SetPageSelection() is valid. */ - ::boost::shared_ptr<PageSelection> GetPageSelection (void) const; + ::boost::shared_ptr<PageSelection> GetPageSelection() const; /** Restore a page selection according to the given selection object. @param rSelection @@ -148,7 +148,7 @@ public: /** Call this method after the model has changed to set the number of selected pages. */ - void CountSelectedPages (void); + void CountSelectedPages(); /** Use the UpdateLock whenever you do a complex selection, i.e. call more than one method in a row. An active lock prevents intermediate @@ -159,8 +159,8 @@ public: public: UpdateLock (SlideSorter& rSlideSorter); UpdateLock (PageSelector& rPageSelector); - ~UpdateLock (void); - void Release (void); + ~UpdateLock(); + void Release(); private: PageSelector* mpSelector; }; @@ -170,7 +170,7 @@ public: public: BroadcastLock (SlideSorter& rSlideSorter); BroadcastLock (PageSelector& rPageSelector); - ~BroadcastLock (void); + ~BroadcastLock(); private: PageSelector& mrSelector; }; @@ -195,17 +195,17 @@ private: DisableBroadcasting() was called before and the selection has been changed in the mean time, this change will be broadcasted. */ - void EnableBroadcasting (void); + void EnableBroadcasting(); /** Disable the broadcasting of selection change events. Subsequent changes of the selection will set a flag that triggers the sending of events when EnableBroadcasting() is called. */ - void DisableBroadcasting (void); + void DisableBroadcasting(); void UpdateCurrentPage (const bool bUpdateOnlyWhenPending = false); - void CheckConsistency (void) const; + void CheckConsistency() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 5c6f4ed494d4..18aad707f6c6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -29,32 +29,32 @@ namespace sd { namespace slidesorter { namespace controller { class Properties { public: - Properties (void); - ~Properties (void); + Properties(); + ~Properties(); /** Call this method after receiving a VCLEVENT_APPLICATION_DATACHANGED event. */ - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} + bool IsHighlightCurrentSlide() const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const { return mbIsShowSelection;} + bool IsShowSelection() const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const { return mbIsShowFocus;} + bool IsShowFocus() const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,54 +62,54 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const { return mbIsCenterSelection;} + bool IsCenterSelection() const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} + bool IsSmoothSelectionScrolling() const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation() const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. */ - Color GetBackgroundColor (void) const { return maBackgroundColor;} + Color GetBackgroundColor() const { return maBackgroundColor;} void SetBackgroundColor (const Color& rColor); /** Return the text color. */ - Color GetTextColor (void) const { return maTextColor;} + Color GetTextColor() const { return maTextColor;} void SetTextColor (const Color& rColor); /** Return the color in which selections are to be painted. */ - Color GetSelectionColor (void) const { return maSelectionColor;} + Color GetSelectionColor() const { return maSelectionColor;} void SetSelectionColor (const Color& rColor); /** Return the color used for highlighting e.g. the current slide. */ - Color GetHighlightColor (void) const { return maHighlightColor;} + Color GetHighlightColor() const { return maHighlightColor;} void SetHighlightColor (const Color& rColor); /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} + bool IsUIReadOnly() const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} + bool IsOnlyPreviewTriggersMouseOver() const { return mbIsOnlyPreviewTriggersMouseOver;} private: bool mbIsHighlightCurrentSlide; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 594a415d3784..ca039c316a4f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -67,19 +67,19 @@ public: */ ScrollBarManager (SlideSorter& rSlideSorter); - ~ScrollBarManager (void); + ~ScrollBarManager(); /** Register listeners at the scroll bars. This method is called after startup of a new slide sorter object or after a reactivation of a slide sorter that for example is taken from a cache. */ - void Connect (void); + void Connect(); /** Remove listeners from the scroll bars. This method is called when the slide sorter is destroyed or when it is suspended, e.g. put into a cache for later reuse. */ - void Disconnect (void); + void Disconnect(); /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages @@ -129,7 +129,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its width in pixel is returned. */ - int GetVerticalScrollBarWidth (void) const; + int GetVerticalScrollBarWidth() const; /** Return the height of the horizontal scroll bar, which--when shown--should be fixed in contrast to its width. @@ -137,7 +137,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its height in pixel is returned. */ - int GetHorizontalScrollBarHeight (void) const; + int GetHorizontalScrollBarHeight() const; /** Call this method to scroll a window while the mouse is in dragging a selection. If the mouse is near the window border or is outside the @@ -152,9 +152,9 @@ public: */ bool AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor); + const ::boost::function<void()>& rAutoScrollFunctor); - void StopAutoScroll (void); + void StopAutoScroll(); void clearAutoScrollFunctor(); @@ -215,7 +215,7 @@ private: */ SharedSdWindow mpContentWindow; - ::boost::function<void(void)> maAutoScrollFunctor; + ::boost::function<void()> maAutoScrollFunctor; void SetWindowOrigin ( double nHorizontalPosition, @@ -250,7 +250,7 @@ private: const Rectangle& rAvailableArea); void CalcAutoScrollOffset (const Point& rMouseWindowPosition); - bool RepeatAutoScroll (void); + bool RepeatAutoScroll(); DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 6142fdf7f587..bc10d3b39618 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -55,13 +55,13 @@ public: virtual void Deactivate() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCut (void) SAL_OVERRIDE; + virtual void DoCut() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCopy (void) SAL_OVERRIDE; + virtual void DoCopy() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoPaste (void) SAL_OVERRIDE; + virtual void DoPaste() SAL_OVERRIDE; /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -78,12 +78,12 @@ public: /** Turn of substitution display and insertion indicator. */ - void NotifyDragFinished (void); + void NotifyDragFinished(); /** Call when drag-and-drop or multi selection is started or stopped in order to update permission of mouse over indication. */ - void UpdateMouseOverIndicationPermission (void); + void UpdateMouseOverIndicationPermission(); class EventDescriptor; class ModeHandler; @@ -95,17 +95,17 @@ public: DragAndDropMode, ButtonMode }; - void SwitchToNormalMode (void); + void SwitchToNormalMode(); void SwitchToDragAndDropMode(const Point& rMousePosition); void SwitchToMultiSelectionMode (const Point& rMousePosition, const sal_uInt32 nEventCode); - void ResetShiftKeySelectionAnchor (void); + void ResetShiftKeySelectionAnchor(); /** Special case handling for when the context menu is hidden. This method will reinitialize the current mouse position to prevent the mouse motion during the time the context menu is displayed from being interpreted as drag-and-drop start. */ - void ResetMouseAnchor (void); + void ResetMouseAnchor(); protected: SlideSorter& mrSlideSorter; @@ -172,7 +172,7 @@ private: const bool bIsShiftDown, const bool bIsControlDown); - void StopDragAndDrop (void); + void StopDragAndDrop(); void SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 5d5f235fa63e..1d63ead4c585 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -53,7 +53,7 @@ public: */ SelectionManager (SlideSorter& rSlideSorter); - ~SelectionManager (void); + ~SelectionManager(); /** Delete the currently selected slides. When this method returns the selection is empty. @@ -96,14 +96,14 @@ public: position of the associated insertion marker is stored here and reset the next time the selection changes. */ - sal_Int32 GetInsertionPosition (void) const; + sal_Int32 GetInsertionPosition() const; /** Store an insertion position temporarily. It is reset when the selection changes the next time. */ void SetInsertionPosition (const sal_Int32 nInsertionPosition); - ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const { return mpSelectionObserver;} + ::boost::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;} private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx index 30079a495cbd..6cbeb2804795 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx @@ -41,12 +41,12 @@ class SelectionObserver { public: SelectionObserver (SlideSorter& rSlideSorter); - virtual ~SelectionObserver (void); + virtual ~SelectionObserver(); void NotifyPageEvent (const SdrPage* pPage); - void StartObservation (void); - void AbortObservation (void); - void EndObservation (void); + void StartObservation(); + void AbortObservation(); + void EndObservation(); /** Use this little class instead of calling StartObservation and EndObservation directly so that EndObservation is not forgotten or @@ -57,8 +57,8 @@ public: { public: Context (SlideSorter& rSlideSorter); - ~Context(void); - void Abort (void); + ~Context(); + void Abort(); private: ::boost::shared_ptr<SelectionObserver> mpSelectionObserver; }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index b8841a798465..e9db2ce099d7 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -48,7 +48,7 @@ public: */ SlotManager (SlideSorter& rSlideSorter); - ~SlotManager (void); + ~SlotManager(); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); @@ -72,7 +72,7 @@ public: /** Call this after a change from normal mode to master mode or back. The affected slots are invalidated. */ - void NotifyEditModeChange (void); + void NotifyEditModeChange(); private: /// The controller for which we manage the slot calls. @@ -88,7 +88,7 @@ private: /** The implementation is a copy of the code for SID_RENAMEPAGE in drviews2.cxx. */ - void RenameSlide (void); + void RenameSlide(); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName); @@ -101,7 +101,7 @@ private: /** Use one of several ways to determine where to insert a new page. This can be the current selection or the insertion indicator. */ - sal_Int32 GetInsertionPosition (void); + sal_Int32 GetInsertionPosition(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 57d51f28ed2e..1e60ac843b4a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -67,13 +67,13 @@ public: TransferableData ( SlideSorterViewShell* pViewShell, const ::std::vector<TransferableData::Representative>& rRepresentatives); - virtual ~TransferableData (void); + virtual ~TransferableData(); - const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} + const ::std::vector<Representative>& GetRepresentatives() const { return maRepresentatives;} /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} + SlideSorterViewShell* GetSourceViewShell() const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index b062c7a494c8..56e21137732d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -34,18 +34,18 @@ class VisibleAreaManager { public: VisibleAreaManager (SlideSorter& rSlideSorter); - ~VisibleAreaManager (void); + ~VisibleAreaManager(); - void ActivateCurrentSlideTracking (void); - void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} + void ActivateCurrentSlideTracking(); + void DeactivateCurrentSlideTracking(); + bool IsCurrentSlideTrackingActive() const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is active. @see ActivateCurrentSlideTracking() and DeactivateCurrentSlideTracking() */ - void RequestCurrentSlideVisible (void); + void RequestCurrentSlideVisible(); /** Request to make the specified page object visible. */ @@ -59,7 +59,7 @@ public: { public: TemporaryDisabler (SlideSorter& rSlideSorter); - ~TemporaryDisabler (void); + ~TemporaryDisabler(); private: VisibleAreaManager& mrVisibleAreaManager; }; @@ -82,8 +82,8 @@ private: bool mbIsCurrentSlideTrackingActive; int mnDisableCount; - void MakeVisible (void); - ::boost::optional<Point> GetRequestedTopLeft (void) const; + void MakeVisible(); + ::boost::optional<Point> GetRequestedTopLeft() const; }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index c5a2e73392d5..c963b76a08a0 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -55,13 +55,13 @@ class SlideSorterModel public: SlideSorterModel (SlideSorter& rSlideSorter); - virtual ~SlideSorterModel (void); - void Dispose (void); + virtual ~SlideSorterModel(); + void Dispose(); /** This method is present to let the view create a ShowView for displaying slides. */ - SdDrawDocument* GetDocument (void); + SdDrawDocument* GetDocument(); /** Set a new edit mode and return whether the edit mode really has been changed. When the edit mode is changed then the @@ -76,16 +76,16 @@ public: /** Set the edit mode to that currently used by the controller. */ - bool SetEditModeFromController (void); - EditMode GetEditMode (void) const { return meEditMode;} - PageKind GetPageType (void) const { return mePageKind;} + bool SetEditModeFromController(); + EditMode GetEditMode() const { return meEditMode;} + PageKind GetPageType() const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. The number of slides depends on the set of slides available through the XIndexAccess given to SetDocumentSlides(). */ - sal_Int32 GetPageCount (void) const; + sal_Int32 GetPageCount() const; /** Return a page descriptor for the page with the specified index. Page descriptors are created on demand. The page descriptor is @@ -145,26 +145,26 @@ public: is especially important for previews of complex pages that take some time to create. */ - void Resync (void); + void Resync(); /** Delete all descriptors that currently are in the container. The size of the container, however, is not altered. Use the AdaptSize method for that. */ - void ClearDescriptorList (void); + void ClearDescriptorList(); /** Set the selection of the document to exactly that of the called model. */ - void SynchronizeDocumentSelection (void); + void SynchronizeDocumentSelection(); /** Set the selection of the called model to exactly that of the document. */ - void SynchronizeModelSelection (void); + void SynchronizeModelSelection(); /** Return the mutex so that the caller can lock it and then safely access the model. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Set the XIndexAccess from which the called SlideSorterModel takes its pages. @@ -177,20 +177,20 @@ public: /** Return the set of pages that is currently displayed by the slide sorter. */ - css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides (void) const; + css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides() const; /** This method is called when the edit mode has changed. It calls SetDocumentSlides() with the set of slides or master pages obtained from the model of the XController. */ - void UpdatePageList (void); + void UpdatePageList(); - bool IsReadOnly (void) const; + bool IsReadOnly() const; /** The current selection is saved by copying the ST_Selected state into ST_WasSelected for slides. */ - void SaveCurrentSelection (void); + void SaveCurrentSelection(); /** The current selection is restored from the ST_WasSelected state from the slides. @@ -198,7 +198,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - ::vcl::Region RestoreSelection (void); + ::vcl::Region RestoreSelection(); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. @@ -220,7 +220,7 @@ private: /** Resize the descriptor container according to current values of page kind and edit mode. */ - void AdaptSize (void); + void AdaptSize(); SdPage* GetPage (const sal_Int32 nCoreIndex) const; void InsertSlide (SdPage* pPage); diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index b66a41285d08..5e6f681f23a1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -33,12 +33,12 @@ class Enumeration public: virtual ~Enumeration() {} - virtual bool HasMoreElements (void) const = 0; + virtual bool HasMoreElements() const = 0; /** Returns T instead of T& so that it can handle shared pointers. */ - virtual T GetNextElement (void) = 0; - virtual void Rewind (void) = 0; - virtual ::std::unique_ptr<Enumeration<T> > Clone (void) = 0; + virtual T GetNextElement() = 0; + virtual void Rewind() = 0; + virtual ::std::unique_ptr<Enumeration<T> > Clone() = 0; }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3638af33dd86..412971e995c6 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -64,26 +64,26 @@ public: SdPage* pPage, const sal_Int32 nIndex); - ~PageDescriptor (void); + ~PageDescriptor(); /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const { return mpPage;} + SdPage* GetPage() const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ - css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const { return mxPage;} + css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage() const { return mxPage;} /** Returns the index of the page as it is displayed in the view as page number. The value may differ from the index returned by the XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const { return mnIndex;} + sal_Int32 GetPageIndex() const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); - bool UpdateMasterPage (void); - bool UpdateTransitionFlag (void); + bool UpdateMasterPage(); + bool UpdateTransitionFlag(); enum State { ST_Visible, ST_Selected, ST_WasSelected, ST_Focused, ST_MouseOver, ST_Current, ST_Excluded }; @@ -101,16 +101,16 @@ public: returned. When they were the same this method returns <FALSE/>. */ - bool GetCoreSelection (void); + bool GetCoreSelection(); /** Set the selection flags of the SdPage objects to the corresponding selection states of the page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); - VisualState& GetVisualState (void) { return maVisualState;} + VisualState& GetVisualState() { return maVisualState;} - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; Point GetLocation (const bool bIgnoreLocation = false) const; void SetBoundingBox (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 959f9276dad9..247bfe25a515 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -80,26 +80,26 @@ public: /** Create and return an exact copy of the called object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; PageEnumeration& operator= (const PageEnumeration& rEnumeration); /** Return <TRUE/> when the enumeration has more elements, i.e. it is save to call GetNextElement() at least one more time. */ - virtual bool HasMoreElements (void) const SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; /** Return the next element of the enumeration. Call the HasMoreElements() before to make sure that there exists at least one more element. Calling this method with HasMoreElements() returning <FALSE/> is an error. */ - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; /** Rewind the enumeration so that the next call to GetNextElement() will return its first element. */ - virtual void Rewind (void) SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: /// Implementation object. @@ -111,7 +111,7 @@ private: PageEnumeration (::std::unique_ptr<Enumeration<SharedPageDescriptor> > && pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration(); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index de9ef2103fba..0df22fa48819 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -42,13 +42,13 @@ public: VS_None }; VisualState (const sal_Int32 nPageId); - ~VisualState (void); + ~VisualState(); void SetVisualState (const State eState); void UpdateVisualState (const PageDescriptor& rDescriptor); - Point GetLocationOffset (void) const { return maLocationOffset;} + Point GetLocationOffset() const { return maLocationOffset;} bool SetLocationOffset (const Point& rPoint); sal_Int32 mnPageId; // For debugging diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index e9ac85896ea0..88402e727395 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -74,23 +74,23 @@ public: */ SlideSorterView (SlideSorter& rSlideSorter); - void Init (void); + void Init(); - virtual ~SlideSorterView (void); - void Dispose (void); + virtual ~SlideSorterView(); + void Dispose(); /** Set the general way of layouting the page objects. Note that this method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const { return meOrientation;} + Layouter::Orientation GetOrientation() const { return meOrientation;} - void RequestRepaint (void); + void RequestRepaint(); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); void RequestRepaint (const ::vcl::Region& rRepaintRegion); - Rectangle GetModelArea (void); + Rectangle GetModelArea(); /** Return the index of the page that is rendered at the given position. @param rPosition @@ -101,9 +101,9 @@ public: */ sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const; - view::Layouter& GetLayouter (void); + view::Layouter& GetLayouter(); - virtual void ModelHasChanged (void) SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; /** This method is typically called before a model change takes place. All references to model data are released. PostModelChange() has to @@ -111,22 +111,22 @@ public: calls to Pre- and PostModelChange() are very close to each other you may call HandleModelChange() instead. */ - void PreModelChange (void); + void PreModelChange(); /** This method is typically called after a model change took place. References to model data are re-allocated. Call this method only after PreModelChange() has been called. */ - void PostModelChange (void); + void PostModelChange(); /** This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); - void HandleDrawModeChange (void); + void HandleDrawModeChange(); - void Resize (void); + void Resize(); virtual void CompleteRedraw ( OutputDevice* pDevice, const ::vcl::Region& rPaintArea, @@ -137,19 +137,19 @@ public: utl::ConfigurationBroadcaster* pBroadcaster, sal_uInt32 nHint) SAL_OVERRIDE; - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); - void Layout (void); + void Layout(); /** This tells the view that it has to re-determine the visibility of the page objects before painting them the next time. */ - void InvalidatePageObjectVisibilities (void); + void InvalidatePageObjectVisibilities(); /** Return the window to which this view renders its output. */ - // ::boost::shared_ptr<sd::Window> GetWindow (void) const; + // ::boost::shared_ptr<sd::Window> GetWindow() const; - ::boost::shared_ptr<cache::PageCache> GetPreviewCache (void); + ::boost::shared_ptr<cache::PageCache> GetPreviewCache(); /** Set the bounding box of the insertion marker in model coordinates. @@ -177,7 +177,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair GetVisiblePageRange (void); + Pair GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). @@ -211,26 +211,26 @@ public: const model::PageDescriptor::State eState, const bool bStateValue); - void UpdateOrientation (void); + void UpdateOrientation(); - ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void); - ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const { return mpLayeredDevice;} + ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter(); + ::boost::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;} class DrawLock { public: DrawLock (SlideSorter& rSlideSorter); - ~DrawLock (void); + ~DrawLock(); /** When the DrawLock is disposed then it will not request a repaint on destruction. */ - void Dispose (void); + void Dispose(); private: view::SlideSorterView& mrView; SharedSdWindow mpWindow; }; - ToolTip& GetToolTip (void) const; + ToolTip& GetToolTip() const; virtual void DragFinished (sal_Int8 nDropAction) SAL_OVERRIDE; @@ -263,11 +263,11 @@ private: /** Determine the visibility of all page objects. */ - void DeterminePageObjectVisibilities (void); + void DeterminePageObjectVisibilities(); - void UpdatePreciousFlags (void); - void RequestRearrange (void); - void Rearrange (void); + void UpdatePreciousFlags(); + void RequestRearrange(); + void Rearrange(); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index d901f8353a71..6f51d058ea84 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -41,14 +41,14 @@ public: /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. */ - static FontProvider& Instance (void); + static FontProvider& Instance(); /** Call this method to tell an object to release its currently used font. The next call to GetFont() will then create a new one. Typically called after a DataChange event when for instance a system font has been modified. */ - void Invalidate (void); + void Invalidate(); private: static FontProvider* mpInstance; @@ -62,8 +62,8 @@ private: */ MapMode maMapMode; - FontProvider (void); - virtual ~FontProvider (void); + FontProvider(); + virtual ~FontProvider(); FontProvider (const FontProvider&) SAL_DELETED_FUNCTION; FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 6424c027232c..5f604726a172 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -54,7 +54,7 @@ class InsertionIndicatorOverlay { public: InsertionIndicatorOverlay (SlideSorter& rSlideSorter); - virtual ~InsertionIndicatorOverlay (void); + virtual ~InsertionIndicatorOverlay(); virtual void SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator) SAL_OVERRIDE; @@ -66,17 +66,17 @@ public: */ void SetLocation (const Point& rPosition); - Size GetSize (void) const; + Size GetSize() const; virtual void Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const { return mbIsVisible;} - void Hide (void); - void Show (void); + bool IsVisible() const { return mbIsVisible;} + void Hide(); + void Show(); - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 4402129fc36f..eeba70945715 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -66,9 +66,9 @@ public: Layouter ( const SharedSdWindow& rpWindow, const ::boost::shared_ptr<Theme>& rpTheme); - ~Layouter (void); + ~Layouter(); - ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const; + ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const; /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fulfilled then the call is ignored. @param nMinimalColumnCount @@ -107,16 +107,16 @@ public: /** Return the number of columns. */ - sal_Int32 GetColumnCount (void) const; + sal_Int32 GetColumnCount() const; sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const; /** Return the scale factor that can be set at the map mode of the output window. */ - Fraction GetScaleFactor (void) const; + Fraction GetScaleFactor() const; - Size GetPageObjectSize (void) const; + Size GetPageObjectSize() const; /** Return the bounding box in window coordinates of the nIndex-th page object. @@ -128,7 +128,7 @@ public: /** Return the bounding box in model coordinates of the page that contains the given amount of page objects. */ - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; /** Return the index of the first fully or partially visible page object. This takes into account only the vertical dimension. @@ -185,8 +185,8 @@ public: const Size& rIndicatorSize, model::SlideSorterModel& rModel) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; class Implementation; @@ -201,7 +201,7 @@ private: class InsertPosition { public: - InsertPosition (void); + InsertPosition(); InsertPosition& operator= (const InsertPosition& rInsertPosition); bool operator== (const InsertPosition& rInsertPosition) const; bool operator!= (const InsertPosition& rInsertPosition) const; @@ -218,15 +218,15 @@ public: const Point& rLeadingOffset, const Point& rTrailingOffset); - sal_Int32 GetRow (void) const { return mnRow; } - sal_Int32 GetColumn (void) const { return mnColumn; } - sal_Int32 GetIndex (void) const { return mnIndex; } - Point GetLocation (void) const { return maLocation; } - Point GetLeadingOffset (void) const { return maLeadingOffset; } - Point GetTrailingOffset (void) const { return maTrailingOffset; } - bool IsAtRunStart (void) const { return mbIsAtRunStart; } - bool IsAtRunEnd (void) const { return mbIsAtRunEnd; } - bool IsExtraSpaceNeeded (void) const { return mbIsExtraSpaceNeeded; } + sal_Int32 GetRow() const { return mnRow; } + sal_Int32 GetColumn() const { return mnColumn; } + sal_Int32 GetIndex() const { return mnIndex; } + Point GetLocation() const { return maLocation; } + Point GetLeadingOffset() const { return maLeadingOffset; } + Point GetTrailingOffset() const { return maTrailingOffset; } + bool IsAtRunStart() const { return mbIsAtRunStart; } + bool IsAtRunEnd() const { return mbIsAtRunEnd; } + bool IsExtraSpaceNeeded() const { return mbIsExtraSpaceNeeded; } private: sal_Int32 mnRow; diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 56d38036cf46..426e36c830fb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -50,7 +50,7 @@ public: const Size& rPreviewModelSize, const SharedSdWindow& rpWindow, const sal_Int32 nPageCount); - ~PageObjectLayouter(void); + ~PageObjectLayouter(); enum Part { // The focus indicator is painted outside the actual page object. @@ -115,8 +115,8 @@ public: /// the maximum size of each tile, also position independent Size GetGridMaxSize(const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} - Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} + Image GetTransitionEffectIcon() const { return maTransitionEffectIcon;} + Image GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;} private: Rectangle GetBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index de7d76f5fb9e..4058c063dddb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -40,7 +40,7 @@ class PageObjectPainter { public: PageObjectPainter (const SlideSorter& rSlideSorter); - ~PageObjectPainter (void); + ~PageObjectPainter(); void PaintPageObject ( OutputDevice& rDevice, @@ -124,7 +124,7 @@ private: one owned by the general layouter. Return <TRUE/> when after the call we have a valid page object layouter. */ - bool UpdatePageObjectLayouter (void); + bool UpdatePageObjectLayouter(); }; } } } // end of namespace sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 58666fb8a7b9..568086a58b88 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -52,7 +52,7 @@ public: void Update ( const ::boost::shared_ptr<controller::Properties>& rpProperties); - // BitmapEx GetInsertIndicatorIcon (void) const; + // BitmapEx GetInsertIndicatorIcon() const; enum FontType { Font_PageNumber, diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index ab04aba70efe..c24484b0c3cd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -35,7 +35,7 @@ class ToolTip { public: ToolTip (SlideSorter& rSlideSorter); - ~ToolTip (void); + ~ToolTip(); /** Set a new page. This modifies the default help text. After a page change a timer is started to delay the display of the tool tip for @@ -50,7 +50,7 @@ public: Returns whether the tool tip was visible at the time this method was called. */ - bool Hide (void); + bool Hide(); private: SlideSorter& mrSlideSorter; @@ -66,7 +66,7 @@ private: is shown after a short delay. */ void Show (const bool bForce); - void DoShow (void); + void DoShow(); DECL_LINK(DelayTrigger, void*); }; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 8d0c14be2c43..9a02c8870196 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -110,17 +110,17 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) { } -SlideSorterModel::~SlideSorterModel (void) +SlideSorterModel::~SlideSorterModel() { ClearDescriptorList (); } -void SlideSorterModel::Dispose (void) +void SlideSorterModel::Dispose() { ClearDescriptorList (); } -SdDrawDocument* SlideSorterModel::GetDocument (void) +SdDrawDocument* SlideSorterModel::GetDocument() { if (mrSlideSorter.GetViewShellBase() != NULL) return mrSlideSorter.GetViewShellBase()->GetDocument(); @@ -140,7 +140,7 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) return bEditModeChanged; } -sal_Int32 SlideSorterModel::GetPageCount (void) const +sal_Int32 SlideSorterModel::GetPageCount() const { return maPageDescriptors.size(); } @@ -273,7 +273,7 @@ sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const document: pages may have been deleted and others may have been created at the exact same memory locations. */ -void SlideSorterModel::Resync (void) +void SlideSorterModel::Resync() { ::osl::MutexGuard aGuard (maMutex); @@ -311,7 +311,7 @@ void SlideSorterModel::Resync (void) CheckModel(*this); } -void SlideSorterModel::ClearDescriptorList (void) +void SlideSorterModel::ClearDescriptorList() { DescriptorContainer aDescriptors; @@ -340,7 +340,7 @@ void SlideSorterModel::ClearDescriptorList (void) } } -void SlideSorterModel::SynchronizeDocumentSelection (void) +void SlideSorterModel::SynchronizeDocumentSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -353,7 +353,7 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } -void SlideSorterModel::SynchronizeModelSelection (void) +void SlideSorterModel::SynchronizeModelSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -423,13 +423,13 @@ void SlideSorterModel::SetDocumentSlides ( mrSlideSorter.GetController().GetSlotManager()->NotifyEditModeChange(); } -Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides (void) const +Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides() const { ::osl::MutexGuard aGuard (maMutex); return mxSlides; } -void SlideSorterModel::UpdatePageList (void) +void SlideSorterModel::UpdatePageList() { ::osl::MutexGuard aGuard (maMutex); @@ -475,7 +475,7 @@ void SlideSorterModel::UpdatePageList (void) mrSlideSorter.GetController().SetDocumentSlides(xPages); } -void SlideSorterModel::AdaptSize (void) +void SlideSorterModel::AdaptSize() { if (mxSlides.is()) maPageDescriptors.resize(mxSlides->getCount()); @@ -483,7 +483,7 @@ void SlideSorterModel::AdaptSize (void) maPageDescriptors.resize(0); } -bool SlideSorterModel::IsReadOnly (void) const +bool SlideSorterModel::IsReadOnly() const { if (mrSlideSorter.GetViewShellBase() != NULL && mrSlideSorter.GetViewShellBase()->GetDocShell()) @@ -492,7 +492,7 @@ bool SlideSorterModel::IsReadOnly (void) const return true; } -void SlideSorterModel::SaveCurrentSelection (void) +void SlideSorterModel::SaveCurrentSelection() { PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) @@ -504,7 +504,7 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -vcl::Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection() { vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index e8e377c7e026..e84b4cd22eb5 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -61,7 +61,7 @@ PageDescriptor::PageDescriptor ( } } -PageDescriptor::~PageDescriptor (void) +PageDescriptor::~PageDescriptor() { } @@ -71,7 +71,7 @@ void PageDescriptor::SetPageIndex (const sal_Int32 nNewIndex) maVisualState.mnPageId = nNewIndex; } -bool PageDescriptor::UpdateMasterPage (void) +bool PageDescriptor::UpdateMasterPage() { const SdrPage* pMaster = NULL; if (mpPage!=NULL && mpPage->TRG_HasMasterPage()) @@ -85,7 +85,7 @@ bool PageDescriptor::UpdateMasterPage (void) return false; } -bool PageDescriptor::UpdateTransitionFlag (void) +bool PageDescriptor::UpdateTransitionFlag() { bool bHasSlideTransition (false); if (mpPage != NULL) @@ -188,7 +188,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) return bModified; } -bool PageDescriptor::GetCoreSelection (void) +bool PageDescriptor::GetCoreSelection() { if (mpPage!=NULL && mpPage->IsSelected() != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); @@ -196,7 +196,7 @@ bool PageDescriptor::GetCoreSelection (void) return false; } -void PageDescriptor::SetCoreSelection (void) +void PageDescriptor::SetCoreSelection() { if (mpPage != NULL) if (HasState(ST_Selected)) @@ -209,7 +209,7 @@ void PageDescriptor::SetCoreSelection (void) } } -Rectangle PageDescriptor::GetBoundingBox (void) const +Rectangle PageDescriptor::GetBoundingBox() const { Rectangle aBox (maBoundingBox); const Point aOffset (maVisualState.GetLocationOffset()); diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index b769ce736919..2292ec75ef32 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -38,14 +38,14 @@ public: inline PageEnumerationImpl ( const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate); - virtual ~PageEnumerationImpl (void); + virtual ~PageEnumerationImpl(); /** Create a copy of the called enumeration object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; - virtual bool HasMoreElements (void) const SAL_OVERRIDE; - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; - virtual void Rewind (void) SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: const SlideSorterModel& mrModel; @@ -64,7 +64,7 @@ private: /** Skip all elements that do not fulfill Predicate starting with the one pointed to by mnIndex. */ - inline void AdvanceToNextValidElement (void); + inline void AdvanceToNextValidElement(); }; } // end of anonymouse namespace @@ -106,7 +106,7 @@ PageEnumeration::PageEnumeration (const PageEnumeration& rEnumeration ) mpImpl = rEnumeration.mpImpl->Clone(); } -PageEnumeration::~PageEnumeration (void) +PageEnumeration::~PageEnumeration() { } @@ -117,23 +117,23 @@ PageEnumeration& PageEnumeration::operator= ( return *this; } -::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void) +::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumeration (*this, true)); } -bool PageEnumeration::HasMoreElements (void) const +bool PageEnumeration::HasMoreElements() const { return mpImpl->HasMoreElements(); } -SharedPageDescriptor PageEnumeration::GetNextElement (void) +SharedPageDescriptor PageEnumeration::GetNextElement() { return mpImpl->GetNextElement(); } -void PageEnumeration::Rewind (void) +void PageEnumeration::Rewind() { return mpImpl->Rewind(); } @@ -162,23 +162,23 @@ PageEnumerationImpl::PageEnumerationImpl ( { } -PageEnumerationImpl::~PageEnumerationImpl (void) +PageEnumerationImpl::~PageEnumerationImpl() { } ::std::unique_ptr<Enumeration<SharedPageDescriptor> > - PageEnumerationImpl::Clone (void) + PageEnumerationImpl::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(mrModel,maPredicate,mnIndex)); } -bool PageEnumerationImpl::HasMoreElements (void) const +bool PageEnumerationImpl::HasMoreElements() const { return (mnIndex < mrModel.GetPageCount()); } -SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) +SharedPageDescriptor PageEnumerationImpl::GetNextElement() { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex)); @@ -189,14 +189,14 @@ SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) return pDescriptor; } -void PageEnumerationImpl::Rewind (void) +void PageEnumerationImpl::Rewind() { // Go to first valid element. mnIndex = 0; AdvanceToNextValidElement(); } -void PageEnumerationImpl::AdvanceToNextValidElement (void) +void PageEnumerationImpl::AdvanceToNextValidElement() { while (mnIndex < mrModel.GetPageCount()) { diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index ef3a58708723..9accd0e2336c 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -33,7 +33,7 @@ VisualState::VisualState (const sal_Int32 nPageId) { } -VisualState::~VisualState (void) +VisualState::~VisualState() { if (mnStateAnimationId != controller::Animator::NotAnAnimationId || mnLocationAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 9790dbc33b18..a49035773b2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -51,7 +51,7 @@ class ContentWindow : public ::sd::Window { public: ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); - virtual ~ContentWindow (void); + virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; @@ -147,7 +147,7 @@ SlideSorter::SlideSorter ( { } -void SlideSorter::Init (void) +void SlideSorter::Init() { if (mpViewShellBase != NULL) mxControllerWeak = mpViewShellBase->GetController(); @@ -191,7 +191,7 @@ void SlideSorter::Init (void) } } -SlideSorter::~SlideSorter (void) +SlideSorter::~SlideSorter() { mbIsValid = false; @@ -225,25 +225,25 @@ SlideSorter::~SlideSorter (void) mpContentWindow.reset(); } -model::SlideSorterModel& SlideSorter::GetModel (void) const +model::SlideSorterModel& SlideSorter::GetModel() const { OSL_ASSERT(mpSlideSorterModel.get()!=NULL); return *mpSlideSorterModel; } -view::SlideSorterView& SlideSorter::GetView (void) const +view::SlideSorterView& SlideSorter::GetView() const { OSL_ASSERT(mpSlideSorterView.get()!=NULL); return *mpSlideSorterView; } -controller::SlideSorterController& SlideSorter::GetController (void) const +controller::SlideSorterController& SlideSorter::GetController() const { OSL_ASSERT(mpSlideSorterController.get()!=NULL); return *mpSlideSorterController; } -Reference<frame::XController> SlideSorter::GetXController (void) const +Reference<frame::XController> SlideSorter::GetXController() const { Reference<frame::XController> xController(mxControllerWeak); return xController; @@ -261,7 +261,7 @@ void SlideSorter::SetupControls (::vcl::Window* ) GetVerticalScrollBar()->Show(); } -void SlideSorter::SetupListeners (void) +void SlideSorter::SetupListeners() { SharedSdWindow pWindow (GetContentWindow()); if (pWindow) @@ -288,7 +288,7 @@ void SlideSorter::SetupListeners (void) mpSlideSorterController->GetScrollBarManager().Connect(); } -void SlideSorter::ReleaseListeners (void) +void SlideSorter::ReleaseListeners() { mpSlideSorterController->GetScrollBarManager().Disconnect(); @@ -313,7 +313,7 @@ void SlideSorter::ReleaseListeners (void) WindowEventHandler)); } -void SlideSorter::CreateModelViewController (void) +void SlideSorter::CreateModelViewController() { mpSlideSorterModel.reset(CreateModel()); DBG_ASSERT (mpSlideSorterModel.get()!=NULL, @@ -333,7 +333,7 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView->Init(); } -model::SlideSorterModel* SlideSorter::CreateModel (void) +model::SlideSorterModel* SlideSorter::CreateModel() { // Get pointers to the document. ViewShellBase* pViewShellBase = GetViewShellBase(); @@ -347,12 +347,12 @@ model::SlideSorterModel* SlideSorter::CreateModel (void) return NULL; } -view::SlideSorterView* SlideSorter::CreateView (void) +view::SlideSorterView* SlideSorter::CreateView() { return new view::SlideSorterView (*this); } -controller::SlideSorterController* SlideSorter::CreateController (void) +controller::SlideSorterController* SlideSorter::CreateController() { controller::SlideSorterController* pController = new controller::SlideSorterController (*this); @@ -431,13 +431,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties (void) const +::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -::boost::shared_ptr<view::Theme> SlideSorter::GetTheme (void) const +::boost::shared_ptr<view::Theme> SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; @@ -458,7 +458,7 @@ ContentWindow::ContentWindow( SetStyle(GetStyle() | WB_NOPOINTERFOCUS); } -ContentWindow::~ContentWindow (void) +ContentWindow::~ContentWindow() { } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index a595bf1c8bcb..d1e138e60a84 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -63,11 +63,11 @@ SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxCo (void)rxContext; } -SlideSorterService::~SlideSorterService (void) +SlideSorterService::~SlideSorterService() { } -void SAL_CALL SlideSorterService::disposing (void) +void SAL_CALL SlideSorterService::disposing() { mpSlideSorter.reset(); @@ -129,13 +129,13 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) //----- XView ----------------------------------------------------------------- -Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) +Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) +sal_Bool SAL_CALL SlideSorterService::isAnchorOnly() throw (RuntimeException, std::exception) { return sal_False; @@ -193,7 +193,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP mpSlideSorter->GetModel().GetIndex(rxSlide)); } -Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -205,7 +205,7 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) //----- attributes ------------------------------------------------------------ -Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) +Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides() throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); @@ -220,7 +220,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } -sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) +sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -242,7 +242,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } } -sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -260,7 +260,7 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -296,7 +296,7 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) +sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -317,7 +317,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) +sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -337,7 +337,7 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) : Layouter::HORIZONTAL); } -sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) +sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -355,7 +355,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } -util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) +util::Color SAL_CALL SlideSorterService::getBackgroundColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -374,7 +374,7 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } -util::Color SAL_CALL SlideSorterService::getTextColor (void) +util::Color SAL_CALL SlideSorterService::getTextColor() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -393,7 +393,7 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } -util::Color SAL_CALL SlideSorterService::getSelectionColor (void) +util::Color SAL_CALL SlideSorterService::getSelectionColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -412,7 +412,7 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } -util::Color SAL_CALL SlideSorterService::getHighlightColor (void) +util::Color SAL_CALL SlideSorterService::getHighlightColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -431,7 +431,7 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } -sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) +sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -449,7 +449,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } -void SlideSorterService::Resize (void) +void SlideSorterService::Resize() { if (mxParentWindow.is()) { @@ -460,7 +460,7 @@ void SlideSorterService::Resize (void) } } -void SlideSorterService::ThrowIfDisposed (void) +void SlideSorterService::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 4ce1b5281681..7b79b55a2dcd 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -55,8 +55,8 @@ class SlideSorterService public: explicit SlideSorterService ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~SlideSorterService (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~SlideSorterService(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -65,10 +65,10 @@ public: // XResourceId - css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isAnchorOnly (void) + sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -95,86 +95,86 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Attributes - virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowSelection (void) + virtual sal_Bool SAL_CALL getIsShowSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsCenterSelection (void) + virtual sal_Bool SAL_CALL getIsCenterSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsOrientationVertical (void) + virtual sal_Bool SAL_CALL getIsOrientationVertical() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) + virtual sal_Bool SAL_CALL getIsSmoothScrolling() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getBackgroundColor (void) + virtual css::util::Color SAL_CALL getBackgroundColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getTextColor (void) + virtual css::util::Color SAL_CALL getTextColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTextColor (css::util::Color aTextColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getSelectionColor (void) + virtual css::util::Color SAL_CALL getSelectionColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getHighlightColor (void) + virtual css::util::Color SAL_CALL getHighlightColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsUIReadOnly (void) + virtual sal_Bool SAL_CALL getIsUIReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowFocus (void) + virtual sal_Bool SAL_CALL getIsShowFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) @@ -186,12 +186,12 @@ private: css::uno::Reference<css::awt::XWindow> mxParentWindow; ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; - void Resize (void); + void Resize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 8f74250d4c48..cbb9c3731875 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -137,7 +137,7 @@ SlideSorterViewShell::SlideSorterViewShell ( pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } -SlideSorterViewShell::~SlideSorterViewShell (void) +SlideSorterViewShell::~SlideSorterViewShell() { DisposeFunctions(); @@ -161,7 +161,7 @@ SlideSorterViewShell::~SlideSorterViewShell (void) GetFrameView()->Disconnect(); } -void SlideSorterViewShell::Initialize (void) +void SlideSorterViewShell::Initialize() { mpSlideSorter = SlideSorter::CreateSlideSorter( *this, @@ -230,7 +230,7 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase return pViewShell; } -Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController (void) +Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController() { Reference<drawing::XDrawSubController> xSubController; @@ -286,7 +286,7 @@ void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< } } -SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const +SlideSorter& SlideSorterViewShell::GetSlideSorter() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return *mpSlideSorter; @@ -307,7 +307,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) return bSuccess; } -::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager() const { SfxShell* pObjectBar = GetViewShellBase().GetViewShellManager()->GetTopShell(); if (pObjectBar != NULL) @@ -325,7 +325,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) } } -SdPage* SlideSorterViewShell::getCurrentPage(void) const +SdPage* SlideSorterViewShell::getCurrentPage() const { // since SlideSorterViewShell::GetActualPage() currently also // returns master pages, which is a wrong behaviour for GetActualPage(), @@ -333,7 +333,7 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const return const_cast<SlideSorterViewShell*>(this)->GetActualPage(); } -SdPage* SlideSorterViewShell::GetActualPage (void) +SdPage* SlideSorterViewShell::GetActualPage() { SdPage* pCurrentPage = NULL; @@ -453,7 +453,7 @@ void SlideSorterViewShell::Paint ( mpSlideSorter->GetController().Paint(rBBox,pWindow); } -void SlideSorterViewShell::ArrangeGUIElements (void) +void SlideSorterViewShell::ArrangeGUIElements() { if (IsActive()) { @@ -552,7 +552,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) } } -void SlideSorterViewShell::WriteFrameViewData (void) +void SlideSorterViewShell::WriteFrameViewData() { OSL_ASSERT(mpSlideSorter.get()!=NULL); if (mpFrameView != NULL) @@ -629,7 +629,7 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } -void SlideSorterViewShell::UpdateScrollBars (void) +void SlideSorterViewShell::UpdateScrollBars() { // Do not call the overwritten method of the base class: We do all the // scroll bar setup by ourselves. @@ -679,7 +679,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( } ::boost::shared_ptr<SlideSorterViewShell::PageSelection> - SlideSorterViewShell::GetPageSelection (void) const + SlideSorterViewShell::GetPageSelection() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetPageSelector().GetPageSelection(); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 7b60a294f2a6..d4839971f2cc 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -89,7 +89,7 @@ namespace { { public: Painter (SlideSorterView& rView) : mrView(rView) {} - virtual ~Painter (void) {} + virtual ~Painter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -109,7 +109,7 @@ class BackgroundPainter { public: BackgroundPainter (const Color& rBackgroundColor) : maBackgroundColor(rBackgroundColor) {} - virtual ~BackgroundPainter (void) {} + virtual ~BackgroundPainter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -176,7 +176,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpLayeredDevice->RegisterPainter(pPainter, 1); } -SlideSorterView::~SlideSorterView (void) +SlideSorterView::~SlideSorterView() { if ( ! mbIsDisposed) { @@ -185,12 +185,12 @@ SlideSorterView::~SlideSorterView (void) } } -void SlideSorterView::Init (void) +void SlideSorterView::Init() { HandleModelChange(); } -void SlideSorterView::Dispose (void) +void SlideSorterView::Dispose() { mpSelectionPainter.reset(); @@ -229,24 +229,24 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } -Layouter& SlideSorterView::GetLayouter (void) +Layouter& SlideSorterView::GetLayouter() { return *mpLayouter.get(); } -void SlideSorterView::ModelHasChanged (void) +void SlideSorterView::ModelHasChanged() { // Ignore this call. Rely on hints sent by the model to get informed of // model changes. } -void SlideSorterView::PreModelChange (void) +void SlideSorterView::PreModelChange() { // Reset the slide under the mouse. It will be re-set in PostModelChange(). SetPageUnderMouse(SharedPageDescriptor()); } -void SlideSorterView::PostModelChange (void) +void SlideSorterView::PostModelChange() { // In PreModelChange() the page objects have been released. Here we // create new ones. @@ -265,13 +265,13 @@ void SlideSorterView::PostModelChange (void) describe the type of change so that existing page objects can be reused. */ -void SlideSorterView::HandleModelChange (void) +void SlideSorterView::HandleModelChange() { PreModelChange (); PostModelChange(); } -void SlideSorterView::HandleDrawModeChange (void) +void SlideSorterView::HandleDrawModeChange() { // Replace the preview cache with a new and empty one. The // PreviewRenderer that is used by the cache is replaced by this as @@ -282,7 +282,7 @@ void SlideSorterView::HandleDrawModeChange (void) RequestRepaint(); } -void SlideSorterView::HandleDataChangeEvent (void) +void SlideSorterView::HandleDataChangeEvent() { GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); @@ -295,7 +295,7 @@ void SlideSorterView::HandleDataChangeEvent (void) RequestRepaint(); } -void SlideSorterView::Resize (void) +void SlideSorterView::Resize() { UpdateOrientation(); @@ -303,13 +303,13 @@ void SlideSorterView::Resize (void) RequestRearrange(); } -void SlideSorterView::RequestRearrange (void) +void SlideSorterView::RequestRearrange() { mbIsRearrangePending = true; Rearrange(); } -void SlideSorterView::Rearrange (void) +void SlideSorterView::Rearrange() { if ( ! mbIsRearrangePending) return; @@ -338,7 +338,7 @@ void SlideSorterView::Rearrange (void) } } -void SlideSorterView::UpdateOrientation (void) +void SlideSorterView::UpdateOrientation() { // The layout of slides depends on whether the slide sorter is // displayed in the center or the side pane. @@ -443,12 +443,12 @@ void SlideSorterView::Layout () InvalidatePageObjectVisibilities (); } -void SlideSorterView::InvalidatePageObjectVisibilities (void) +void SlideSorterView::InvalidatePageObjectVisibilities() { mbPageObjectVisibilitiesValid = false; } -void SlideSorterView::DeterminePageObjectVisibilities (void) +void SlideSorterView::DeterminePageObjectVisibilities() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -502,7 +502,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) } } -void SlideSorterView::UpdatePreciousFlags (void) +void SlideSorterView::UpdatePreciousFlags() { if (mbPreciousFlagUpdatePending) { @@ -545,7 +545,7 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) return false; } -void SlideSorterView::RequestRepaint (void) +void SlideSorterView::RequestRepaint() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -584,7 +584,7 @@ void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) } } -Rectangle SlideSorterView::GetModelArea (void) +Rectangle SlideSorterView::GetModelArea() { return mpLayouter->GetTotalBoundingBox(); } @@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged ( } -::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache (void) +::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == NULL) @@ -713,7 +713,7 @@ void SlideSorterView::ConfigurationChanged ( return mpPreviewCache; } -Pair SlideSorterView::GetVisiblePageRange (void) +Pair SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); @@ -740,7 +740,7 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) rListener)); } -ToolTip& SlideSorterView::GetToolTip (void) const +ToolTip& SlideSorterView::GetToolTip() const { OSL_ASSERT(mpToolTip); return *mpToolTip; @@ -841,7 +841,7 @@ bool SlideSorterView::SetState ( return bModified; } -::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter (void) +::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); @@ -859,7 +859,7 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) ++mrView.mnLockRedrawSmph; } -SlideSorterView::DrawLock::~DrawLock (void) +SlideSorterView::DrawLock::~DrawLock() { OSL_ASSERT(mrView.mnLockRedrawSmph>0); --mrView.mnLockRedrawSmph; @@ -871,7 +871,7 @@ SlideSorterView::DrawLock::~DrawLock (void) } } -void SlideSorterView::DrawLock::Dispose (void) +void SlideSorterView::DrawLock::Dispose() { mpWindow.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 120d428085eb..cc44e487f18a 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -31,7 +31,7 @@ namespace sd { namespace slidesorter { namespace view { FontProvider* FontProvider::mpInstance = NULL; -FontProvider& FontProvider::Instance (void) +FontProvider& FontProvider::Instance() { if (mpInstance == NULL) { @@ -62,17 +62,17 @@ FontProvider& FontProvider::Instance (void) return *mpInstance; } -FontProvider::FontProvider (void) +FontProvider::FontProvider() : maFont(), maMapMode() { } -FontProvider::~FontProvider (void) +FontProvider::~FontProvider() { } -void FontProvider::Invalidate (void) +void FontProvider::Invalidate() { maFont.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 07e9d2865e06..dd0c03fcdcfc 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -49,7 +49,7 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap) } } -FramePainter::~FramePainter (void) +FramePainter::~FramePainter() { } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx index b0f1b55168fe..cc3a93cd17cb 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx @@ -28,7 +28,7 @@ class FramePainter { public: FramePainter (const BitmapEx& rBitmap); - ~FramePainter (void); + ~FramePainter(); /** Paint a border around the given box by using a set of bitmaps for the corners and sides. diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 8fb9eba6deab..980487e7d4e1 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -40,10 +40,10 @@ class AnimatorAccess public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; - virtual model::SlideSorterModel& GetModel (void) const = 0; - virtual view::SlideSorterView& GetView (void) const = 0; - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0; - virtual SharedSdWindow GetContentWindow (void) = 0; + virtual model::SlideSorterModel& GetModel() const = 0; + virtual view::SlideSorterView& GetView() const = 0; + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() = 0; + virtual SharedSdWindow GetContentWindow() = 0; protected: ~AnimatorAccess() {} @@ -60,7 +60,7 @@ public: const sal_Int32 nRunIndex, const sal_Int32 nStartIndex, const sal_Int32 nEndIndex); - ~PageObjectRun (void); + ~PageObjectRun(); void operator () (const double nTime); @@ -99,7 +99,7 @@ private: AnimatorAccess& mrAnimatorAccess; ::boost::function<double(double)> maAccelerationFunction; - void RestartAnimation (void); + void RestartAnimation(); }; typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun; @@ -116,7 +116,7 @@ class InsertAnimator::Implementation : public AnimatorAccess { public: Implementation (SlideSorter& rSlideSorter); - virtual ~Implementation (void); + virtual ~Implementation(); void SetInsertPosition ( const InsertPosition& rInsertPosition, @@ -125,10 +125,10 @@ public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; - virtual model::SlideSorterModel& GetModel (void) const SAL_OVERRIDE { return mrModel; } - virtual view::SlideSorterView& GetView (void) const SAL_OVERRIDE { return mrView; } - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) SAL_OVERRIDE { return mpAnimator; } - virtual SharedSdWindow GetContentWindow (void) SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } + virtual model::SlideSorterModel& GetModel() const SAL_OVERRIDE { return mrModel; } + virtual view::SlideSorterView& GetView() const SAL_OVERRIDE { return mrView; } + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; } + virtual SharedSdWindow GetContentWindow() SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } private: model::SlideSorterModel& mrModel; @@ -175,7 +175,7 @@ InsertAnimator::Implementation::Implementation (SlideSorter& rSlideSorter) { } -InsertAnimator::Implementation::~Implementation (void) +InsertAnimator::Implementation::~Implementation() { SetInsertPosition(InsertPosition(), controller::Animator::AM_Immediate); } @@ -321,7 +321,7 @@ PageObjectRun::PageObjectRun ( maEndOffset.resize(nEndIndex - nStartIndex + 1); } -PageObjectRun::~PageObjectRun (void) +PageObjectRun::~PageObjectRun() { } @@ -385,7 +385,7 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod mrAnimatorAccess.RemoveRun(shared_from_this()); } -void PageObjectRun::RestartAnimation (void) +void PageObjectRun::RestartAnimation() { // Stop the current animation. if (mnAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6862a69dccd1..2675746f4306 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -75,7 +75,7 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter) { } -InsertionIndicatorOverlay::~InsertionIndicatorOverlay (void) +InsertionIndicatorOverlay::~InsertionIndicatorOverlay() { Hide(); } @@ -319,7 +319,7 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat mpLayerInvalidator->Invalidate(GetBoundingBox()); } -void InsertionIndicatorOverlay::Show (void) +void InsertionIndicatorOverlay::Show() { if ( ! mbIsVisible) { @@ -336,7 +336,7 @@ void InsertionIndicatorOverlay::Show (void) } } -void InsertionIndicatorOverlay::Hide (void) +void InsertionIndicatorOverlay::Hide() { if (mbIsVisible) { @@ -353,12 +353,12 @@ void InsertionIndicatorOverlay::Hide (void) } } -Rectangle InsertionIndicatorOverlay::GetBoundingBox (void) const +Rectangle InsertionIndicatorOverlay::GetBoundingBox() const { return Rectangle(maLocation, maIcon.GetSizePixel()); } -Size InsertionIndicatorOverlay::GetSize (void) const +Size InsertionIndicatorOverlay::GetSize() const { return Size( maIcon.GetSizePixel().Width() + 10, diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 0916912ef48e..ffbd7d686c64 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -104,8 +104,8 @@ void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const class Layer : private ::boost::noncopyable { public: - Layer (void); - ~Layer (void); + Layer(); + ~Layer(); void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); @@ -117,8 +117,8 @@ public: void Resize (const Size& rSize); void AddPainter (const SharedILayerPainter& rpPainter); void RemovePainter (const SharedILayerPainter& rpPainter); - bool HasPainter (void) const; - void Dispose (void); + bool HasPainter() const; + void Dispose(); private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; @@ -168,7 +168,7 @@ LayeredDevice::LayeredDevice (const SharedSdWindow& rpTargetWindow) mpBackBuffer->SetOutputSizePixel(mpTargetWindow->GetSizePixel()); } -LayeredDevice::~LayeredDevice (void) +LayeredDevice::~LayeredDevice() { } @@ -290,20 +290,20 @@ void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle) } } -void LayeredDevice::Resize (void) +void LayeredDevice::Resize() { const Size aSize (mpTargetWindow->GetSizePixel()); mpBackBuffer->SetOutputSizePixel(aSize); ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Resize, _1, aSize)); } -void LayeredDevice::Dispose (void) +void LayeredDevice::Dispose() { ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Dispose, _1)); mpLayers->clear(); } -bool LayeredDevice::HandleMapModeChange (void) +bool LayeredDevice::HandleMapModeChange() { const MapMode& rMapMode (mpTargetWindow->GetMapMode()); if (maSavedMapMode == rMapMode) @@ -368,14 +368,14 @@ bool LayeredDevice::HandleMapModeChange (void) //===== Layer ================================================================= -Layer::Layer (void) +Layer::Layer() : mpLayerDevice(), maPainters(), maInvalidationRegion() { } -Layer::~Layer (void) +Layer::~Layer() { } @@ -485,12 +485,12 @@ void Layer::RemovePainter (const SharedILayerPainter& rpPainter) } } -bool Layer::HasPainter (void) const +bool Layer::HasPainter() const { return !maPainters.empty(); } -void Layer::Dispose (void) +void Layer::Dispose() { maPainters.clear(); } diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 454074376fce..4cbbf5b22d59 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -46,7 +46,7 @@ class LayeredDevice { public: LayeredDevice (const SharedSdWindow& rpTargetWindow); - ~LayeredDevice (void); + ~LayeredDevice(); void Invalidate ( const Rectangle& rInvalidationBox, @@ -64,12 +64,12 @@ public: const SharedILayerPainter& rPainter, const sal_Int32 nLayer); - bool HandleMapModeChange (void); + bool HandleMapModeChange(); void Repaint (const vcl::Region& rRepaintRegion); - void Resize (void); + void Resize(); - void Dispose (void); + void Dispose(); private: SharedSdWindow mpTargetWindow; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 155652f3d487..fd85c1c61b9f 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -78,7 +78,7 @@ public: const Implementation& rImplementation, const Layouter::Orientation eOrientation); - virtual Layouter::Orientation GetOrientation (void) const = 0; + virtual Layouter::Orientation GetOrientation() const = 0; bool Rearrange ( const Size& rWindowSize, @@ -172,8 +172,8 @@ public: model::SlideSorterModel& rModel, const sal_Int32 nIndex) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; Range GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const; sal_Int32 GetIndex ( @@ -194,9 +194,9 @@ public: const sal_Int32 nRow, const sal_Int32 nColumn) const; - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; - virtual ~Implementation (void); + virtual ~Implementation(); protected: Implementation ( @@ -227,7 +227,7 @@ class VerticalImplementation : public Layouter::Implementation public: VerticalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -249,7 +249,7 @@ class HorizontalImplementation : public Layouter::Implementation public: HorizontalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -275,7 +275,7 @@ public: const ::boost::shared_ptr<view::Theme>& rpTheme); GridImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -299,11 +299,11 @@ Layouter::Layouter ( { } -Layouter::~Layouter (void) +Layouter::~Layouter() { } -::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter (void) const +::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const { return mpImplementation->mpPageObjectLayouter; } @@ -333,7 +333,7 @@ bool Layouter::Rearrange ( return mpImplementation->Rearrange(rWindowSize, rPageSize, nPageCount); } -sal_Int32 Layouter::GetColumnCount (void) const +sal_Int32 Layouter::GetColumnCount() const { return mpImplementation->mnColumnCount; } @@ -343,7 +343,7 @@ sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) con return mpImplementation->GetIndex(nRow,nColumn,true); } -Size Layouter::GetPageObjectSize (void) const +Size Layouter::GetPageObjectSize() const { return mpImplementation->maPageObjectSize; } @@ -355,7 +355,7 @@ Rectangle Layouter::GetPageObjectBox ( return mpImplementation->GetPageObjectBox(nIndex, bIncludeBorderAndGap); } -Rectangle Layouter::GetTotalBoundingBox (void) const +Rectangle Layouter::GetTotalBoundingBox() const { return mpImplementation->GetTotalBoundingBox(); } @@ -377,12 +377,12 @@ InsertPosition Layouter::GetInsertPosition ( return aPosition; } -Range Layouter::GetValidHorizontalSizeRange (void) const +Range Layouter::GetValidHorizontalSizeRange() const { return mpImplementation->GetValidHorizontalSizeRange(); } -Range Layouter::GetValidVerticalSizeRange (void) const +Range Layouter::GetValidVerticalSizeRange() const { return mpImplementation->GetValidVerticalSizeRange(); } @@ -484,7 +484,7 @@ Layouter::Implementation::Implementation (const Implementation& rImplementation) { } -Layouter::Implementation::~Implementation (void) +Layouter::Implementation::~Implementation() { } @@ -813,14 +813,14 @@ Rectangle Layouter::Implementation::GetInnerBoundingBox ( PageObjectLayouter::ModelCoordinateSystem, true); } -Range Layouter::Implementation::GetValidHorizontalSizeRange (void) const +Range Layouter::Implementation::GetValidHorizontalSizeRange() const { return Range( mnLeftBorder + maMinimalSize.Width() + mnRightBorder, mnLeftBorder + maMaximalSize.Width() + mnRightBorder); } -Range Layouter::Implementation::GetValidVerticalSizeRange (void) const +Range Layouter::Implementation::GetValidVerticalSizeRange() const { return Range( mnTopBorder + maMinimalSize.Height() + mnBottomBorder, @@ -962,7 +962,7 @@ Rectangle Layouter::Implementation::AddBorderAndGap ( return aBoundingBox; } -Rectangle Layouter::Implementation::GetTotalBoundingBox (void) const +Rectangle Layouter::Implementation::GetTotalBoundingBox() const { sal_Int32 nHorizontalSize = 0; sal_Int32 nVerticalSize = 0; @@ -1012,7 +1012,7 @@ HorizontalImplementation::HorizontalImplementation (const Implementation& rImple { } -Layouter::Orientation HorizontalImplementation::GetOrientation (void) const +Layouter::Orientation HorizontalImplementation::GetOrientation() const { return Layouter::HORIZONTAL; } @@ -1063,7 +1063,7 @@ VerticalImplementation::VerticalImplementation (const Implementation& rImplement { } -Layouter::Orientation VerticalImplementation::GetOrientation (void) const +Layouter::Orientation VerticalImplementation::GetOrientation() const { return Layouter::VERTICAL; } @@ -1113,7 +1113,7 @@ GridImplementation::GridImplementation (const Implementation& rImplementation) { } -Layouter::Orientation GridImplementation::GetOrientation (void) const +Layouter::Orientation GridImplementation::GetOrientation() const { return Layouter::GRID; } @@ -1186,7 +1186,7 @@ void GridImplementation::CalculateLogicalInsertPosition ( //===== InsertPosition ======================================================== -InsertPosition::InsertPosition (void) +InsertPosition::InsertPosition() : mnRow(-1), mnColumn(-1), mnIndex(-1), diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 7d82198d722e..7a32476deb43 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -91,7 +91,7 @@ PageObjectLayouter::PageObjectLayouter ( aIconSize); } -PageObjectLayouter::~PageObjectLayouter(void) +PageObjectLayouter::~PageObjectLayouter() { } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index bb1d48e73b9b..d5b9d8a92b36 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -61,7 +61,7 @@ PageObjectPainter::PageObjectPainter ( mpFocusBorderPainter->AdaptColor(aColor, true); } -PageObjectPainter::~PageObjectPainter (void) +PageObjectPainter::~PageObjectPainter() { } @@ -87,7 +87,7 @@ void PageObjectPainter::PaintPageObject ( } } -bool PageObjectPainter::UpdatePageObjectLayouter (void) +bool PageObjectPainter::UpdatePageObjectLayouter() { // The page object layouter is quite volatile. It may have been replaced // since the last call. Update it now. diff --git a/sd/source/ui/slidesorter/view/SlsResource.hxx b/sd/source/ui/slidesorter/view/SlsResource.hxx index 9869e0339b3e..6695c00fc322 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.hxx +++ b/sd/source/ui/slidesorter/view/SlsResource.hxx @@ -30,7 +30,7 @@ class LocalResource : public Resource { public: LocalResource (const sal_uInt16 nResourceId) : Resource(SdResId(nResourceId)){} - ~LocalResource (void) { FreeResource(); } + ~LocalResource() { FreeResource(); } }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 954052c0b3e7..16ba566729be 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -44,7 +44,7 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter) maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay()); } -ToolTip::~ToolTip (void) +ToolTip::~ToolTip() { maShowTimer.Stop(); maHiddenTimer.Stop(); @@ -100,7 +100,7 @@ void ToolTip::Show (const bool bNoDelay) maShowTimer.Start(); } -void ToolTip::DoShow (void) +void ToolTip::DoShow() { if (maShowTimer.IsActive()) { @@ -142,7 +142,7 @@ void ToolTip::DoShow (void) } } -bool ToolTip::Hide (void) +bool ToolTip::Hide() { if (mnHelpWindowHandle>0) { diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index ba109d64aa16..e4f99d20a654 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -41,7 +41,7 @@ ViewCacheContext::ViewCacheContext (SlideSorter& rSlideSorter) { } -ViewCacheContext::~ViewCacheContext (void) +ViewCacheContext::~ViewCacheContext() { } @@ -63,7 +63,7 @@ void ViewCacheContext::NotifyPreviewCreation ( } } -bool ViewCacheContext::IsIdle (void) +bool ViewCacheContext::IsIdle() { sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow().get())); if (nIdleState == tools::IdleDetection::IDET_IDLE) @@ -112,7 +112,7 @@ model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKe return mrModel.GetPageDescriptor(nPageIndex); } -::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel (void) +::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel() { if (mrModel.GetDocument() == NULL) return NULL; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 14ee3ca65fa2..19b814a73879 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -40,14 +40,14 @@ class ViewCacheContext : public cache::CacheContext { public: ViewCacheContext (SlideSorter& rSlideSorter); - virtual ~ViewCacheContext (void); + virtual ~ViewCacheContext(); virtual void NotifyPreviewCreation (cache::CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; - virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE; virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; private: model::SlideSorterModel& mrModel; |