diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
commit | 257a5147b5728c5cdceb640bef473774f677ab0b (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /slideshow/source/engine/animationnodes/basenode.hxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 778c39e45277c821d83039734d1f0d6636870542 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:44 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit a2636e7e8926833cefa3b527dc3a4e3d6d8ffcc7
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:26 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit b2cdf7bfe14ea650e52a4c90aaf5628b193d8509
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:57 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit ed8d7fa8a6f50723b5c2b19e3a9b9df6d014aa68
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:07 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: impress_libreoffice-3.3.1.1
split repo tag: impress_libreoffice-3.3.1.2
Diffstat (limited to 'slideshow/source/engine/animationnodes/basenode.hxx')
-rw-r--r-- | slideshow/source/engine/animationnodes/basenode.hxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 6f4a6d9c47b3..f927c1be8f89 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace slideshow { namespace internal { /** Context for every node. - + Besides the global AnimationNodeFactory::Context data, this struct also contains the current DocTree subset for this node. If start and end index of the @@ -61,13 +61,13 @@ struct NodeContext mnStartDelay(0.0), mbIsIndependentSubset( true ) {} - - void dispose() - { - maContext.dispose(); - mpMasterShapeSubset.reset(); + + void dispose() + { + maContext.dispose(); + mpMasterShapeSubset.reset(); } - + /// Context as passed to createAnimationNode() SlideShowContext maContext; @@ -76,10 +76,10 @@ struct NodeContext /// Shape to be used (provided by parent, e.g. for iterations) ShapeSubsetSharedPtr mpMasterShapeSubset; - + /// Additional delay to node begin (to offset iterate effects) double mnStartDelay; - + /// When true, subset must be created during slide initialization bool mbIsIndependentSubset; }; @@ -94,40 +94,40 @@ class BaseNode : public AnimationNode, private ::boost::noncopyable { public: - BaseNode( ::com::sun::star::uno::Reference< - ::com::sun::star::animations::XAnimationNode> const& xNode, + BaseNode( ::com::sun::star::uno::Reference< + ::com::sun::star::animations::XAnimationNode> const& xNode, ::boost::shared_ptr<BaseContainerNode> const& pParent, NodeContext const& rContext ); - + /** Provide the node with a shared_ptr to itself. - + Since implementation has to create objects which need a shared_ptr to this node, and a pointee cannot retrieve a shared_ptr to itself internally, have to set that from the outside. */ void setSelf( const ::boost::shared_ptr< BaseNode >& rSelf ); - - + + #if defined(VERBOSE) && defined(DBG_UTIL) virtual void showState() const; virtual const char* getDescription() const; void showTreeFromWithin() const; #endif - + const ::boost::shared_ptr< BaseContainerNode >& getParentNode() const { return mpParent; } - + // Disposable: virtual void dispose(); - + // AnimationNode: virtual bool init(); virtual bool resolve(); virtual bool activate(); virtual void deactivate(); virtual void end(); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode> getXAnimationNode() const; virtual NodeState getState() const; virtual bool registerDeactivatingListener( @@ -135,12 +135,12 @@ public: // nop: virtual void notifyDeactivating( const AnimationNodeSharedPtr& rNotifier ); - bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; } + bool isMainSequenceRootNode() const { return mbIsMainSequenceRootNode; } protected: void scheduleDeactivationEvent( EventSharedPtr const& pEvent = EventSharedPtr() ); - + SlideShowContext const& getContext() const { return maContext; } ::boost::shared_ptr<BaseNode> const& getSelf() const { return mpSelf; } @@ -150,7 +150,7 @@ protected: OSL_ENSURE( bRet, "### INVALID node!" ); return bRet; } - + private: // all state affecting methods have "_st" counterparts being called at // derived classes when in state transistion: no-ops here at BaseNode... @@ -158,35 +158,35 @@ private: virtual bool resolve_st(); virtual void activate_st(); virtual void deactivate_st( NodeState eDestState ); - + private: /// notifies /// - all registered deactivation listeners /// - single animation end (every node) /// - slide animations (if main sequence root node) void notifyEndListeners() const; - + /// Get the node's restart mode sal_Int16 getRestartMode(); - + /** Get the default restart mode - + If this node's default mode is AnimationRestart::DEFAULT, this method recursively calls the parent node. */ sal_Int16 getRestartDefaultMode() const; - + /// Get the node's fill mode sal_Int16 getFillMode(); - + /** Get the default fill mode. - + If this node's default mode is AnimationFill::DEFAULT, this method recursively calls the parent node. */ sal_Int16 getFillDefaultMode() const; - + bool isTransition( NodeState eFromState, NodeState eToState, bool debugAssert = true ) const { (void) debugAssert; // avoid warning @@ -199,17 +199,17 @@ private: return ((meCurrState & mask) != 0 || (meCurrentStateTransition & mask) != 0); } - + class StateTransition; friend class StateTransition; - + private: SlideShowContext maContext; - + typedef ::std::vector< AnimationNodeSharedPtr > ListenerVector; - + ListenerVector maDeactivatingListeners; - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode; ::boost::shared_ptr< BaseContainerNode > mpParent; ::boost::shared_ptr< BaseNode > mpSelf; |