diff options
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/PresenterTimer.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 3bd1f9ab9977..0d0216ee2338 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -115,10 +115,7 @@ private: TimerScheduler( uno::Reference<uno::XComponentContext> const& xContext); - virtual ~TimerScheduler() override; - class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; - friend class Deleter; - +public: virtual void SAL_CALL run() override; virtual void SAL_CALL onTerminated() override { mpLateDestroy.reset(); } }; @@ -194,7 +191,7 @@ std::shared_ptr<TimerScheduler> TimerScheduler::Instance( { if (!xContext.is()) return nullptr; - mpInstance.reset(new TimerScheduler(xContext), TimerScheduler::Deleter()); + mpInstance.reset(new TimerScheduler(xContext)); mpInstance->create(); } return mpInstance; @@ -215,10 +212,6 @@ TimerScheduler::TimerScheduler( xDesktop->addTerminateListener(xListener); } -TimerScheduler::~TimerScheduler() -{ -} - SharedTimerTask TimerScheduler::CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, |