diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:37:55 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2014-02-25 21:22:48 +0100 |
| commit | 6f2691bb6c9cacf1df547c0e38225461f018f696 (patch) | |
| tree | 763ad0bb6ecca6acb33e076a0c74d6f2f26afb27 /slideshow/source/engine/transitions | |
| parent | 13ae60336608d807fb8129a5b3f4f482ad57448a (diff) | |
Remove visual noise from slideshow
Change-Id: I87d07afbffa9d4633ed31bdb88f2dad660c25a18
Diffstat (limited to 'slideshow/source/engine/transitions')
| -rw-r--r-- | slideshow/source/engine/transitions/slidetransitionfactory.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/transitions/transitionfactorytab.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 057c96e3bf92..9281c4cd5ce1 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -862,7 +862,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( // normal, 'forward' slide wipe effect. Since the old // content is still on screen (and does not move), we omit // the 'leaving' slide. - // ======================================================= + return NumberAnimationSharedPtr( new MovingSlideChange( @@ -880,7 +880,7 @@ NumberAnimationSharedPtr createSlideWipeTransition( // 'reversed' slide wipe effect. Reverse for slide wipes // means, that the new slide is in the back, statically, // and the old one is moving off in the foreground. - // ======================================================= + return NumberAnimationSharedPtr( new MovingSlideChange( leavingSlide, diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx index 92bc67389056..1cec25dca37b 100644 --- a/slideshow/source/engine/transitions/transitionfactorytab.cxx +++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx @@ -2083,12 +2083,12 @@ static const TransitionInfo lcl_transitionInfo[] = true // scale isotrophically to target size }, - ///////////////////////////////////////////////////////// + // NOTE: This entry MUST be the last, to keep // createSlideTransition() from infinite recursion. Because // getRandomTransitionInfo() below will exclude the last entry of // the table from the random number generation. - ///////////////////////////////////////////////////////// + { // specially handled animations::TransitionType::RANDOM, @@ -2101,9 +2101,9 @@ static const TransitionInfo lcl_transitionInfo[] = true, // 'out' by parameter sweep inversion true // scale isotrophically to target size } - ///////////////////////////////////////////////////////// + // NOTE: DON'T add after this entry! See comment above! - ///////////////////////////////////////////////////////// + }; } // anon namespace |