INTEGRATION: CWS presfixes10 (1.3.8); FILE MERGED

2005/11/07 15:26:51 dbo 1.3.8.1: #i45197# revised code
Issue number:
Submitted by:
Reviewed by:

3 files changed, 88 insertions, 120 deletions

diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.hxx b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
index 2ebe0c5df6c2..407782342a75 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animationtransformnode.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:42:41 $
+ *  last change: $Author: rt $ $Date: 2006-07-26 07:33:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,42 +33,42 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX
-#define _SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX
+#ifndef INCLUDED_SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX
+#define INCLUDED_SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX
 
-#include <activityanimationbasenode.hxx>
-
-#ifndef _COM_SUN_STAR_ANIMATIONS_XANIMATETRANSFORM_HPP_
-#include <com/sun/star/animations/XAnimateTransform.hpp>
-#endif
+#include "animationbasenode.hxx"
+#include "com/sun/star/animations/XAnimateTransform.hpp"
 
+namespace presentation {
+namespace internal {
 
-namespace presentation
+class AnimationTransformNode : public AnimationBaseNode
 {
-    namespace internal
-    {
-        class AnimationTransformNode : public ActivityAnimationBaseNode
-        {
-        public:
-            AnimationTransformNode( const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::animations::XAnimationNode >& xNode,
-                                    const BaseContainerNodeSharedPtr&                   rParent,
-                                    const NodeContext&                                  rContext );
-
-            virtual void dispose();
-            virtual bool init();
+public:
+    AnimationTransformNode(
+        ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        ::boost::shared_ptr<BaseContainerNode> const& pParent,
+        NodeContext const& rContext )
+        : AnimationBaseNode( xNode, pParent, rContext ),
+          mxTransformNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW ) {}
 
 #if defined(VERBOSE) && defined(DBG_UTIL)
-            virtual const char* getDescription() const;
+    virtual const char* getDescription() const
+        { return "AnimationTransformNode"; }
 #endif
 
-        private:
-            AnimationActivitySharedPtr createTransformActivity();
+protected:
+    virtual void dispose();
+
+private:
+    virtual AnimationActivitySharedPtr createActivity() const;
+
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XAnimateTransform >   mxTransformNode;
+};
 
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::animations::XAnimateTransform >   mxTransformNode;
-        };
-    }
-}
+} // namespace internal
+} // namespace presentation
 
-#endif /* _SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX */
+#endif /* INCLUDED_SLIDESHOW_ANIMATIONTRANSFORMNODE_HXX */
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
index a45a01580411..ce3a1f156166 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animationtransitionfilternode.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:42:57 $
+ *  last change: $Author: rt $ $Date: 2006-07-26 07:33:21 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -34,64 +34,29 @@
  ************************************************************************/
 
 // must be first
-#include <canvas/debug.hxx>
-#include <canvas/verbosetrace.hxx>
+#include "canvas/debug.hxx"
+#include "canvas/verbosetrace.hxx"
+#include "animationtransitionfilternode.hxx"
+#include "transitionfactory.hxx"
 
