diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:48:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:48:37 +0000 |
| commit | af18ff4fe9ebf1c198fae5fd60b5ac75b2cca5fe (patch) | |
| tree | f6c049f8d1d4006341733bb0f82c8d956e7aaa36 /slideshow/source/engine/animationnodes | |
| parent | 222104a4d8832b11a93f3261e13337737de94459 (diff) | |
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/04/16 09:40:04 thb 1.8.12.2: #i64783# Added generator script for effect test; fixed subtle issue with shapes missing a repaint when being set invisible and animated in the same update cycle; fixed container base node bug with indefinite state (both issues found with generated effects script)
2007/02/06 17:18:07 thb 1.8.12.1: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
Diffstat (limited to 'slideshow/source/engine/animationnodes')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basecontainernode.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index cbed8edbdce3..59176be3e644 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: basecontainernode.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:32:16 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:48:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,16 +37,16 @@ #include "precompiled_slideshow.hxx" // must be first -#include "canvas/debug.hxx" -#include "canvas/verbosetrace.hxx" +#include <canvas/debug.hxx> +#include <canvas/verbosetrace.hxx> + #include "basecontainernode.hxx" #include "tools.hxx" #include "nodetools.hxx" #include "delayevent.hxx" -#include "boost/mem_fn.hpp" -#include <vector> + +#include <boost/mem_fn.hpp> #include <algorithm> -#include <iterator> using namespace com::sun::star; @@ -60,7 +60,7 @@ BaseContainerNode::BaseContainerNode( : BaseNode( xNode, rParent, rContext ), maChildren(), mnFinishedChildren(0), - mbDurationIndefinite( isIndefiniteTiming( xNode->getEnd() ) || + mbDurationIndefinite( isIndefiniteTiming( xNode->getEnd() ) && isIndefiniteTiming( xNode->getDuration() ) ) { } |