Kaydet (Commit) 04fe6b03 authored tarafından Noel Grandin's avatar Noel Grandin

simplify TimerScheduler

no need for a Deleter class

Change-Id: Iee6e9218f4a81dad8c1e932e807dccf61666a0b3
Reviewed-on: https://gerrit.libreoffice.org/58647
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ffdd06c2
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment