[Libreoffice-commits] core.git: Branch 'feature/fixes19' - sd/source

[László Németh]

 sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |   10 +++++-----
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b395405cb1967e318b30408f4ede136b9aad6868
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Thu Mar 24 16:58:02 2016 +0100

    idle slide preview

diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index cf29103..6c06697 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -58,8 +58,8 @@ QueueProcessor::QueueProcessor (
     if (aTimeBetweenReqeusts.has<sal_Int32>())
         aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle;
 
-    maTimer.SetTimeoutHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
-    maTimer.SetTimeout (10);
+    maTimer.SetIdleHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
+    maTimer.SetPriority( SchedulerPriority::LOW );
 }
 
 QueueProcessor::~QueueProcessor()
@@ -73,9 +73,9 @@ void QueueProcessor::Start (int nPriorityClass)
     if ( ! maTimer.IsActive())
     {
         if (nPriorityClass == 0)
-            maTimer.SetTimeout (10);
+            maTimer.SetPriority( SchedulerPriority::LOW );
         else
-            maTimer.SetTimeout (100);
+            maTimer.SetPriority( SchedulerPriority::LOW );
         maTimer.Start();
     }
 }
@@ -106,7 +106,7 @@ void QueueProcessor::SetPreviewSize (
     mbDoSuperSampling = bDoSuperSampling;
 }
 
-IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Timer *, void)
+IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Idle *, void)
 {
     ProcessRequests();
 }
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index 906e2e8..9f9c9d6 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -31,7 +31,7 @@
 
 #include <svx/svdpagv.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/timer.hxx>
+#include <vcl/idle.hxx>
 
 #include <functional>
 
@@ -91,8 +91,8 @@ private:
     */
     ::osl::Mutex maMutex;
 
-    Timer  maTimer;
-    DECL_LINK_TYPED(ProcessRequestHdl, Timer *, void);
+    Idle maTimer;
+    DECL_LINK_TYPED(ProcessRequestHdl, Idle *, void);
     sal_uInt32 mnTimeBetweenHighPriorityRequests;
     sal_uInt32 mnTimeBetweenLowPriorityRequests;
     sal_uInt32 mnTimeBetweenRequestsWhenNotIdle;