diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-16 14:19:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-16 14:19:52 +0000 |
| commit | 63d71494c149ea95128e5484d3837db9efd323c7 (patch) | |
| tree | 3455aec451044b5a17de75819a6a9a8aec6cf5ba /sd/source/ui/slideshow/slideshowimpl.cxx | |
| parent | 7d327a11918539588c3610fdf0a84a11c4f40b1a (diff) | |
INTEGRATION: CWS impress81 (1.26.34); FILE MERGED
2005/12/15 11:18:46 cl 1.26.34.1: #127482# do not cause an overflow when fUpdate is to big
Diffstat (limited to 'sd/source/ui/slideshow/slideshowimpl.cxx')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index b57094f3a7ec..3e6e1a0a3d06 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: slideshowimpl.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-11-08 16:29:46 $ + * last change: $Author: obo $ $Date: 2006-01-16 15:19:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1920,6 +1920,9 @@ IMPL_LINK( SlideshowImpl, updateHdl, Timer*, EMPTYARG ) } if( mxShow.is() && ( fUpdate >= 0.0 ) ) { + const float MAX_UPDATE = 60.0; // do not wait longer than 60 seconds for next refresh + if( fUpdate > MAX_UPDATE ) + fUpdate = MAX_UPDATE; maUpdateTimer.SetTimeout( ::std::max( 1UL, static_cast<ULONG>(fUpdate * 1000.0) ) ); maUpdateTimer.Start(); |