sd/source/ui/presenter/PresenterPreviewCache.cxx | 7 ++----- sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 2 +- sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx | 6 +----- sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx | 4 +--- sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx | 2 +- 5 files changed, 6 insertions(+), 15 deletions(-)
New commits: commit 874f2d8486e210aacec09d133013aa323084ea31 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Jun 4 15:20:48 2018 +0200 second param of NotifyPreviewCreation is unused ever since it was introduced in commit cd361fde6a8033015a589531992e3d37c10e6f05 Date: Thu Apr 3 13:45:13 2008 +0000 INTEGRATION: CWS presenterview (1.1.2); FILE ADDED Change-Id: I480ca64d6c02b69f7a738ec1f914267fa4ea9e7a Reviewed-on: https://gerrit.libreoffice.org/55283 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 1c347cc35c8f..c98584bad753 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -49,9 +49,7 @@ public: void RemovePreviewCreationNotifyListener (const Reference<drawing::XSlidePreviewCacheListener>& rxListener); // CacheContext - virtual void NotifyPreviewCreation ( - CacheKey aKey, - const BitmapEx& rPreview) override; + virtual void NotifyPreviewCreation (CacheKey aKey) override; virtual bool IsIdle() override; virtual bool IsVisible (CacheKey aKey) override; virtual const SdrPage* GetPage (CacheKey aKey) override; @@ -246,8 +244,7 @@ void PresenterPreviewCache::PresenterCacheContext::RemovePreviewCreationNotifyLi //----- CacheContext ---------------------------------------------------------- void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( - CacheKey aKey, - const BitmapEx&) + CacheKey aKey) { if ( ! mxSlides.is()) return; diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 75145ed9afda..59fa862dd89f 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -155,7 +155,7 @@ void QueueProcessor::ProcessOneRequest ( mpCache->SetBitmap (pSdPage, aPreview, ePriorityClass!=NOT_VISIBLE); // Initiate a repaint of the new preview. - mpCacheContext->NotifyPreviewCreation(aKey, aPreview); + mpCacheContext->NotifyPreviewCreation(aKey); } } } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index ed2548a80cb3..a662f1983e85 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -44,12 +44,8 @@ public: has been finished. @param aKey The key of the page for which the preview has been created. - @param aPreview - The newly created preview. */ - virtual void NotifyPreviewCreation ( - CacheKey aKey, - const BitmapEx& rPreview) = 0; + virtual void NotifyPreviewCreation (CacheKey aKey) = 0; /** Called to determine whether the system is idle and a preview can be created without annoying the user. diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 27ec932f8678..5529d4945eb6 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -45,9 +45,7 @@ ViewCacheContext::~ViewCacheContext() { } -void ViewCacheContext::NotifyPreviewCreation ( - cache::CacheKey aKey, - const BitmapEx&) +void ViewCacheContext::NotifyPreviewCreation(cache::CacheKey aKey) { const model::SharedPageDescriptor pDescriptor (GetDescriptor(aKey)); if (pDescriptor.get() != nullptr) diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 62f1074f8d1d..27323dc77eaf 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -41,7 +41,7 @@ class ViewCacheContext : public cache::CacheContext public: explicit ViewCacheContext (SlideSorter& rSlideSorter); virtual ~ViewCacheContext() override; - virtual void NotifyPreviewCreation (cache::CacheKey aKey, const BitmapEx& rPreview) override; + virtual void NotifyPreviewCreation (cache::CacheKey aKey) override; virtual bool IsIdle() override; virtual bool IsVisible (cache::CacheKey aKey) override; virtual const SdrPage* GetPage (cache::CacheKey aKey) override; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits