diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 20:57:51 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:57:42 -0500 |
| commit | e2dbeb0160936d184dfda2ba3598fbe1388285d8 (patch) | |
| tree | 43b7ff8e88b78563e802aa2c5a67f0c3c9c1a1ca | |
| parent | 51b3b7ca8c71e86e5fc6da76a95b8c6bc1aecdc9 (diff) | |
merge vosremoval-timer.diff
| -rw-r--r-- | sdext/source/presenter/PresenterAnimator.cxx | 2 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterClock.cxx | 6 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterCurrentSlideObserver.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx index b6a9f01..d1c0b2a 100644 --- a/sdext/source/presenter/PresenterAnimator.cxx +++ b/sdext/source/presenter/PresenterAnimator.cxx @@ -34,7 +34,7 @@ #include "PresenterTimer.hxx" #include <osl/diagnose.h> #include <osl/time.h> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <boost/bind.hpp> #include <boost/function.hpp> diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx index b40ac93..8fdb852 100644 --- a/sdext/source/presenter/PresenterClock.cxx +++ b/sdext/source/presenter/PresenterClock.cxx @@ -50,7 +50,7 @@ #include <osl/mutex.hxx> #include <osl/time.h> #include <rtl/ref.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <boost/bind.hpp> #include <cmath> @@ -64,7 +64,7 @@ namespace sdext { namespace presenter { /** Wrapper around a library timer. */ -class PresenterClock::Timer : public vos::OTimer +class PresenterClock::Timer : public salhelper::Timer { public: explicit Timer (const ::rtl::Reference<PresenterClock>& rpClock); @@ -681,7 +681,7 @@ void PresenterClock::ThrowIfDisposed (void) //===== Timer ================================================================= PresenterClock::Timer::Timer (const ::rtl::Reference<PresenterClock>& rpClock) - : OTimer(vos::TTimeValue(10), vos::TTimeValue(100/*ms*/)), + : salhelper::Timer(salhelper::TTimeValue(10), salhelper::TTimeValue(100/*ms*/)), mpClock(rpClock) { acquire(); diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 6a976d5..19383ed 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> namespace css = ::com::sun::star; @@ -50,7 +50,7 @@ namespace { /** Check periodically the slide show controller and the frame::XController whether the current slide has changed. If so, then inform the presenter controller about it. - + Objects of this class have their own lifetime control and destroy themselves when the presenter controller is diposed. */ |