diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-09 14:27:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-09 18:57:00 +0000 |
| commit | 91b914882948c6acbb2dd6442083b8c6ccd9cf17 (patch) | |
| tree | f0fd12aff18c9918b0fcd6adce52caf4ba9091a7 /sd | |
| parent | d6398719abecfca60db37637490e602222992dc2 (diff) | |
Change tools::Time::GetSystemTicks to sal_uInt64
...as follow-up clean-up after 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 "Change
'blink times' to be of type sal_uInt64 and thus consistent with
Timer::Get/SetTimeout since 9c7016b5b530ca212b1275f44f9e2fc0527109ee 'Scheduler:
Changed uLong to uInt32/uInt64.'"
Transitively meant to change quite a number of further time-related places from
sal_uLong/sal_uIntPtr to consistently use sal_uInt64.
Change-Id: I38eb493943906356138bf58eb098d2f54a3dee34
Reviewed-on: https://gerrit.libreoffice.org/15214
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/showwindow.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 2881e392c239..1eaf723dd3bd 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -624,8 +624,8 @@ void AnimationWindow::ResetAttrs() void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pProgress ) const { - clock_t aEnd = tools::Time::GetSystemTicks() + nMilliSeconds; - clock_t aCurrent = tools::Time::GetSystemTicks(); + sal_uInt64 aEnd = tools::Time::GetSystemTicks() + nMilliSeconds; + sal_uInt64 aCurrent = tools::Time::GetSystemTicks(); while (aCurrent < aEnd) { aCurrent = tools::Time::GetSystemTicks(); diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index db00687631e4..712a73c5d3f7 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -38,8 +38,8 @@ using namespace ::com::sun::star; namespace sd { -static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; -static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; +static const sal_uInt64 HIDE_MOUSE_TIMEOUT = 10000; +static const sal_uInt64 SHOW_MOUSE_TIMEOUT = 1000; ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vcl::Window* pParent ) : ::sd::Window( pParent ) @@ -187,7 +187,7 @@ void ShowWindow::MouseMove(const MouseEvent& /*rMEvt*/) { // if this is not the first mouse move while hidden, see if // enough time has pasted to show mouse pointer again - sal_uLong nTime = ::tools::Time::GetSystemTicks(); + sal_uInt64 nTime = ::tools::Time::GetSystemTicks(); if( (nTime - mnFirstMouseMove) >= SHOW_MOUSE_TIMEOUT ) { ShowPointer( true ); diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index b55876a0fc36..894938f86043 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -104,7 +104,7 @@ private: Rectangle maPresArea; bool mbMouseAutoHide; bool mbMouseCursorHidden; - sal_uLong mnFirstMouseMove; + sal_uInt64 mnFirstMouseMove; DECL_LINK( PauseTimeoutHdl, Timer* pTimer ); DECL_LINK(MouseTimeoutHdl, void *); |