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 | cd3998c22f9d8cb5432bea0974134df21ba75f37 (patch) | |
| tree | af70d7a029d690bcf060df33742b94ab8993bd07 /sdext | |
| parent | bdc71b3e4112b5c83a6aec61403981fcdd156138 (diff) | |
merge vosremoval-timer.diff
Diffstat (limited to 'sdext')
| -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 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx index d8476b3b0a5b..6257e485adec 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 882951175e60..d220941843b4 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 f224ba71f07c..c28ef6f91710 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; |