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

Tobias Madl tobias.madl.dev at gmail.com
Thu Dec 4 01:32:39 PST 2014


 svx/inc/sdr/contact/objectcontactofpageview.hxx       |    2 +-
 svx/source/inc/eventhandler.hxx                       |    4 ++--
 svx/source/sdr/contact/objectcontactofpageview.cxx    |    2 +-
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |    4 ++--
 svx/source/sdr/event/eventhandler.cxx                 |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d9c9153d2b3a13d128be7550d27549619bd390c1
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date:   Thu Dec 4 09:31:30 2014 +0000

    changed inherited timer to idle
    
    Change-Id: I9da6d08964c32e4aafbc9cebc7840eb517f9c33a

diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index d8ea21f..90706b9 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -34,7 +34,7 @@ namespace sdr
 {
     namespace contact
     {
-        class ObjectContactOfPageView : public ObjectContact, public Timer
+        class ObjectContactOfPageView : public ObjectContact, public Idle
         {
         protected:
             // the owner of this ObjectContactOfPageView. Set from constructor and not
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 3c7670c..f3a31de 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -92,10 +92,10 @@ namespace sdr
 {
     namespace event
     {
-        class TimerEventHandler : public EventHandler, public Timer
+        class TimerEventHandler : public EventHandler, public Idle
         {
         public:
-            TimerEventHandler(sal_uInt32 nTimeout = 1L);
+            TimerEventHandler(IdlePriority ePriority = VCL_IDLE_PRIORITY_HIGH);
 
             virtual ~TimerEventHandler();
 
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 1d2c154..ddf1a72 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -59,7 +59,7 @@ namespace sdr
             setPreviewRenderer(((SdrPaintView&)rPageWindow.GetPageView().GetView()).IsPreviewRenderer());
 
             // init timer
-            SetTimeout(1);
+            SetPriority(VCL_IDLE_PRIORITY_HIGH);
             Stop();
         }
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 8e65fb0..007dc7d 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star;
 
 namespace sdr { namespace contact {
 
-class PagePrimitiveExtractor : public ObjectContactOfPagePainter, public Timer
+class PagePrimitiveExtractor : public ObjectContactOfPagePainter, public Idle
 {
 private:
     // the ViewObjectContactOfPageObj using this painter
@@ -83,7 +83,7 @@ PagePrimitiveExtractor::PagePrimitiveExtractor(
     setPreviewRenderer(true);
 
     // init timer
-    SetTimeout(1);
+    SetPriority(VCL_IDLE_PRIORITY_HIGH);
     Stop();
 }
 
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index cf9b2f5..14156c42 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -121,9 +121,9 @@ namespace sdr
 {
     namespace event
     {
-        TimerEventHandler::TimerEventHandler(sal_uInt32 nTimeout)
+        TimerEventHandler::TimerEventHandler(IdlePriority ePriority)
         {
-            SetTimeout(nTimeout);
+            SetPriority(ePriority);
             Stop();
         }
 


More information about the Libreoffice-commits mailing list