summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg/animobjs.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-09 14:27:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-09 18:57:00 +0000
commit91b914882948c6acbb2dd6442083b8c6ccd9cf17 (patch)
treef0fd12aff18c9918b0fcd6adce52caf4ba9091a7 /sd/source/ui/dlg/animobjs.cxx
parentd6398719abecfca60db37637490e602222992dc2 (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/source/ui/dlg/animobjs.cxx')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx4
1 files changed, 2 insertions, 2 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();