diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:23:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:23:10 +0000 |
| commit | 7784e3cc8b8fd0ee098beb4212deb0c4b78995e8 (patch) | |
| tree | cdc616ba3dafdfdf9e35d099f3c5aa5fb7b1ea83 /slideshow/source/engine/delayevent.cxx | |
| parent | ddb0c29c1b8ce94ac45542332ae57e9133e80d51 (diff) | |
INTEGRATION: CWS presfixes10 (1.3.2); FILE MERGED
2005/11/10 14:57:23 dbo 1.3.2.1: #i45197# cleanup
Issue number:
Submitted by:
Reviewed by:
Diffstat (limited to 'slideshow/source/engine/delayevent.cxx')
| -rw-r--r-- | slideshow/source/engine/delayevent.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx index 1caf3e3beae6..f034593553cf 100644 --- a/slideshow/source/engine/delayevent.cxx +++ b/slideshow/source/engine/delayevent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: delayevent.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-10-19 11:50:09 $ + * last change: $Author: rt $ $Date: 2006-07-26 07:23:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -62,8 +62,11 @@ double Delay::getActivationTime( double nCurrentTime ) const void Delay::dispose() { - mbWasFired = true; - maFunc.clear(); // release of payload + // don't clear unconditionally, because it may currently be executed: + if (isCharged()) { + mbWasFired = true; + maFunc.clear(); // release of payload + } } } // namespace internal |