diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:14:23 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 11:14:23 +0000 |
commit | ae352d6f175b5035b69c89fe9f1c0426d3e29d5b (patch) | |
tree | 3f902a3088a59e7cf3836ce318950633cdccaa22 /vcl/source/gdi/animate.cxx | |
parent | ad9a8a2b7f71f3d58d54e8e166f5955fad0a8ca4 (diff) |
INTEGRATION: CWS ooo64bit01 (1.3.80); FILE MERGED
2004/04/13 03:42:24 fa 1.3.80.3: #i8605# Make vcl 64-bit clean, all coordinate arrays (like pDXAry, etc) should be
sal_Int32* rather than long*
2004/03/31 16:49:13 fa 1.3.80.2: Back out of changes since 2004-03-24, focus on smaller, more integratable changes
2004/03/29 00:30:23 fa 1.3.80.1: More 64-bit changes. 'rsc' still broken, but not as much as before.
Diffstat (limited to 'vcl/source/gdi/animate.cxx')
-rw-r--r-- | vcl/source/gdi/animate.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index c44701955f45..a30854be773c 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -2,9 +2,9 @@ * * $RCSfile: animate.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2004-01-06 13:26:57 $ + * last change: $Author: rt $ $Date: 2004-06-17 12:14:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -489,7 +489,7 @@ void Animation::Draw( OutputDevice* pOut, const Point& rDestPt, const Size& rDes void Animation::ImplRestartTimer( ULONG nTimeout ) { - maTimer.SetTimeout( Max( nTimeout, MIN_TIMEOUT + ( mnAnimCount - 1 ) * INC_TIMEOUT ) * 10L ); + maTimer.SetTimeout( Max( nTimeout, (ULONG)(MIN_TIMEOUT + ( mnAnimCount - 1 ) * INC_TIMEOUT) ) * 10L ); maTimer.Start(); } |