-#include <animationtransitionfilternode.hxx>
-#include <transitionfactory.hxx>
+namespace presentation {
+namespace internal {
 
-
-using namespace ::com::sun::star;
-
-namespace presentation
+void AnimationTransitionFilterNode::dispose()
 {
-    namespace internal
-    {
-        AnimationTransitionFilterNode::AnimationTransitionFilterNode( const uno::Reference< animations::XAnimationNode >&   xNode,
-                                                                      const BaseContainerNodeSharedPtr&                     rParent,
-                                                                      const NodeContext&                                    rContext ) :
-            ActivityAnimationBaseNode( xNode, rParent, rContext ),
-            mxTransitionFilterNode( xNode, uno::UNO_QUERY_THROW )
-        {
-        }
-
-        void AnimationTransitionFilterNode::dispose()
-        {
-            mxTransitionFilterNode.clear();
-
-            ActivityAnimationBaseNode::dispose();
-        }
-
-        bool AnimationTransitionFilterNode::init()
-        {
-            if( !ActivityAnimationBaseNode::init() )
-                return false;
-
-            try
-            {
-                // TODO(F2): For restart functionality, we must regenerate activities,
-                // since they are not able to reset their state (or implement _that_)
-                getActivity() =
-                    TransitionFactory::createShapeTransition( fillCommonParameters(),
-                                                              getShape(),
-                                                              getContext().mpLayerManager,
-                                                              mxTransitionFilterNode );
-            }
-            catch( uno::Exception& )
-            {
-                // catch and ignore. We later handle empty activities, but for
-                // other nodes to function properly, the core functionality of
-                // this node must remain up and running.
-            }
-
-            return true;
-        }
+    mxTransitionFilterNode.clear();
+    AnimationBaseNode::dispose();
+}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
-        const char* AnimationTransitionFilterNode::getDescription() const
-        {
-            return "AnimationTransitionFilterNode";
-        }
-#endif
-    }
+AnimationActivitySharedPtr
+AnimationTransitionFilterNode::createActivity() const
+{
+    return TransitionFactory::createShapeTransition(
+        fillCommonParameters(),
+        getShape(),
+        getContext().mpLayerManager,
+        mxTransitionFilterNode );
 }
+
+} // namespace internal
+} // namespace presentation
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
index 0da068b85faa..a9e60b0f8f0e 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animationtransitionfilternode.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:43:11 $
+ *  last change: $Author: rt $ $Date: 2006-07-26 07:33:32 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,40 +33,43 @@
  *
  ************************************************************************/
 
-#ifndef _SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX
-#define _SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX
+#ifndef INCLUDED_SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX
+#define INCLUDED_SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX
 
-#include <activityanimationbasenode.hxx>
-
-#ifndef _COM_SUN_STAR_ANIMATIONS_XTRANSITIONFILTER_HPP_
-#include <com/sun/star/animations/XTransitionFilter.hpp>
-#endif
+#include "animationbasenode.hxx"
+#include "com/sun/star/animations/XTransitionFilter.hpp"
 
+namespace presentation {
+namespace internal {
 
-namespace presentation
+class AnimationTransitionFilterNode : public AnimationBaseNode
 {
-    namespace internal
-    {
-        class AnimationTransitionFilterNode : public ActivityAnimationBaseNode
-        {
-        public:
-            AnimationTransitionFilterNode( const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::animations::XAnimationNode >&  xNode,
-                                           const BaseContainerNodeSharedPtr&                rParent,
-                                           const NodeContext&                               rContext );
-
-            virtual void dispose();
-            virtual bool init();
+public:
+    AnimationTransitionFilterNode(
+        ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XAnimationNode> const& xNode,
+        ::boost::shared_ptr<BaseContainerNode> const& pParent,
+        NodeContext const& rContext )
+        : AnimationBaseNode( xNode, pParent, rContext ),
+          mxTransitionFilterNode( xNode, ::com::sun::star::uno::UNO_QUERY_THROW)
+        {}
 
-#if defined(VERBOSE) && defined(DBG_UTIL)
-            virtual const char* getDescription() const;
+#if defined(VERBOSE)
+    virtual const char* getDescription() const
+        { return "AnimationTransitionFilterNode"; }
 #endif
 
-        private:
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::animations::XTransitionFilter >   mxTransitionFilterNode;
-        };
-    }
-}
+protected:
+    virtual void dispose();
+
+private:
+    virtual AnimationActivitySharedPtr createActivity() const;
+
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XTransitionFilter> mxTransitionFilterNode;
+};
+
+} // namespace internal
+} // namespace presentation
 
-#endif /* _SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX */
+#endif /* INCLUDED_SLIDESHOW_ANIMATIONTRANSITIONFILTERNODE_HXX */