[Libreoffice-commits] .: 2 commits - sdext/source

[Norbert Thiebaud]

 sdext/source/presenter/PresenterAnimator.cxx             |    4 ++--
 sdext/source/presenter/PresenterClock.cxx                |    6 +++---
 sdext/source/presenter/PresenterCurrentSlideObserver.hxx |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit aa70c887d221e56fe17c0d33eba844f8b823c5af
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 16 03:41:25 2010 -0500

    replace a residual use of vos::TTimeValue by salhelper::TTimeValue

diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx
index d1c0b2a..557fbf6 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -162,7 +162,7 @@ void PresenterAnimator::ScheduleNextRun (const sal_uInt64 nStartTime)
     if (mnNextTime==0 || nStartTime<mnNextTime)
     {
         mnNextTime = nStartTime;
-        ::vos::TTimeValue aTimeValue (GetSeconds(mnNextTime), GetNanoSeconds(mnNextTime));
+        ::salhelper::TTimeValue aTimeValue (GetSeconds(mnNextTime), GetNanoSeconds(mnNextTime));
         PresenterTimer::ScheduleSingleTaskAbsolute (
             ::boost::bind(&PresenterAnimator::Process, this),
             aTimeValue);
commit e2dbeb0160936d184dfda2ba3598fbe1388285d8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Oct 11 20:57:51 2010 -0500

    merge vosremoval-timer.diff

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.
 */