diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /slideshow | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 21c3213c3110..c08d45570d80 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -157,11 +157,11 @@ private: animations. */ canvas::tools::ElapsedTime maTimer; - /** Time between the display of frames. Enforced only when mbIsActive + /** tools::Time between the display of frames. Enforced only when mbIsActive is <TRUE/>. */ const double mnFrameDuration; - /** Time (of maTimer) when the next frame shall be displayed. + /** tools::Time (of maTimer) when the next frame shall be displayed. Synchronize() will wait until this time. */ double mnNextFrameTargetTime; @@ -2086,7 +2086,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) // commit frame to screen maScreenUpdater.commitUpdates(); } - // Time held until here + // tools::Time held until here const bool bActivitiesLeft = (! maActivitiesQueue.isEmpty()); const bool bTimerEventsLeft = (! maEventQueue.isEmpty()); |