diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:19 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:19 +0100 |
| commit | 8d1fb80cc730188e3018c827f8186bdff9aac099 (patch) | |
| tree | 3153d2485571b1ea9be5f8517957e8a35fbae419 /slideshow/source/engine/shapes/gdimtftools.cxx | |
| parent | 7a4a8d03a270ccdaa85b53b71ccd9d01cb54a4ae (diff) | |
| parent | 9e9aa18e20614a3e173323def7d7f7058d937fc4 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
slideshow/source/engine/debug.cxx
slideshow/source/engine/transitions/randomwipe.cxx
Diffstat (limited to 'slideshow/source/engine/shapes/gdimtftools.cxx')
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 1069d7dd5..8c358c6a3 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -491,9 +491,10 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, nWaitTime100thSeconds = 100 * 60 * 60 * 24; } - // There are animated GIFs with no WaitTime set. Take 1 sec, then. + // There are animated GIFs with no WaitTime set. Take 0.1 sec, the + // same duration that is used by the edit view. if( nWaitTime100thSeconds == 0 ) - nWaitTime100thSeconds = 100; + nWaitTime100thSeconds = 10; o_rFrames.push_back( MtfAnimationFrame( pMtf, nWaitTime100thSeconds / 100.0 ) ); |