diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-03 12:50:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-03 14:47:45 +0200 |
| commit | 902d61bc7f2e0491b95798c2ece8595b3881b573 (patch) | |
| tree | 0cccac094a864ac3f2421cd485088f6418b5da96 /sdext/source/presenter/PresenterTimer.cxx | |
| parent | slideshow: replace boost::function with std::function (diff) | |
| download | core-902d61bc7f2e0491b95798c2ece8595b3881b573.tar.gz core-902d61bc7f2e0491b95798c2ece8595b3881b573.zip | |
sdext: replace boost::function with std::function
This one is a bit odd, wonder if that was a bug:
- aAction(aPredicate);
+ aAction(aPredicate());
Change-Id: I0ddd565b65fe4778a297486805fa7f7a12702224
Diffstat (limited to 'sdext/source/presenter/PresenterTimer.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterTimer.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 0af44829382b..dd0e671080ed 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -23,7 +23,6 @@ #include <osl/doublecheckedlocking.h> #include <osl/thread.hxx> #include <boost/bind.hpp> -#include <boost/function.hpp> #include <boost/enable_shared_from_this.hpp> #include <set> #include <iterator> @@ -274,8 +273,7 @@ void SAL_CALL TimerScheduler::run() else { // Execute task. - if ( ! pTask->maTask.empty() - && ! pTask->mbIsCanceled) + if (pTask->maTask && !pTask->mbIsCanceled) { pTask->maTask(aCurrentTime); |