applied patch from Michael Meeks

Change-Id: I57f22b6d9bfbef4a50d162076b01e8e64edb4718

1 files changed, 10 insertions, 0 deletions

diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 11e8f3fa875d..7dd1b814f21d 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -93,10 +93,16 @@ enum IdlePriority {
 
 // To port from Timer -> Idle switch class name,
 // s/Timeout/DoIdle/ etc. and select priority
+<<<<<<< HEAD
 class VCL_DLLPUBLIC Idle : public Timer
 {
  public:
     Idle();
+=======
+class VCL_DLLPUBLIC Idle : private Timer
+{
+ public:
+>>>>>>> applied patch from Michael Meeks
     Idle( IdlePriority ePriority );
     virtual ~Idle();
 
@@ -110,7 +116,11 @@ class VCL_DLLPUBLIC Idle : public Timer
     void            Start() { Timer::Start(); }
     void            Stop()  { Timer::Stop();  }
 
+<<<<<<< HEAD
     virtual void    DoIdle();
+=======
+    virtual void    DoIdle() = 0;
+>>>>>>> applied patch from Michael Meeks
 
     virtual void    Timeout() SAL_OVERRIDE { DoIdle(); }
 };