summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTobias Madl <tobias.madl.dev@gmail.com>2015-03-06 14:48:18 +0100
committerTobias Madl <tobias.madl.dev@gmail.com>2015-03-06 14:51:48 +0100
commitd05a64df34fd143670cb939b72abfb32d6b714c7 (patch)
tree3dc542680cd3728419b9c95e34325f42047986e5 /svx
parent01f406bc28f53acc5a2734af637aa8074a5d1813 (diff)
Timer/Idle: adapted inherited funktions
Change-Id: I7714a4638b03d020820b276028c0819ef054fa26
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/sdr/contact/objectcontactofpageview.hxx2
-rw-r--r--svx/source/inc/eventhandler.hxx2
-rw-r--r--svx/source/sdr/animation/scheduler.cxx2
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx6
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofpageobj.cxx6
-rw-r--r--svx/source/sdr/event/eventhandler.cxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index 3a822502e560..ba3f5afbea48 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -66,7 +66,7 @@ namespace sdr
virtual void PrepareProcessDisplay() SAL_OVERRIDE;
// From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism
- virtual void Timeout() SAL_OVERRIDE;
+ virtual void Invoke() SAL_OVERRIDE;
// Process the whole displaying
virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE;
diff --git a/svx/source/inc/eventhandler.hxx b/svx/source/inc/eventhandler.hxx
index 1398f4901678..dd5dbb45212d 100644
--- a/svx/source/inc/eventhandler.hxx
+++ b/svx/source/inc/eventhandler.hxx
@@ -101,7 +101,7 @@ namespace sdr
virtual ~TimerEventHandler();
// The timer when it is triggered; from class Timer
- virtual void Timeout() SAL_OVERRIDE;
+ virtual void Invoke() SAL_OVERRIDE;
// reset the timer
void Restart();
diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 099af576c38b..e2afe89eeb14 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -159,7 +159,7 @@ namespace sdr
Stop();
}
- void Scheduler::Timeout()
+ void Scheduler::Invoke()
{
// stop timer and add time
Stop();
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 813dc8eb3d6a..939f01283b0b 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -66,7 +66,7 @@ namespace sdr
ObjectContactOfPageView::~ObjectContactOfPageView()
{
// execute missing LazyInvalidates and stop timer
- Timeout();
+ Invoke();
}
// LazyInvalidate request. Take action.
@@ -87,13 +87,13 @@ namespace sdr
if(bInvalidateDuringPaint)
{
// there are still non-triggered LazyInvalidate events, trigger these
- Timeout();
+ Invoke();
}
}
}
// From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism
- void ObjectContactOfPageView::Timeout()
+ void ObjectContactOfPageView::Invoke()
{
// stop the timer
Stop();
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index cd5e13ba22cd..dc705259919e 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -54,7 +54,7 @@ public:
virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE;
// From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism
- virtual void Timeout() SAL_OVERRIDE;
+ virtual void Invoke() SAL_OVERRIDE;
// get primitive visualization
drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo);
@@ -91,7 +91,7 @@ PagePrimitiveExtractor::PagePrimitiveExtractor(
PagePrimitiveExtractor::~PagePrimitiveExtractor()
{
// execute missing LazyInvalidates and stop timer
- Timeout();
+ Invoke();
}
void PagePrimitiveExtractor::setLazyInvalidate(ViewObjectContact& /*rVOC*/)
@@ -102,7 +102,7 @@ void PagePrimitiveExtractor::setLazyInvalidate(ViewObjectContact& /*rVOC*/)
}
// From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism
-void PagePrimitiveExtractor::Timeout()
+void PagePrimitiveExtractor::Invoke()
{
// stop the timer
Stop();
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 40865d559fbd..c8c4f7a1ae99 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -133,7 +133,7 @@ namespace sdr
}
// The timer when it is triggered; from class Timer
- void TimerEventHandler::Timeout()
+ void TimerEventHandler::Invoke()
{
ExecuteEvents();
}