diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-03-04 14:13:52 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-03-06 12:27:11 +0000 |
| commit | 49439d4a67b06227e56a2855c856e3482323a28a (patch) | |
| tree | fb77b3a5027643f43e36e593447a06e5ab8aaae7 /include/vcl | |
| parent | ff52f4e417eb4de5e85388a48a650429b1880762 (diff) | |
Timer: patch for commit 06d7314
Change-Id: I762062a4782438ec5bbcb53da9a42f44db65c40d
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/scheduler.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/timer.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index a18aa71e815a..af17016971ea 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -83,7 +83,7 @@ public: static void ImplDeInitScheduler(); /// Process all pending idle tasks ahead of time in priority order. - static void CallbackTaskScheduling(); + static void CallbackTaskScheduling( bool ignore ); static void ProcessTaskScheduling( bool bTimer ); }; diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 01fd36c82a16..d2db1d4efd9c 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -44,7 +44,7 @@ public: void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } const Link& GetTimeoutHdl() const { return maTimeoutHdl; } virtual void Invoke() SAL_OVERRIDE; - virtual void Timeout() { Invoke(); } + void Timeout() { Invoke(); } Timer& operator=( const Timer& rTimer ); void Start() SAL_OVERRIDE; }; |