From 04fe6b033bc5e3f9eaef6bf7e1f8214e83ec7ba7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 6 Aug 2018 16:50:54 +0200 Subject: simplify TimerScheduler no need for a Deleter class Change-Id: Iee6e9218f4a81dad8c1e932e807dccf61666a0b3 Reviewed-on: https://gerrit.libreoffice.org/58647 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/source/presenter/PresenterTimer.cxx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sdext/source/presenter') 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 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::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, -- cgit