From 005f2a98c0c3664227f2b13f8814c6950d388623 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 30 Mar 2005 07:07:33 +0000 Subject: INTEGRATION: CWS presfixes02 (1.2.8); FILE MERGED 2005/03/21 17:37:15 dbo 1.2.8.1: #i41476# schedule deactivation of parent node if no children are available Issue number: Submitted by: Reviewed by: --- slideshow/source/engine/animationnodes/paralleltimecontainer.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'slideshow/source') diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx index e2c718d01645..c8cc6172634e 100644 --- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx +++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: paralleltimecontainer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-01-21 17:06:51 $ + * last change: $Author: rt $ $Date: 2005-03-30 08:07:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ namespace presentation if( getState() == ACTIVE ) return true; // avoid duplicate event generation - if( !BaseNode::activate() ) + if( !BaseContainerNode::activate() ) return false; // resolve all children, only return true, if _all_ -- cgit