9 files changed, 0 insertions, 220 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 47818b73d193..1bbecbef3d66 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -178,14 +178,6 @@ void BitmapCache::Clear (void)
 
 
 
-bool BitmapCache::IsEmpty (void) const
-{
-    return mpBitmapContainer->empty();
-}
-
-
-
-
 bool BitmapCache::IsFull (void) const
 {
     return mbIsFull;
@@ -261,21 +253,6 @@ bool BitmapCache::BitmapIsUpToDate (const CacheKey& rKey)
 
 
 
-void BitmapCache::ReleaseBitmap (const CacheKey& rKey)
-{
-    ::osl::MutexGuard aGuard (maMutex);
-
-    CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey));
-    if (aIterator != mpBitmapContainer->end())
-    {
-        UpdateCacheSize(aIterator->second, REMOVE);
-        mpBitmapContainer->erase(aIterator);
-    }
-}
-
-
-
-
 void BitmapCache::InvalidateBitmap (const CacheKey& rKey)
 {
     ::osl::MutexGuard aGuard (maMutex);
@@ -348,20 +325,6 @@ void BitmapCache::SetBitmap (
 
 
 
-bool BitmapCache::IsPrecious (const CacheKey& rKey)
-{
-    ::osl::MutexGuard aGuard (maMutex);
-
-    CacheBitmapContainer::iterator aIterator (mpBitmapContainer->find(rKey));
-    if (aIterator != mpBitmapContainer->end())
-        return aIterator->second.IsPrecious();
-    else
-        return false;
-}
-
-
-
-
 void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious)
 {
     ::osl::MutexGuard aGuard (maMutex);
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index d0f8766cabf5..2c33e042342f 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -81,10 +81,6 @@ public:
     */
     void Clear (void);
 
-    /** Returns <TRUE/> when there is no preview bitmap in the cache.
-    */
-    bool IsEmpty (void) const;
-
     /** Return <TRUE/> when the cache is full, i.e. the cache compactor had
         to be run.
     */
@@ -108,11 +104,6 @@ public:
     */
     ::boost::shared_ptr<BitmapEx> GetBitmap (const CacheKey& rKey);
 
-    /** Release the reference to the preview bitmap that is associated with
-        the given key.
-    */
-    void ReleaseBitmap (const CacheKey& rKey);
-
     /** Mark the specified preview bitmap as not being up-to-date anymore.
     */
     void InvalidateBitmap (const CacheKey& rKey);
@@ -128,11 +119,6 @@ public:
         const ::boost::shared_ptr<BitmapEx>& rpPreview,
         bool bIsPrecious);
 
-    /** Return whether the specified preview bitmap has been marked as
-        precious.
-    */
-    bool IsPrecious (const CacheKey& rKey);
-
     /** Mark the specified preview bitmap as precious, i.e. that it must not
         be compressed or otherwise removed from the cache.
     */
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
index 7658d1f3b663..780a429df29e 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
@@ -199,15 +199,6 @@ void GenericPageCache::RequestPreviewBitmap (
 
 
 
-void GenericPageCache::InvalidatePreviewBitmap (CacheKey aKey)
-{
-    if (mpBitmapCache.get() != NULL)
-        mpBitmapCache->InvalidateBitmap(mpCacheContext->GetPage(aKey));
-}
-
-
-
-
 void GenericPageCache::ReleasePreviewBitmap (CacheKey aKey)
 {
     if (mpBitmapCache.get() != NULL)
@@ -294,17 +285,6 @@ void GenericPageCache::SetPreciousFlag (CacheKey aKey, bool bIsPrecious)
 
 
 
-bool GenericPageCache::IsEmpty (void) const
-{
-    if (mpBitmapCache.get() != NULL)
-        return mpBitmapCache->IsEmpty();
-    else
-        return true;
-}
-
-
-
-
 void GenericPageCache::Pause (void)
 {
     ProvideCacheAndProcessor();
diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
index e38745e2844f..89fc657004e8 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx
@@ -99,12 +99,6 @@ public:
         const Size& rSize,
         bool bMayBeUpToDate = true);
 
-    /** Tell the cache to replace the bitmap associated with the given
-        request data with a new one that reflects recent changes in the
-        content of the page object.
-    */
-    void InvalidatePreviewBitmap (CacheKey aKey);
-
     /** Call this method when a view-object-contact object is being deleted
         and does not need (a) its current bitmap in the cache and (b) a
         requested a new bitmap.
@@ -124,10 +118,6 @@ public:
     */
     void SetPreciousFlag (CacheKey aKey, bool bIsPrecious);
 
-    /** Return <TRUE/> when there is no preview bitmap in the cache.
-    */
-    bool IsEmpty (void) const;
-
     void Pause (void);
     void Resume (void);
 
diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx
deleted file mode 100644
index 6df77bf52800..000000000000
--- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-#include "precompiled_sd.hxx"
-
-#include "SlsIdleDetector.hxx"
-
-#include "view/SlideSorterView.hxx"
-#include "tools/IdleDetection.hxx"
-#include "Window.hxx"
-
-namespace sd { namespace slidesorter { namespace cache {
-
-IdleDetector::IdleDetector (
-    const ::Window* pWindow,
-    const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
-    : mpWindow(pWindow),
-      mbIsSuspendPreviewUpdatesDuringFullScreenPresentation(
-          bIsSuspendPreviewUpdatesDuringFullScreenPresentation)
-{
-}
-
-
-
-
-bool IdleDetector::operator() (void)
-{
-    // Determine whether the system is idle.
-    sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mpWindow));
-    if (nIdleState == tools::IdleDetection::IDET_IDLE)
-        return true;
-    else
-        return false;
-}
-
-
-} } } // end of namespace ::sd::slidesorter::cache
-
-
-
diff --git a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx b/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx
deleted file mode 100644
index a0ad5422496a..000000000000
--- a/sd/source/ui/slidesorter/cache/SlsIdleDetector.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SD_SLIDESORTER_IDLE_DETECTOR_HXX
-#define SD_SLIDESORTER_IDLE_DETECTOR_HXX
-
-class Window;
-
-namespace sd { namespace slidesorter { namespace cache {
-
-class IdleDetector
-{
-public:
-    IdleDetector (const ::Window* pWindow, const bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation);
-    bool operator() (void);
-
-private:
-    const ::Window* mpWindow;
-    const bool mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;
-};
-
-
-
-
-} } } // end of namespace ::sd::slidesorter::cache
-
-#endif
diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
index 29b7cdb687d1..714e1f008329 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx
@@ -29,7 +29,6 @@
 
 #include "SlsGenericPageCache.hxx"
 #include "SlsRequestFactory.hxx"
-#include "SlsIdleDetector.hxx"
 #include "cache/SlsPageCache.hxx"
 #include "model/SlideSorterModel.hxx"
 #include <boost/bind.hpp>
@@ -81,25 +80,6 @@ BitmapEx PageCache::GetPreviewBitmap (
 
 
 
-void PageCache::RequestPreviewBitmap (
-    CacheKey aKey,
-    const Size& rSize)
-{
-    return mpImplementation->RequestPreviewBitmap(aKey, rSize);
-}
-
-
-
-
-void PageCache::InvalidatePreviewBitmap (
-    CacheKey aKey)
-{
-    mpImplementation->InvalidatePreviewBitmap(aKey);
-}
-
-
-
-
 void PageCache::ReleasePreviewBitmap (
     CacheKey aKey)
 {
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 86354c823b7e..bec9c7fa369d 100644..100755
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -30,7 +30,6 @@
 #include "SlsQueueProcessor.hxx"
 #include "SlsCacheConfiguration.hxx"
 #include "SlsRequestQueue.hxx"
-#include "SlsIdleDetector.hxx"
 
 namespace sd { namespace slidesorter { namespace cache {
 
diff --git a/sd/source/ui/slidesorter/cache/makefile.mk b/sd/source/ui/slidesorter/cache/makefile.mk
index d9766e892992..58862a28645a 100644..100755
--- a/sd/source/ui/slidesorter/cache/makefile.mk
+++ b/sd/source/ui/slidesorter/cache/makefile.mk
@@ -49,7 +49,6 @@ SLOFILES =      							\
     $(SLO)$/SlsCacheCompactor.obj			\
     $(SLO)$/SlsCacheConfiguration.obj		\
     $(SLO)$/SlsGenericPageCache.obj			\
-    $(SLO)$/SlsIdleDetector.obj				\
     $(SLO)$/SlsPageCache.obj				\
     $(SLO)$/SlsPageCacheManager.obj			\
     $(SLO)$/SlsQueueProcessor.obj			\