[Libreoffice-commits] core.git: Branch 'feature/priorities' - sd/source svtools/source svx/source

[Jennifer Liebel]

 sd/source/ui/dlg/filedlg.cxx                         |   12 ++++++------
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx |    2 +-
 svtools/source/contnr/svimpbox.cxx                   |    6 +++---
 svtools/source/inc/svimpbox.hxx                      |    2 +-
 svx/source/inc/fmshimp.hxx                           |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 995030bb76abfb0bf436293aa8c27a0b4a41372e
Author: Jennifer Liebel <jliebel94 at gmail.com>
Date:   Tue Nov 11 10:57:22 2014 +0000

    changed timers to idle
    
    Change-Id: I6bb3225c171b1637f283de64a38dcff91f3c662c

diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 725f890..c2791e1 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -59,7 +59,7 @@ private:
 
                                 DECL_LINK( PlayMusicHdl, void * );
 
-    Timer                       maUpdateTimer;
+    Idle                        maUpdateIdle;
 
                                 DECL_LINK( IsMusicStoppedHdl, void * );
 
@@ -97,7 +97,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
 
 IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
 {
-    maUpdateTimer.Stop();
+    maUpdateIdle.Stop();
     mnPlaySoundEvent = 0;
 
     if (mxPlayer.is())
@@ -132,8 +132,8 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
             {
                 mxPlayer.set( avmedia::MediaWindow::createPlayer( aUrl, "" ), css::uno::UNO_QUERY_THROW );
                 mxPlayer->start();
-                maUpdateTimer.SetTimeout( 100 );
-                maUpdateTimer.Start();
+                maUpdateIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
+                maUpdateIdle.Start();
             }
             catch (const css::uno::Exception&)
             {
@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
         mxPlayer->getMediaTime() < mxPlayer->getDuration()
        )
     {
-        maUpdateTimer.Start();
+        maUpdateIdle.Start();
         return 0L;
     }
 
@@ -224,7 +224,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short     nDialogType,
     mbUsableSelection( bUsableSelection ),
     mbLabelPlaying(false)
 {
-    maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
+    maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
 
     css::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > xFileDlg = GetFilePicker();
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 0de992a..a93c871 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -127,7 +127,7 @@ CacheCompactor::CacheCompactor(
       mnMaximalCacheSize(nMaximalCacheSize),
       mbIsCompactionRunning(false)
 {
-    maCompactionTimer.SetTimeout(100 /*ms*/);
+    maCompactionTimer.SetTimeout(100);
     maCompactionTimer.SetTimeoutHdl(LINK(this,CacheCompactor,CompactionCallback));
 
 }
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index e7bc872..8e41c55 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -89,8 +89,8 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinS
     nNodeBmpWidth       = 0;
 
     bAsyncBeginDrag     = false;
-    aAsyncBeginDragIdle.SetPriority( VCL_IDLE_PRIORITY_HIGHEST );
-    aAsyncBeginDragIdle.SetIdleHdl( LINK(this,SvImpLBox,BeginDragHdl));
+    aAsyncBeginDragTimer.SetTimeout(0);
+    aAsyncBeginDragTimer.SetTimeoutHdl( LINK(this,SvImpLBox,BeginDragHdl));
     // button animation in listbox
     pActiveButton = 0;
     pActiveEntry = 0;
@@ -2933,7 +2933,7 @@ void SvImpLBox::BeginDrag()
     else
     {
         aAsyncBeginDragPos = aSelEng.GetMousePosPixel();
-        aAsyncBeginDragIdle.Start();
+        aAsyncBeginDragTimer.Start();
     }
 }
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 84a5235..c98b62c 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -125,7 +125,7 @@ private:
     Size                aOutputSize;
     SelectionEngine     aSelEng;
     ImpLBSelEng         aFctSet;
-    Idle                aAsyncBeginDragIdle;
+    Timer               aAsyncBeginDragTimer;
     Point               aAsyncBeginDragPos;
 
     long                nYoffsNodeBmp;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index d01a620..f9455da 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -155,7 +155,7 @@ class SVX_DLLPUBLIC FmXFormShell   : public FmXFormShell_BASE
     class SuspendPropertyTracking;
     friend class SuspendPropertyTracking;
 
-    // Timer um verzoegerte Markierung vorzunehmen
+    // timer for delayed mark
     Timer               m_aMarkTimer;
     SdrObjArray         m_arrSearchedControls;
         // We enable a permanent cursor for the grid we found a searched text, it's disabled in the next "found" event.