diff options
Diffstat (limited to 'slideshow/source/inc')
77 files changed, 897 insertions, 897 deletions
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index 6de80ed5ec90..c123928e3539 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -1,7 +1,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 @@ -81,17 +81,17 @@ public: mpShape( rShape ), maSlideBounds( rSlideBounds ), mbAutoReverse( bAutoReverse ) {} - + /// End event to fire when animation is over EventSharedPtr mpEndEvent; - + /// Event queue to insert the end event into. EventQueue& mrEventQueue; /// Event queue to insert the end event into. ActivitiesQueue& mrActivitiesQueue; - + /** Simple duration of the activity - + Specifies the minimal simple duration of the activity (minimal, because mnMinNumberOfFrames might prolongue the activity). According to SMIL, @@ -101,9 +101,9 @@ public: animation over time). */ double mnMinDuration; - + /** Minimal number of frames for this activity. - + This specifies the minimal number of frames this activity will display per simple duration. If less than this number are displayed until mnMinDuration @@ -111,9 +111,9 @@ public: mnMinNumberOfFrames are rendered. */ sal_uInt32 mnMinNumberOfFrames; - + /** Number of repeats for the simple duration - + This specified the number of repeats. The mnMinDuration times maRepeats yields the total duration of this activity. If this value is @@ -121,197 +121,197 @@ public: indefinitely. */ ::boost::optional<double> const maRepeats; - + /// Fraction of simple time to accelerate animation double mnAcceleration; - + /// Fraction of simple time to decelerate animation double mnDeceleration; - + /// Shape, to get bounds from ShapeSharedPtr mpShape; - + /// LayerManager, to get page size from ::basegfx::B2DVector maSlideBounds; - + /// When true, activity is played reversed after mnDuration. bool mbAutoReverse; }; - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a double value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const NumberAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const NumberAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a double value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const EnumAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const EnumAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a color value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const ColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const ColorAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a color value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const HSLColorAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const HSLColorAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimateColor >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a pair of double values. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const PairAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const PairAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a string. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const StringAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const StringAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create an activity from an XAnimate node. - + This method creates an animated activity from the given XAnimate node, extracting all necessary animation parameters from that. Note that due to the animator parameter, the animation values must be convertible to a bool value. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param xNode The SMIL animation node to animate */ static AnimationActivitySharedPtr createAnimateActivity( const CommonParameters& rParms, - const BoolAnimationSharedPtr& rAnimator, - const ::com::sun::star::uno::Reference< + const BoolAnimationSharedPtr& rAnimator, + const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xNode ); - + /** Create a simple activity for the given animator - + This method is suited to create activities for custom animations, which need a simple double value and lasts a given timespan. This activity always generates values from the [0,1] range. - + @param rParms Factory parameter structure - + @param rAnimator Animator sub-object - + @param bDirectionForward If true, the activity goes 'forward', i.e. from 0 to 1. With false, the direction is reversed. @@ -320,7 +320,7 @@ public: const CommonParameters& rParms, const NumberAnimationSharedPtr& rAnimator, bool bDirectionForward ); - + private: // default: constructor/destructor disabed ActivitiesFactory(); diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx index 927d12545640..918216634081 100644 --- a/slideshow/source/inc/activitiesqueue.hxx +++ b/slideshow/source/inc/activitiesqueue.hxx @@ -1,7 +1,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 @@ -60,7 +60,7 @@ namespace slideshow adjusting and holding global presentation time. */ ActivitiesQueue( - const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); + const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ); ~ActivitiesQueue(); /** Add the given activity to the queue. @@ -97,22 +97,22 @@ namespace slideshow /** returns number of all activities, waiting, reinserted and dequeued */ std::size_t size() const - { + { return maCurrentActivitiesWaiting.size() + maCurrentActivitiesReinsert.size() + maDequeuedActivities.size(); } - + private: ::boost::shared_ptr< ::canvas::tools::ElapsedTime > mpTimer; - + typedef ::std::deque< ActivitySharedPtr > ActivityQueue; - ActivityQueue maCurrentActivitiesWaiting; // currently running - // activities, that still + ActivityQueue maCurrentActivitiesWaiting; // currently running + // activities, that still // await processing for this // round - ActivityQueue maCurrentActivitiesReinsert; // currently running - // activities, that are + ActivityQueue maCurrentActivitiesReinsert; // currently running + // activities, that are // already processed for // this round, and wants // to be reinserted next diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx index 13e68af9529a..d2b4fcdc27b3 100644 --- a/slideshow/source/inc/activity.hxx +++ b/slideshow/source/inc/activity.hxx @@ -1,7 +1,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 @@ -58,12 +58,12 @@ namespace slideshow If this method returns a time lag greater than 0.0, the ActivitiesQueue will adjust the global slideshow time, by subtracting the given amount of lag. - + @return time lag or 0.0. Value must be greater or equal than zero. */ virtual double calcTimeLag() const = 0; - + /** Query whether this activity is still continuing @return true, if this activity still @@ -85,7 +85,7 @@ namespace slideshow shape. */ virtual void dequeued() = 0; - + /** Forces this activity deactivate and get to its end state (if possible), but does _not_ dispose. */ diff --git a/slideshow/source/inc/animatableshape.hxx b/slideshow/source/inc/animatableshape.hxx index ce033d6dcb1d..0e0d2c8515c3 100644 --- a/slideshow/source/inc/animatableshape.hxx +++ b/slideshow/source/inc/animatableshape.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index d2c697d5ed2c..3ac5bc4cf0fc 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -1,7 +1,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 @@ -73,8 +73,8 @@ namespace slideshow Priority of the sprite. Must remain static over the lifetime of this object */ - AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, - const ::basegfx::B2DSize& rSpriteSizePixel, + AnimatedSprite( const ViewLayerSharedPtr& rViewLayer, + const ::basegfx::B2DSize& rSpriteSizePixel, double nSpritePrio ); /** Resize the sprite. @@ -93,10 +93,10 @@ namespace slideshow canvas by the specified amount of device pixel (for subsequent render operations). */ - void setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ); + void setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ); /// Retrieve current pixel offset for content output. - ::basegfx::B2DSize getPixelOffset() const; + ::basegfx::B2DSize getPixelOffset() const; /// Show the sprite void show(); @@ -159,23 +159,23 @@ namespace slideshow @param rPrio The new sprite prio. Must be in the range [0,1] - */ + */ void setPriority( double rPrio ); private: - ViewLayerSharedPtr mpViewLayer; + ViewLayerSharedPtr mpViewLayer; - ::cppcanvas::CustomSpriteSharedPtr mpSprite; - ::basegfx::B2DSize maEffectiveSpriteSizePixel; - ::basegfx::B2DSize maContentPixelOffset; + ::cppcanvas::CustomSpriteSharedPtr mpSprite; + ::basegfx::B2DSize maEffectiveSpriteSizePixel; + ::basegfx::B2DSize maContentPixelOffset; double mnSpritePrio; - double mnAlpha; + double mnAlpha; ::boost::optional< ::basegfx::B2DPoint > maPosPixel; ::boost::optional< ::basegfx::B2DPolyPolygon > maClip; ::boost::optional< ::basegfx::B2DHomMatrix > maTransform; - bool mbSpriteVisible; + bool mbSpriteVisible; }; typedef ::boost::shared_ptr< AnimatedSprite > AnimatedSpriteSharedPtr; diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx index 54de93bb3fd8..91d137bf048e 100644 --- a/slideshow/source/inc/animation.hxx +++ b/slideshow/source/inc/animation.hxx @@ -1,7 +1,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 @@ -81,7 +81,7 @@ namespace slideshow @param rAttrLayer Attribute layer to play the animation on. */ - virtual void start( const AnimatableShapeSharedPtr& rShape, + virtual void start( const AnimatableShapeSharedPtr& rShape, const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; /** Notify that the animation is about to end. diff --git a/slideshow/source/inc/animationactivity.hxx b/slideshow/source/inc/animationactivity.hxx index 656b14ab02fc..d712947106a8 100644 --- a/slideshow/source/inc/animationactivity.hxx +++ b/slideshow/source/inc/animationactivity.hxx @@ -1,7 +1,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 @@ -63,8 +63,8 @@ namespace slideshow @param rAttrLayer Attribute layer to change the animated values on. */ - virtual void setTargets( const AnimatableShapeSharedPtr& rShape, - const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; + virtual void setTargets( const AnimatableShapeSharedPtr& rShape, + const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0; }; typedef ::boost::shared_ptr< AnimationActivity > AnimationActivitySharedPtr; diff --git a/slideshow/source/inc/animationeventhandler.hxx b/slideshow/source/inc/animationeventhandler.hxx index 73d4cbc8b2f9..44a7e137eb8b 100644 --- a/slideshow/source/inc/animationeventhandler.hxx +++ b/slideshow/source/inc/animationeventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx index 53ee69d726dc..a8ca2cfe7d56 100644 --- a/slideshow/source/inc/animationfactory.hxx +++ b/slideshow/source/inc/animationfactory.hxx @@ -1,7 +1,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 @@ -61,7 +61,7 @@ namespace slideshow Given a SMIL XAnimate node, this factory generates the appropriate Animation object from that, which will modify the attribute as specified. - */ + */ class AnimationFactory : private boost::noncopyable { public: @@ -97,23 +97,23 @@ namespace slideshow FLAG_NO_SPRITE = 1 }; - static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static NumberAnimationSharedPtr createNumberPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static EnumAnimationSharedPtr createEnumPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static ColorAnimationSharedPtr createColorPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); /** Create scale or move animation @@ -122,30 +122,30 @@ namespace slideshow animations::AnimationTransformType::TRANSLATE or animations::AnimationTransformType::SCALE. */ - static PairAnimationSharedPtr createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static PairAnimationSharedPtr createPairPropertyAnimation( const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - sal_Int16 nTransformType, - int nFlags=0 ); + sal_Int16 nTransformType, + int nFlags=0 ); - static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static StringAnimationSharedPtr createStringPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static BoolAnimationSharedPtr createBoolPropertyAnimation( const ::rtl::OUString& rAttrName, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0 ); + int nFlags=0 ); - static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, - sal_Int16 nAdditive, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + static NumberAnimationSharedPtr createPathMotionAnimation( const ::rtl::OUString& rSVGDPath, + sal_Int16 nAdditive, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - int nFlags=0); + int nFlags=0); private: // default: constructor/destructor disabed AnimationFactory(); diff --git a/slideshow/source/inc/animationfunction.hxx b/slideshow/source/inc/animationfunction.hxx index c1cf5b825792..683410f8e989 100644 --- a/slideshow/source/inc/animationfunction.hxx +++ b/slideshow/source/inc/animationfunction.hxx @@ -1,7 +1,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 @@ -51,7 +51,7 @@ namespace slideshow /** Operator to calculate function value. This method calculates the function value for the - given time instant t. + given time instant t. @param t Current time instant, must be in the range [0,1] diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index 52de5f2f69cc..582ad2c0fb35 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -1,7 +1,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 @@ -35,7 +35,7 @@ namespace slideshow { namespace internal { -/** This interface is used to mirror every XAnimateNode object +/** This interface is used to mirror every XAnimateNode object in the presentation core. */ class AnimationNode : public Disposable @@ -58,27 +58,27 @@ public: /// and any effect is removed from the document ENDED =16 }; - + /** Query the corresponding XAnimationNode. */ - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0; - + /** Init this node - + If this node is not in state INVALID, init() sets up the node state and schedules necessary events. If this node has children, they have their init() called, too. You will call this method whenever a slide is going to be shown. - + @return true, if init was successful; state has changed to UNRESOLVED */ virtual bool init() = 0; - + /** Resolve node start time - + Nodes can have unresolved start times, i.e. indefinite start time for container nodes, or child nodes whose parent has not yet started. Calling this method fixes @@ -86,32 +86,32 @@ public: node immediately starts its animations, that is only the case for begin=0.0. The node will change its state to RESOLVED. - + @return true, if a start event was successfully scheduled. */ virtual bool resolve() = 0; - + /** Immediately start this node - + This method starts the animation on this node, without begin timeout. The node will change its state to ACTIVE. - + @return true, if start was successful. This method might return false, if e.g. a restart is not permitted on this node. */ virtual bool activate() = 0; - + /** Immediately stop this node - + This method stops the animation on this node. The node will change its state to either ENDED or FROZEN, depending on XAnimationNode attributes. */ virtual void deactivate() = 0; - + /** End the animation on this node - + This method force-ends animation on this node. Parents may call this for their children, if their active duration ends. An ended animation will no longer have @@ -119,34 +119,34 @@ public: change its state to ENDED. */ virtual void end() = 0; - + /** Query node state - + @return the current state of this animation node. */ virtual NodeState getState() const = 0; - + /** Register a deactivating listener - + This method registers another AnimationNode as an deactivating listener, which gets notified via a notifyDeactivating() call. The node calls all registered listener, when it leaves the ACTIVE state. - + @param rNotifee AnimationNode to notify */ virtual bool registerDeactivatingListener( const ::boost::shared_ptr< AnimationNode >& rNotifee ) = 0; - + /** Called to notify another AnimationNode's deactivation - + @param rNotifier The instance who calls this method. */ virtual void notifyDeactivating( const ::boost::shared_ptr< AnimationNode >& rNotifier ) = 0; - + /** Query node whether it has an animation pending. - + @return true, if this node (or at least one of its children) has an animation pending. Used to determine if the main sequence is actually empty, or contains effects diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx index 7f692486f7eb..83468f6fbe52 100644 --- a/slideshow/source/inc/animationnodefactory.hxx +++ b/slideshow/source/inc/animationnodefactory.hxx @@ -1,7 +1,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 @@ -54,19 +54,19 @@ namespace slideshow public: /** Create an AnimatioNode for the given XAnimationNode */ - static AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference< + static AnimationNodeSharedPtr createAnimationNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const ::basegfx::B2DVector& rSlideSize, - const SlideShowContext& rContext ); - + const SlideShowContext& rContext ); + #if defined(VERBOSE) && defined(DBG_UTIL) static void showTree( AnimationNodeSharedPtr& pRootNode ); # define SHOW_NODE_TREE(a) AnimationNodeFactory::showTree(a) #else # define SHOW_NODE_TREE(a) #endif - + private: // default: constructor/destructor disabled AnimationNodeFactory(); diff --git a/slideshow/source/inc/attributableshape.hxx b/slideshow/source/inc/attributableshape.hxx index 5d255e75e569..76281592736f 100644 --- a/slideshow/source/inc/attributableshape.hxx +++ b/slideshow/source/inc/attributableshape.hxx @@ -1,7 +1,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 @@ -117,7 +117,7 @@ namespace slideshow @return the topmost layer */ virtual ShapeAttributeLayerSharedPtr getTopmostAttributeLayer() const = 0; - + /** Change default shape visibility @@ -129,8 +129,8 @@ namespace slideshow When true, shape will be visible, when false, invisible (modulo attribute layer overrides). */ - virtual void setVisibility( bool bVisible ) = 0; - + virtual void setVisibility( bool bVisible ) = 0; + // Sub-item handling //------------------------------------------------------------------ @@ -141,7 +141,7 @@ namespace slideshow to request specific tree nodes for this shape. */ virtual const DocTreeNodeSupplier& getTreeNodeSupplier() const = 0; - virtual DocTreeNodeSupplier& getTreeNodeSupplier() = 0; + virtual DocTreeNodeSupplier& getTreeNodeSupplier() = 0; /** Query the subset this shape displays. @@ -191,7 +191,7 @@ namespace slideshow @attention To maintain view integrity, this method should only be called from the LayerManager - + @param o_rSubset The requested Shape @@ -202,8 +202,8 @@ namespace slideshow @return true, if the shape was newly created, and false, if an already existing subset is returned. */ - virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, - const DocTreeNode& rTreeNode ) = 0; + virtual bool createSubset( AttributableShapeSharedPtr& o_rSubset, + const DocTreeNode& rTreeNode ) = 0; /** Revoke a previously generated shape subset. diff --git a/slideshow/source/inc/attributemap.hxx b/slideshow/source/inc/attributemap.hxx index 4149cb956b68..b3a956c3fce3 100644 --- a/slideshow/source/inc/attributemap.hxx +++ b/slideshow/source/inc/attributemap.hxx @@ -1,7 +1,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 @@ -38,7 +38,7 @@ namespace slideshow { /** Type of to-be-animated attribute. - This enum describes the type of an animated + This enum describes the type of an animated attribute. */ enum AttributeType diff --git a/slideshow/source/inc/boolanimation.hxx b/slideshow/source/inc/boolanimation.hxx index 0e4ea31072d4..01273e822c78 100644 --- a/slideshow/source/inc/boolanimation.hxx +++ b/slideshow/source/inc/boolanimation.hxx @@ -1,7 +1,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 @@ -48,7 +48,7 @@ namespace slideshow { public: typedef bool ValueType; - + /** Set the animation to the given value @param bValue diff --git a/slideshow/source/inc/coloranimation.hxx b/slideshow/source/inc/coloranimation.hxx index a0c54c9c6625..adbfdef16b0f 100644 --- a/slideshow/source/inc/coloranimation.hxx +++ b/slideshow/source/inc/coloranimation.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx index a8d25ce2f40f..5fa86e05e104 100644 --- a/slideshow/source/inc/cursormanager.hxx +++ b/slideshow/source/inc/cursormanager.hxx @@ -1,7 +1,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 @@ -48,7 +48,7 @@ namespace slideshow { public: virtual ~CursorManager() {} - + /** Request different cursor shape. @param nCursorShape diff --git a/slideshow/source/inc/debug.hxx b/slideshow/source/inc/debug.hxx index 0819eb7bcaeb..d9b3a91d0086 100644 --- a/slideshow/source/inc/debug.hxx +++ b/slideshow/source/inc/debug.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx index 08299df52a33..ed934bfcd102 100644 --- a/slideshow/source/inc/delayevent.hxx +++ b/slideshow/source/inc/delayevent.hxx @@ -1,7 +1,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 @@ -42,7 +42,7 @@ class Delay : public Event, private ::boost::noncopyable { public: typedef ::boost::function0<void> FunctorT; - + template <typename FuncT> Delay( FuncT const& func, double nTimeout @@ -53,7 +53,7 @@ public: ) : #endif mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} - + Delay( const boost::function0<void>& func, double nTimeout #if OSL_DEBUG_LEVEL > 1 @@ -65,16 +65,16 @@ public: mnTimeout(nTimeout), maFunc(func), mbWasFired(false) {} - + // Event: virtual bool fire(); virtual bool isCharged() const; virtual double getActivationTime( double nCurrentTime ) const; // Disposable: virtual void dispose(); - + private: - double const mnTimeout; + double const mnTimeout; FunctorT maFunc; bool mbWasFired; }; @@ -82,13 +82,13 @@ private: #if OSL_DEBUG_LEVEL <= 1 /** Generate delay event - + @param func Functor to call when the event fires. - + @param nTimeout Timeout in seconds, to wait until functor is called. - + @return generated delay event */ template <typename FuncT> @@ -98,10 +98,10 @@ inline EventSharedPtr makeDelay_( FuncT const& func, double nTimeout ) } /** Generate immediate event - + @param func Functor to call when the event fires. - + @return generated immediate event. */ template <typename FuncT> @@ -126,7 +126,7 @@ public: : Delay(func, nTimeout, rsDescription), FROM_FUNCTION(from_function), FROM_FILE(from_file), FROM_LINE(from_line) {} - + char const* const FROM_FUNCTION; char const* const FROM_FILE; int const FROM_LINE; diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx index 56fdf8420c2e..e9aed9bf8629 100644 --- a/slideshow/source/inc/disposable.hxx +++ b/slideshow/source/inc/disposable.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx index 88ed798b9583..b1cc9f7ccc23 100644 --- a/slideshow/source/inc/doctreenode.hxx +++ b/slideshow/source/inc/doctreenode.hxx @@ -1,7 +1,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 @@ -48,7 +48,7 @@ namespace slideshow represented in a tree structure, with DocTreeNodes as the nodes. Instances of this class can be queried from the DocTreeNodeSupplier interface. - + This class has nothing to do with the Draw document tree. */ class DocTreeNode @@ -82,7 +82,7 @@ namespace slideshow /** Create empty tree node */ - DocTreeNode() : + DocTreeNode() : mnStartIndex(-1), mnEndIndex(-1), meType(NODETYPE_INVALID) @@ -91,7 +91,7 @@ namespace slideshow /** Create tree node from start and end index. - Create a tree node for the given range and type. + Create a tree node for the given range and type. @param nStartIndex Start index @@ -102,23 +102,23 @@ namespace slideshow @param eType Node type */ - DocTreeNode( sal_Int32 nStartIndex, - sal_Int32 nEndIndex, - NodeType eType ) : + DocTreeNode( sal_Int32 nStartIndex, + sal_Int32 nEndIndex, + NodeType eType ) : mnStartIndex(nStartIndex), mnEndIndex(nEndIndex), meType(eType) { } - bool isEmpty() const { return mnStartIndex == mnEndIndex; } + bool isEmpty() const { return mnStartIndex == mnEndIndex; } - sal_Int32 getStartIndex() const { return mnStartIndex; } - sal_Int32 getEndIndex() const { return mnEndIndex; } - void setStartIndex( sal_Int32 nIndex ) { mnStartIndex = nIndex; } - void setEndIndex( sal_Int32 nIndex ) { mnEndIndex = nIndex; } + sal_Int32 getStartIndex() const { return mnStartIndex; } + sal_Int32 getEndIndex() const { return mnEndIndex; } + void setStartIndex( sal_Int32 nIndex ) { mnStartIndex = nIndex; } + void setEndIndex( sal_Int32 nIndex ) { mnEndIndex = nIndex; } - NodeType getType() const { return meType; } + NodeType getType() const { return meType; } void reset() { @@ -128,9 +128,9 @@ namespace slideshow } private: - sal_Int32 mnStartIndex; - sal_Int32 mnEndIndex; - NodeType meType; + sal_Int32 mnStartIndex; + sal_Int32 mnEndIndex; + NodeType meType; }; diff --git a/slideshow/source/inc/doctreenodesupplier.hxx b/slideshow/source/inc/doctreenodesupplier.hxx index 455dc8361413..9ef6df8e2b15 100644 --- a/slideshow/source/inc/doctreenodesupplier.hxx +++ b/slideshow/source/inc/doctreenodesupplier.hxx @@ -1,7 +1,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 @@ -91,9 +91,9 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. - */ - virtual DocTreeNode getTreeNode( sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; + */ + virtual DocTreeNode getTreeNode( sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; /** Query number of tree nodes of the given type this subset contains. @@ -113,7 +113,7 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. */ - virtual sal_Int32 getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, + virtual sal_Int32 getNumberOfSubsetTreeNodes( const DocTreeNode& rParentNode, DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; /** Create DocTreeNode from shape subset. @@ -139,10 +139,10 @@ namespace slideshow @throws ShapeLoadFailedException, if tree node structure cannot be determined. - */ - virtual DocTreeNode getSubsetTreeNode( const DocTreeNode& rParentNode, - sal_Int32 nNodeIndex, - DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; + */ + virtual DocTreeNode getSubsetTreeNode( const DocTreeNode& rParentNode, + sal_Int32 nNodeIndex, + DocTreeNode::NodeType eNodeType ) const = 0; // throw ShapeLoadFailedException; }; } diff --git a/slideshow/source/inc/enumanimation.hxx b/slideshow/source/inc/enumanimation.hxx index bb84e7bfb7e2..137a7f2f17d1 100644 --- a/slideshow/source/inc/enumanimation.hxx +++ b/slideshow/source/inc/enumanimation.hxx @@ -1,7 +1,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 @@ -62,7 +62,7 @@ namespace slideshow This is necessary for pure To or By animations, as the Activity cannot determine a sensible start value - otherwise. + otherwise. @attention Note that you are only permitted to query for the underlying value, if the animation has actually diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx index 8acd93c0d108..dfc8ca1965c5 100644 --- a/slideshow/source/inc/event.hxx +++ b/slideshow/source/inc/event.hxx @@ -1,7 +1,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 @@ -46,30 +46,30 @@ public: #endif /** Execute the event. - + @return true, if event was successfully executed. */ virtual bool fire() = 0; - + /** Query whether this event is still charged, i.e. able to fire. - + Inactive events are ignored by the normal event containers (EventQueue, UserEventQueue etc.), and no explicit fire() is called upon them. - + @return true, if this event has already been fired. */ virtual bool isCharged() const = 0; - + /** Query the activation time instant this event shall be fired, if it was inserted at instant nCurrentTime into the queue. - + @param nCurrentTime The time from which the activation time is to be calculated from. - + @return the time instant in seconds, on which this event is to be fired. */ diff --git a/slideshow/source/inc/eventhandler.hxx b/slideshow/source/inc/eventhandler.hxx index c2ded2e99209..5620310b21e7 100644 --- a/slideshow/source/inc/eventhandler.hxx +++ b/slideshow/source/inc/eventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 99370bb4d886..a1c9210487b2 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -1,7 +1,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 @@ -53,7 +53,7 @@ struct EventMultiplexerImpl; /** This class multiplexes user-activated and slide-show global events. - + This class listens at the XSlideShowView and fires events registered for certain user actions. Furthermore, global slide show state changes (such as start or end of a slide) @@ -67,7 +67,7 @@ class EventMultiplexer : private ::boost::noncopyable { public: /** Create an event multiplexer - + @param rEventQueue Reference to the main event queue. Since we hold this object by plain reference, it must live longer than we @@ -89,49 +89,49 @@ public: UnoViewContainer const& rViewContainer ); ~EventMultiplexer(); - + // Management methods // ========================================================= - + /** Clear all registered handlers. */ void clear(); - + // Automatic mode methods // ========================================================= - + /** Change automatic mode. - + @param bIsAuto When true, events will be fired automatically, not only triggered by UI events. When false, auto events will quit. */ void setAutomaticMode( bool bIsAuto ); - + /** Get automatic mode setting. */ bool getAutomaticMode() const; - + /** Set the timeout for automatic mode. - + @param nTimeout Timeout, between end of effect until start of next effect. */ void setAutomaticTimeout( double nTimeout ); - + /** Get automatic mode timeout value. */ double getAutomaticTimeout() const; - + // Handler registration methods // ========================================================= - + /** Register an event handler that will be called when views are changed. - + For each view added, viewAdded() will be called on the handler. For each view removed, viewRemoved() will be called. Each modified view will cause a viewChanged() call on @@ -139,19 +139,19 @@ public: You don't need to deregister the handler, it will be automatically removed, once the pointee becomes stale. - + @param rHandler Handler to call. */ void addViewHandler( const ViewEventHandlerWeakPtr& rHandler ); void removeViewHandler( const ViewEventHandlerWeakPtr& rHandler ); - + /** Register an event handler that will be called when a view gets clobbered. - + Note that <em>all</em> registered handlers will be called when the event. This is in contrast to the mouse events below. - + @param rHandler Handler to call when a view needs a repaint */ @@ -160,7 +160,7 @@ public: /** Register an event handler that will be called when XShapeListeners are changed. - + @param rHandler Handler to call when a shape listener changes */ @@ -169,7 +169,7 @@ public: /** Register an event handler that will be called when XShapeListeners are changed. - + @param rHandler Handler to call when a shape listener changes */ @@ -178,7 +178,7 @@ public: /** Register an event handler that will be called when user paint parameters change. - + @param rHandler Handler to call when a shape listener changes */ @@ -187,15 +187,15 @@ public: /** Register an event handler that will be called when the user requests the next effect. - + For every nextEffect event, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + @param rHandler Handler to call when the next effect should start - + @param nPriority Priority with which the handlers are called. The higher the priority, the earlier this handler will be @@ -204,40 +204,40 @@ public: void addNextEffectHandler( const EventHandlerSharedPtr& rHandler, double nPriority ); void removeNextEffectHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when the slide is just shown. - + Note that <em>all</em> registered handlers will be called when the slide start occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the next slide starts */ void addSlideStartHandler( const EventHandlerSharedPtr& rHandler ); void removeSlideStartHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when the slide is about to vanish. - + Note that <em>all</em> registered handlers will be called when the slide end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the current slide ends */ void addSlideEndHandler( const EventHandlerSharedPtr& rHandler ); void removeSlideEndHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAnimationNode starts its active duration. - + Note that <em>all</em> registered handlers will be called when the animation start occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation start */ @@ -245,14 +245,14 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeAnimationStartHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAnimationNode ends its active duration. - + Note that <em>all</em> registered handlers will be called when the animation end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation ends */ @@ -264,11 +264,11 @@ public: /** Register an event handler that will be called when the main animation sequence of a slide ends its active duration. - + Note that <em>all</em> registered handlers will be called when the animation end occurs. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the animation ends */ @@ -276,14 +276,14 @@ public: const EventHandlerSharedPtr& rHandler ); void removeSlideAnimationsEndHandler( const EventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XAudio node's sound stops playing. - + Note that <em>all</em> registered handlers will be called when the audio stops. This is in contrast to the mouse events below. - + @param rHandler Handler to call when the audio stops */ @@ -291,14 +291,14 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeAudioStoppedHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register an event handler that will be called when an XCommand node's with the command STOPAUDIO is activated. - + Note that <em>all</em> registered handlers will be called when the audio stops. This is in contrast to the mouse events below. - + @param rHandler Handler to call when command is activated */ @@ -306,20 +306,20 @@ public: const AnimationEventHandlerSharedPtr& rHandler ); void removeCommandStopAudioHandler( const AnimationEventHandlerSharedPtr& rHandler ); - + /** Register a handler that is called when the show enters or exits pause mode. */ void addPauseHandler( const PauseEventHandlerSharedPtr& rHandler ); void removePauseHandler( const PauseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called on mouse click - + For every mouse click, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + Since the handlers can reject down and up events individually, handlers should expect to be called with non-matching down and up-press counts. If your handler @@ -329,15 +329,15 @@ public: void addClickHandler( const MouseEventHandlerSharedPtr& rHandler, double nPriority ); void removeClickHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called on a double mouse click - + For every mouse double click, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the currently highest priority will be called. - + Since the handlers can reject down and up events individually, handlers should expect to be called with non-matching down and up-press counts. If your handler @@ -347,9 +347,9 @@ public: void addDoubleClickHandler( const MouseEventHandlerSharedPtr& rHandler, double nPriority ); void removeDoubleClickHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Register a mouse handler that is called for mouse moves. - + For every mouse move, only one of the handlers registered here is called. The handlers are considered with decreasing priority, i.e. the handler with the @@ -359,7 +359,7 @@ public: double nPriority ); void removeMouseMoveHandler( const MouseEventHandlerSharedPtr& rHandler ); - + /** Registers a hyperlink click handler. For every hyperlink click, only one of the handlers registered @@ -370,31 +370,31 @@ public: @param rHandler @param nPriority */ - void addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, + void addHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler, double nPriority ); void removeHyperlinkHandler( const HyperlinkHandlerSharedPtr& rHandler ); - - + + // External event notifications // ========================================================= - + /** View added. - + This method adds another view, which the show is displayed on. On every added view, the EventMultiplexer registers mouse and motion event listeners. */ bool notifyViewAdded( const UnoViewSharedPtr& rView ); - + /** View removed - + This method removes a view. Registered mouse and motion event listeners are revoked. */ bool notifyViewRemoved( const UnoViewSharedPtr& rView ); - + /** View changed - + This method announces a changed view to all view listeners. View changes include size and transformation. @@ -402,9 +402,9 @@ public: View that has changed */ bool notifyViewChanged( const UnoViewSharedPtr& rView ); - + /** View changed - + This method announces a changed view to all view listeners. View changes include size and transformation. @@ -415,15 +415,15 @@ public: ::com::sun::star::presentation::XSlideShowView>& xView ); /** All Views changed - + This method announces to all view listeners that <em>every</em> known view has changed. View changes include size and transformation. */ bool notifyViewsChanged(); - + /** View clobbered - + This method announces that the given view has been clobbered by something external to the slideshow, and needs an update. @@ -468,11 +468,11 @@ public: the notification. */ bool notifyShapeCursorChange( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape, + ::com::sun::star::drawing::XShape>& xShape, sal_Int16 nPointerShape ); /** Notify a new user paint color - + Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. @@ -484,23 +484,23 @@ public: bool notifyUserPaintColor( RGBColor const& rUserColor ); /** Notify a new user paint width - + Sending this notification also implies that user paint is enabled. . - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyUserPaintStrokeWidth( double rUserStrokeWidth ); - - + + /** Notify a new user paint erase all ink mode - + Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -509,9 +509,9 @@ public: bool notifySwitchPenMode(); bool notifySwitchEraserMode(); bool notifyEraseInkWidth( sal_Int32 rEraseInkSize ); - + /** Notify that user paint is disabled - + User paint denotes the feature to draw colored lines on top of the slide content. @@ -522,120 +522,120 @@ public: bool notifyUserPaintDisabled(); /** Notify that the user requested the next effect. - + This requests the slideshow to display the next effect, or move to the next slide, if none are left. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyNextEffect(); - - /** Notify that a new slide is about to be displayed + + /** Notify that a new slide is about to be displayed */ bool notifySlideTransitionStarted(); /** Notify that a new slide has started - + This method is to be used from the Presentation object to signal that a new slide is starting now. This will invoke all registered slide start handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideStartEvent(); - + /** Notify that a slide has ended - + This method is to be used from the Presentation object to signal that a slide is ending now. This will invoke all registered slide end handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideEndEvent(); - + /** Notify that the given node enters its active duration. - + This method is to be used from the AnimationNode objects to signal that the active duration begins. This will invoke all registered animation start handlers. - + @param rNode Node which enters active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAnimationStart( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the given node leaves its active duration. - + This method is to be used from the AnimationNode objects to signal that the active duration ends now. This will invoke all registered animation end handlers. - + @param rNode Node which leaves active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAnimationEnd( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the slide animations sequence leaves its active duration. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifySlideAnimationsEnd(); - + /** Notify that for the given node, audio output has stopped. - + This method is to be used from the AnimationNode objects to signal that audio playback has just stopped. This will invoke all registered audio stopped andlers. - + @param rNode Node for which audio has stopped. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyAudioStopped( const boost::shared_ptr<AnimationNode>& rNode ); - + /** Notify that the show has entered or exited pause mode - + This method is to be used from the Presentation object to signal that a slide is entering (bPauseShow=true) or exiting (bPauseShow=false) pause mode. This will invoke all registered slide end handlers. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyPauseMode( bool bPauseShow ); - + /** Notify that all audio has to be stoped. - + This method is used by XCommand nodes and all sound playing nodes should listen for this command and stop theire sounds when its fired. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -643,13 +643,13 @@ public: bool notifyCommandStopAudio( const boost::shared_ptr<AnimationNode>& rNode ); /** Botifies that a hyperlink has been clicked. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) */ bool notifyHyperlinkClicked( ::rtl::OUString const& hyperLink ); - + private: boost::scoped_ptr<EventMultiplexerImpl> mpImpl; }; diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index 946b8cbcba9c..bf1954eaf784 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -1,7 +1,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 @@ -75,7 +75,7 @@ namespace slideshow even when they schedule new regular events without delay. */ bool addEventWhenQueueIsEmpty (const EventSharedPtr& rpEvent); - + /** Process the event queue. This method executes all events whose timeout has @@ -96,7 +96,7 @@ namespace slideshow bool isEmpty() const; /** Query timeout for the topmost event in the queue. - + @return Timeout in seconds, until the next event is ready. The time returned here is relative to the pres timer (i.e. the timer specified at the EventQueue @@ -118,19 +118,19 @@ namespace slideshow @attention do only call from event loop, this calls process_()! */ void forceEmpty(); - + /** Gets the queue's timer object. */ ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const & getTimer() const { return mpTimer; } - + private: mutable ::osl::Mutex maMutex; struct EventEntry : public ::std::unary_function<EventEntry, bool> { - EventSharedPtr pEvent; - double nTime; + EventSharedPtr pEvent; + double nTime; bool operator<( const EventEntry& ) const; // to leverage priority_queue's default compare @@ -139,12 +139,12 @@ namespace slideshow }; typedef ::std::priority_queue< EventEntry > ImplQueueType; - ImplQueueType maEvents; + ImplQueueType maEvents; typedef ::std::vector<EventEntry> EventEntryVector; EventEntryVector maNextEvents; ImplQueueType maNextNextEvents; void process_( bool bFireAllEvents ); - + // perform timing of events via relative time // measurements. The world time starts, when the // EventQueue object is created diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx index 624b61022cb3..1604dcc54ec2 100644 --- a/slideshow/source/inc/expressionnode.hxx +++ b/slideshow/source/inc/expressionnode.hxx @@ -1,7 +1,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 @@ -46,7 +46,7 @@ namespace slideshow { public: /** Predicate whether this node is constant. - + This predicate returns true, if this node is neither time- nor ViewInfo dependent. This allows for certain obtimizations, i.e. not the full diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx index 2ffd8aa5b254..1beae509df33 100644 --- a/slideshow/source/inc/expressionnodefactory.hxx +++ b/slideshow/source/inc/expressionnodefactory.hxx @@ -1,7 +1,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 @@ -51,30 +51,30 @@ namespace slideshow public: static ExpressionNodeSharedPtr createConstantValueExpression( double rConstantValue ); - static ExpressionNodeSharedPtr createValueTExpression (); + static ExpressionNodeSharedPtr createValueTExpression (); - static ExpressionNodeSharedPtr createPlusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMinusExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); - static ExpressionNodeSharedPtr createDividesExpression ( const ExpressionNodeSharedPtr& rLHS, - const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createPlusExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createMinusExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createMultipliesExpression( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); + static ExpressionNodeSharedPtr createDividesExpression ( const ExpressionNodeSharedPtr& rLHS, + const ExpressionNodeSharedPtr& rRHS ); /** Composes two ExpressionNode function. The resulting expression will calculate rOuterFunction( rInnerFunction(t) ). */ - static ExpressionNodeSharedPtr createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); - static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); - static ExpressionNodeSharedPtr createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); + static ExpressionNodeSharedPtr createMaxExpression ( const ExpressionNodeSharedPtr& rOuterFunction, + const ExpressionNodeSharedPtr& rInnerFunction ); }; } } diff --git a/slideshow/source/inc/externalmediashape.hxx b/slideshow/source/inc/externalmediashape.hxx index bb4f4120ffe6..c848ee3dd3c9 100644 --- a/slideshow/source/inc/externalmediashape.hxx +++ b/slideshow/source/inc/externalmediashape.hxx @@ -1,7 +1,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 @@ -51,7 +51,7 @@ namespace slideshow /** Notify the Shape that it should start with playback This method enters playback mode on all registered - views. It makes the media initially visible (for videos). + views. It makes the media initially visible (for videos). */ virtual void play() = 0; diff --git a/slideshow/source/inc/framerate.hxx b/slideshow/source/inc/framerate.hxx index 4c18ca93a5c7..8899db86576c 100644 --- a/slideshow/source/inc/framerate.hxx +++ b/slideshow/source/inc/framerate.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx index 3d260e3c42f3..797f5624f569 100644 --- a/slideshow/source/inc/hslcolor.hxx +++ b/slideshow/source/inc/hslcolor.hxx @@ -1,7 +1,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 @@ -39,7 +39,7 @@ namespace slideshow { class RGBColor; - /** HSL color space class. + /** HSL color space class. */ class HSLColor { @@ -50,19 +50,19 @@ namespace slideshow explicit HSLColor( const RGBColor& rColor ); /** Hue of the color. - + @return hue, is in the range [0,360] */ double getHue() const; /** Saturation of the color. - + @return saturation, is in the range [0,1] */ double getSaturation() const; /** Luminance of the color. - + @return luminance, is in the range [0,1] */ double getLuminance() const; @@ -95,21 +95,21 @@ namespace slideshow private: // default copy/assignment are okay - // HSLColor(const HSLColor&); + // HSLColor(const HSLColor&); // HSLColor& operator=( const HSLColor& ); - HSLTriple maHSLTriple; + HSLTriple maHSLTriple; /// Pre-calculated value, needed for conversion back to RGB - double mnMagicValue; - }; + double mnMagicValue; + }; HSLColor operator+( const HSLColor& rLHS, const HSLColor& rRHS ); HSLColor operator*( const HSLColor& rLHS, const HSLColor& rRHS ); HSLColor operator*( double nFactor, const HSLColor& rRHS ); /** HSL color linear interpolator. - + @param t As usual, t must be in the [0,1] range diff --git a/slideshow/source/inc/hslcoloranimation.hxx b/slideshow/source/inc/hslcoloranimation.hxx index 2c4d61a8c574..aa05c179c3b1 100644 --- a/slideshow/source/inc/hslcoloranimation.hxx +++ b/slideshow/source/inc/hslcoloranimation.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx index 1fbc46ac3d39..3255911e0f1d 100644 --- a/slideshow/source/inc/hyperlinkarea.hxx +++ b/slideshow/source/inc/hyperlinkarea.hxx @@ -1,7 +1,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 @@ -66,7 +66,7 @@ namespace slideshow virtual HyperlinkRegions getHyperlinkRegions() const = 0; /** Retrieve priority of link area - + @return the priority of the link area. Link areas with higher priority will receive hyperlink clicks in favor of areas with less priority, if they cover the same @@ -85,12 +85,12 @@ namespace slideshow // make functor adaptable (to boost::bind) typedef bool result_type; - bool operator()(const boost::shared_ptr< HyperlinkArea >& rLHS, + bool operator()(const boost::shared_ptr< HyperlinkArea >& rLHS, const boost::shared_ptr< HyperlinkArea >& rRHS) const { const double nPrioL( rLHS->getHyperlinkPriority() ); const double nPrioR( rRHS->getHyperlinkPriority() ); - + // if prios are equal, tie-break on ptr value return nPrioL == nPrioR ? rLHS.get() < rRHS.get() : nPrioL < nPrioR; } diff --git a/slideshow/source/inc/hyperlinkhandler.hxx b/slideshow/source/inc/hyperlinkhandler.hxx index 69e8ecc252d6..22a00ac09ac5 100644 --- a/slideshow/source/inc/hyperlinkhandler.hxx +++ b/slideshow/source/inc/hyperlinkhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx index 4a6f6e3000e0..8e824faa2453 100644 --- a/slideshow/source/inc/interruptabledelayevent.hxx +++ b/slideshow/source/inc/interruptabledelayevent.hxx @@ -1,7 +1,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,8 +44,8 @@ namespace slideshow class DelayFacade : public Event { public: - DelayFacade( const EventSharedPtr& rEvent, - double nTimeout ) : + DelayFacade( const EventSharedPtr& rEvent, + double nTimeout ) : #if OSL_DEBUG_LEVEL > 1 Event(::rtl::OUString::createFromAscii("DelayFacade")), #endif @@ -88,8 +88,8 @@ namespace slideshow } private: - EventSharedPtr mpEvent; - double mnTimeout; + EventSharedPtr mpEvent; + double mnTimeout; }; /// Return value for makeInterruptableDelay() @@ -99,14 +99,14 @@ namespace slideshow event. When enqueued, this event will fire the requested action only after the specified timeout. */ - EventSharedPtr mpTimeoutEvent; + EventSharedPtr mpTimeoutEvent; /** This member contains a pointer to the interruption event. When enqueued, this event will fire immediately, interrupting a potentially waiting timeout event. */ - EventSharedPtr mpImmediateEvent; + EventSharedPtr mpImmediateEvent; }; /** Generate an interruptable delay event. @@ -133,8 +133,8 @@ namespace slideshow specified amount of time, and the other fires the given functor immediately. */ - template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor, - double nTimeout ) + template< typename Functor > InterruptableEventPair makeInterruptableDelay( const Functor& rFunctor, + double nTimeout ) { InterruptableEventPair aRes; diff --git a/slideshow/source/inc/intrinsicanimationeventhandler.hxx b/slideshow/source/inc/intrinsicanimationeventhandler.hxx index ccfca5261505..6ef140953779 100644 --- a/slideshow/source/inc/intrinsicanimationeventhandler.hxx +++ b/slideshow/source/inc/intrinsicanimationeventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index 303063ab027f..e9f66670e5cb 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -1,7 +1,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 @@ -38,10 +38,10 @@ namespace slideshow { namespace internal { /** Container for objects that can be notified. - + This templatized container holds listener objects, than can get notified (by calling certain methods on them). - + @tpl Listener Type for the listener objects to be held @@ -91,8 +91,8 @@ public: Guard aGuard(*this); const typename container_type::const_iterator aEnd( maListeners.end() ); - if( std::find( maListeners.begin(), - aEnd, + if( std::find( maListeners.begin(), + aEnd, rListener ) != aEnd ) { return true; // already added @@ -154,7 +154,7 @@ public: if( maListeners.size() > 1 ) { std::inplace_merge( - maListeners.begin(), + maListeners.begin(), boost::prior(maListeners.end()), maListeners.end() ); } @@ -180,24 +180,24 @@ public: const typename container_type::iterator aEnd( maListeners.end() ); typename container_type::iterator aIter; - if( (aIter=std::remove(maListeners.begin(), - aEnd, + if( (aIter=std::remove(maListeners.begin(), + aEnd, rListener)) == aEnd ) { return false; // listener not found } - + maListeners.erase( aIter, aEnd ); return true; } /// Removes all listeners in one go - void clear() + void clear() { Guard aGuard(*this); - - maListeners.clear(); + + maListeners.clear(); } /** Apply functor to one listener @@ -223,7 +223,7 @@ public: const bool bRet( ListenerOperations<ListenerT>::notifySingleListener( - local, + local, func )); { @@ -259,7 +259,7 @@ public: const bool bRet( ListenerOperations<ListenerT>::notifyAllListeners( - local, + local, func )); { @@ -286,7 +286,7 @@ private: listeners. */ template< typename ListenerT, - typename ContainerT=std::vector<ListenerT> > + typename ContainerT=std::vector<ListenerT> > class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, MutexBase, ContainerT> @@ -301,7 +301,7 @@ class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, multi-threaded scenario, but has less overhead. */ template< typename ListenerT, - typename ContainerT=std::vector<ListenerT> > + typename ContainerT=std::vector<ListenerT> > class ThreadUnsafeListenerContainer : public ListenerContainerBase<ListenerT, EmptyBase, ContainerT> diff --git a/slideshow/source/inc/listenercontainerimpl.hxx b/slideshow/source/inc/listenercontainerimpl.hxx index 8644ab9d09d2..721d20df886d 100644 --- a/slideshow/source/inc/listenercontainerimpl.hxx +++ b/slideshow/source/inc/listenercontainerimpl.hxx @@ -1,7 +1,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 @@ -40,29 +40,29 @@ struct EmptyBase struct EmptyGuard{ explicit EmptyGuard(EmptyBase) {} }; struct EmptyClearableGuard { - explicit EmptyClearableGuard(EmptyBase) {} - void clear() {} - void reset() {} + explicit EmptyClearableGuard(EmptyBase) {} + void clear() {} + void reset() {} }; typedef EmptyGuard Guard; typedef EmptyClearableGuard ClearableGuard; }; - + class MutexBase { public: - struct Guard : public osl::MutexGuard - { - explicit Guard(MutexBase const& rBase) : - osl::MutexGuard(rBase.maMutex) - {} + struct Guard : public osl::MutexGuard + { + explicit Guard(MutexBase const& rBase) : + osl::MutexGuard(rBase.maMutex) + {} }; struct ClearableGuard : public osl::ClearableMutexGuard - { - explicit ClearableGuard(MutexBase const& rBase) : - osl::ClearableMutexGuard(rBase.maMutex) - {} + { + explicit ClearableGuard(MutexBase const& rBase) : + osl::ClearableMutexGuard(rBase.maMutex) + {} }; mutable osl::Mutex maMutex; @@ -72,7 +72,7 @@ public: template< typename result_type, typename ListenerTargetT > struct FunctionApply { - template<typename FuncT> static bool apply( + template<typename FuncT> static bool apply( FuncT func, ListenerTargetT const& rArg ) { @@ -82,7 +82,7 @@ template< typename result_type, typename ListenerTargetT > struct FunctionApply template<typename ListenerTargetT> struct FunctionApply<void,ListenerTargetT> { - template<typename FuncT> static bool apply( + template<typename FuncT> static bool apply( FuncT func, ListenerTargetT const& rArg ) { @@ -96,7 +96,7 @@ template<typename ListenerTargetT> struct FunctionApply<void,ListenerTargetT> template< typename ListenerT > struct ListenerOperations { /// Notify a single one of the listeners - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifySingleListener( ContainerT& rContainer, FuncT func ) @@ -105,13 +105,13 @@ template< typename ListenerT > struct ListenerOperations // true: a handler in this queue processed the event // false: no handler in this queue finally processed the event - return (std::find_if( rContainer.begin(), + return (std::find_if( rContainer.begin(), aEnd, func ) != aEnd); } /// Notify all listeners - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifyAllListeners( ContainerT& rContainer, FuncT func ) @@ -128,7 +128,7 @@ template< typename ListenerT > struct ListenerOperations { bRet = true; } - + ++aCurr; } @@ -146,10 +146,10 @@ template< typename ListenerT > struct ListenerOperations // specializations for weak_ptr // ---------------------------- -template< typename ListenerTargetT > +template< typename ListenerTargetT > struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > { - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifySingleListener( ContainerT& rContainer, FuncT func ) @@ -159,17 +159,17 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > while( aCurr != aEnd ) { boost::shared_ptr<ListenerTargetT> pListener( aCurr->lock() ); - + if( pListener && func(pListener) ) return true; - + ++aCurr; } return false; } - template< typename ContainerT, + template< typename ContainerT, typename FuncT > static bool notifyAllListeners( ContainerT& rContainer, FuncT func ) @@ -180,14 +180,14 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > while( aCurr != aEnd ) { boost::shared_ptr<ListenerTargetT> pListener( aCurr->lock() ); - - if( pListener.get() && + + if( pListener.get() && FunctionApply< typename FuncT::result_type, boost::shared_ptr<ListenerTargetT> >::apply(func,pListener) ) { bRet = true; } - + ++aCurr; } @@ -203,7 +203,7 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> > ContainerT aAliveListeners; aAliveListeners.reserve(rContainer.size()); - + typename ContainerT::const_iterator aCurr( rContainer.begin() ); typename ContainerT::const_iterator const aEnd ( rContainer.end() ); while( aCurr != aEnd ) diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx index f8e3f37a6df9..195c7de2a503 100644 --- a/slideshow/source/inc/mouseeventhandler.hxx +++ b/slideshow/source/inc/mouseeventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx index 44a66a2b0aad..faf5aae64393 100644 --- a/slideshow/source/inc/numberanimation.hxx +++ b/slideshow/source/inc/numberanimation.hxx @@ -1,7 +1,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 @@ -62,7 +62,7 @@ namespace slideshow This is necessary for pure To or By animations, as the Activity cannot determine a sensible start value - otherwise. + otherwise. @attention Note that you are only permitted to query for the underlying value, if the animation has actually diff --git a/slideshow/source/inc/pairanimation.hxx b/slideshow/source/inc/pairanimation.hxx index b14553aa1642..6c8357b244da 100644 --- a/slideshow/source/inc/pairanimation.hxx +++ b/slideshow/source/inc/pairanimation.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/pauseeventhandler.hxx b/slideshow/source/inc/pauseeventhandler.hxx index 1ba587018a68..9e78b38de56f 100644 --- a/slideshow/source/inc/pauseeventhandler.hxx +++ b/slideshow/source/inc/pauseeventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 70f8a8d88499..db096e4532e5 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -1,7 +1,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 @@ -35,11 +35,11 @@ namespace slideshow { - namespace internal + namespace internal { class HSLColor; - /** RGB color space class. + /** RGB color space class. */ class RGBColor { @@ -50,19 +50,19 @@ namespace slideshow explicit RGBColor( const HSLColor& rColor ); /** Hue of the color. - + @return hue, is in the range [0,360] */ double getHue() const; /** Saturation of the color. - + @return saturation, is in the range [0,1] */ double getSaturation() const; /** Luminance of the color. - + @return luminance, is in the range [0,1] */ double getLuminance() const; @@ -86,9 +86,9 @@ namespace slideshow /** Create an integer sRGBA color. */ ::cppcanvas::Color::IntSRGBA getIntegerColor() const; - + RGBColor(const RGBColor& rLHS); - RGBColor& operator=( const RGBColor& rLHS); + RGBColor& operator=( const RGBColor& rLHS); struct RGBTriple { @@ -102,19 +102,19 @@ namespace slideshow private: // default copy/assignment are okay - // RGBColor(const RGBColor&); + // RGBColor(const RGBColor&); // RGBColor& operator=( const RGBColor& ); - RGBTriple maRGBTriple; - }; + RGBTriple maRGBTriple; + }; RGBColor operator+( const RGBColor& rLHS, const RGBColor& rRHS ); RGBColor operator*( const RGBColor& rLHS, const RGBColor& rRHS ); RGBColor operator*( double nFactor, const RGBColor& rRHS ); - + /** RGB color linear interpolator. - + @param t As usual, t must be in the [0,1] range */ diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx index 517bf4f46624..96a8ca9b5310 100644 --- a/slideshow/source/inc/screenupdater.hxx +++ b/slideshow/source/inc/screenupdater.hxx @@ -1,7 +1,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 @@ -57,20 +57,20 @@ namespace slideshow ~ScreenUpdater(); /** Notify screen update - + This method records a screen content update request for all views. */ void notifyUpdate(); - + /** Notify screen update - + This method records a screen content update request for the given view. @param rView The view that needs an update - + @param bViewClobbered When true, notifies update that view content is clobbered by external circumstances (e.g. by another diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index ac369287b5fa..3bfec3f67ff8 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -1,7 +1,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 @@ -73,7 +73,7 @@ namespace slideshow direct corresponding XShape (the background comes to mind here). */ - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getXShape() const = 0; @@ -91,15 +91,15 @@ namespace slideshow @param bRedrawLayer Redraw shape on given layer */ - virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, - bool bRedrawLayer ) = 0; + virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, + bool bRedrawLayer ) = 0; /** Withdraw the shape from a view layer This method removes the shape from the given view layer. - @return true, if the shape was successfully removed + @return true, if the shape was successfully removed */ virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) = 0; @@ -229,23 +229,23 @@ namespace slideshow // make functor adaptable (to boost::bind) typedef bool result_type; - // since the ZOrder property on the XShape has somewhat + // since the ZOrder property on the XShape has somewhat // peculiar attributes (it's basically the index of the shapes // in the drawing layer's SdrObjList - which means, it starts - // from 0 for children of group objects), we cannot use it to determine - // drawing order. Thus, we rely on importer-provided order values here, + // from 0 for children of group objects), we cannot use it to determine + // drawing order. Thus, we rely on importer-provided order values here, // which is basically a running counter during shape import (i.e. denotes // the order of shape import). This is the correct order, at least for the // current drawing core. // - // If, someday, the above proposition is no longer true, one directly use + // If, someday, the above proposition is no longer true, one directly use // the shape's ZOrder property // static bool compare(const Shape* pLHS, const Shape* pRHS) { const double nPrioL( pLHS->getPriority() ); const double nPrioR( pRHS->getPriority() ); - + // if prios are equal, tie-break on ptr value return nPrioL == nPrioR ? pLHS < pRHS : nPrioL < nPrioR; } @@ -266,7 +266,7 @@ namespace slideshow /** A set which contains all shapes in an ordered fashion. */ - typedef ::std::set< ShapeSharedPtr, Shape::lessThanShape > ShapeSet; + typedef ::std::set< ShapeSharedPtr, Shape::lessThanShape > ShapeSet; } } diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index afdcead16368..513b772665a4 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -1,7 +1,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 @@ -264,7 +264,7 @@ namespace slideshow New alpha value, must be in the [0,1] range */ void setAlpha( const double& rNewValue ); - + /** Query whether the clip attribute is valid */ bool isClipValid() const; @@ -279,7 +279,7 @@ namespace slideshow with the origin of the clip polygon). */ void setClip( const ::basegfx::B2DPolyPolygon& rNewClip ); - + /** Query whether the dim color attribute is valid The dim color globally 'dims' the shape towards that @@ -335,7 +335,7 @@ namespace slideshow */ bool isLineStyleValid() const; /** Get the current line mode for line drawing. - + @returns the current line style */ sal_Int16 getLineStyle() const; @@ -367,7 +367,7 @@ namespace slideshow /** Set the text color globally for the whole shape. */ void setCharColor( const RGBColor& nNewColor ); - + /** Query whether the char rotation angle attribute is valid */ bool isCharRotationAngleValid() const; @@ -399,7 +399,7 @@ namespace slideshow ::com::sun::star::awt::FontWeight constant group. */ void setCharWeight( const double& rStyle ); - + /** Query whether the underline mode attribute is valid */ bool isUnderlineModeValid() const; @@ -478,76 +478,76 @@ namespace slideshow bool haveChild() const { return mpChild; } void updateStateIds(); - template< typename T > T calcValue( const T& rCurrValue, - bool bThisInstanceValid, + template< typename T > T calcValue( const T& rCurrValue, + bool bThisInstanceValid, bool (ShapeAttributeLayer::*pIsValid)() const, - T (ShapeAttributeLayer::*pGetValue)() const ) const; - - ShapeAttributeLayerSharedPtr mpChild; // may be NULL - - ::basegfx::B2DSize maSize; - ::basegfx::B2DPoint maPosition; - ::basegfx::B2DPolyPolygon maClip; - - ::rtl::OUString maFontFamily; - - double mnRotationAngle; - double mnShearXAngle; - double mnShearYAngle; - double mnAlpha; - double mnCharRotationAngle; - double mnCharScale; - double mnCharWeight; - - ::com::sun::star::drawing::FillStyle meFillStyle; - ::com::sun::star::drawing::LineStyle meLineStyle; - ::com::sun::star::awt::FontSlant meCharPosture; - sal_Int16 mnUnderlineMode; - - RGBColor maDimColor; - RGBColor maFillColor; - RGBColor maLineColor; - RGBColor maCharColor; - - State::StateId mnTransformationState; - State::StateId mnClipState; - State::StateId mnAlphaState; - State::StateId mnPositionState; - State::StateId mnContentState; - State::StateId mnVisibilityState; - - sal_Int16 mnAdditiveMode; - - bool mbVisibility : 1; - - bool mbWidthValid : 1; - bool mbHeightValid : 1; - bool mbPosXValid : 1; - bool mbPosYValid : 1; - bool mbClipValid : 1; - - bool mbFontFamilyValid : 1; - - bool mbRotationAngleValid : 1; - bool mbShearXAngleValid : 1; - bool mbShearYAngleValid : 1; - - bool mbAlphaValid : 1; - - bool mbCharRotationAngleValid: 1; - bool mbCharScaleValid : 1; - - bool mbDimColorValid : 1; - bool mbFillColorValid : 1; - bool mbLineColorValid : 1; - bool mbCharColorValid : 1; - - bool mbFillStyleValid : 1; - bool mbLineStyleValid : 1; - bool mbCharWeightValid : 1; - bool mbUnderlineModeValid : 1; - bool mbCharPostureValid : 1; - bool mbVisibilityValid : 1; + T (ShapeAttributeLayer::*pGetValue)() const ) const; + + ShapeAttributeLayerSharedPtr mpChild; // may be NULL + + ::basegfx::B2DSize maSize; + ::basegfx::B2DPoint maPosition; + ::basegfx::B2DPolyPolygon maClip; + + ::rtl::OUString maFontFamily; + + double mnRotationAngle; + double mnShearXAngle; + double mnShearYAngle; + double mnAlpha; + double mnCharRotationAngle; + double mnCharScale; + double mnCharWeight; + + ::com::sun::star::drawing::FillStyle meFillStyle; + ::com::sun::star::drawing::LineStyle meLineStyle; + ::com::sun::star::awt::FontSlant meCharPosture; + sal_Int16 mnUnderlineMode; + + RGBColor maDimColor; + RGBColor maFillColor; + RGBColor maLineColor; + RGBColor maCharColor; + + State::StateId mnTransformationState; + State::StateId mnClipState; + State::StateId mnAlphaState; + State::StateId mnPositionState; + State::StateId mnContentState; + State::StateId mnVisibilityState; + + sal_Int16 mnAdditiveMode; + + bool mbVisibility : 1; + + bool mbWidthValid : 1; + bool mbHeightValid : 1; + bool mbPosXValid : 1; + bool mbPosYValid : 1; + bool mbClipValid : 1; + + bool mbFontFamilyValid : 1; + + bool mbRotationAngleValid : 1; + bool mbShearXAngleValid : 1; + bool mbShearYAngleValid : 1; + + bool mbAlphaValid : 1; + + bool mbCharRotationAngleValid: 1; + bool mbCharScaleValid : 1; + + bool mbDimColorValid : 1; + bool mbFillColorValid : 1; + bool mbLineColorValid : 1; + bool mbCharColorValid : 1; + + bool mbFillStyleValid : 1; + bool mbLineStyleValid : 1; + bool mbCharWeightValid : 1; + bool mbUnderlineModeValid : 1; + bool mbCharPostureValid : 1; + bool mbVisibilityValid : 1; }; } diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx index 17131e3eeb43..43c2a2f4942f 100644 --- a/slideshow/source/inc/shapeattributelayerholder.hxx +++ b/slideshow/source/inc/shapeattributelayerholder.hxx @@ -1,7 +1,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 @@ -90,7 +90,7 @@ namespace slideshow if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - + return mpAttributeLayer; } @@ -100,8 +100,8 @@ namespace slideshow } private: - AttributableShapeSharedPtr mpShape; - ShapeAttributeLayerSharedPtr mpAttributeLayer; + AttributableShapeSharedPtr mpShape; + ShapeAttributeLayerSharedPtr mpAttributeLayer; }; } diff --git a/slideshow/source/inc/shapecursoreventhandler.hxx b/slideshow/source/inc/shapecursoreventhandler.hxx index 9e0cc4f17303..be421f7010d0 100644 --- a/slideshow/source/inc/shapecursoreventhandler.hxx +++ b/slideshow/source/inc/shapecursoreventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx index 6bf3012eb377..9d6528b795a5 100644 --- a/slideshow/source/inc/shapeimporter.hxx +++ b/slideshow/source/inc/shapeimporter.hxx @@ -1,7 +1,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,25 +44,25 @@ namespace internal { struct SlideShowContext; typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; -typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; -typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; - +typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; +typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; + /** This class imports all shapes from a given XShapes object */ -class ShapeImporter +class ShapeImporter { public: /** Create shape importer. - + @param xPage Page containing the shapes - + @param xActualPage Actual page that's imported - if xPage is a master page, this argument must refer to the using, i.e the page that embeds this specific masterpage. Otherwise, this argument is probably equal to xPage. - + @param nOrdNumStart Each shape receives a z order number, in order of import (which relies on the fact that the API returns @@ -70,33 +70,33 @@ public: currently). Since we might mix several pages on screen (e.g. master page and foreground page), this value can be used as an offset to distinguish those pages. - + @param bConvertingMasterPage When true, then the master page is imported. Otherwise, this object imports the draw page. */ - ShapeImporter( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xActualPage, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier, + ShapeImporter( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xPage, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xActualPage, + const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPagesSupplier>& xPagesSupplier, const SlideShowContext& rContext, sal_Int32 nOrdNumStart, bool bConvertingMasterPage ); - + /** This method imports the presentation background shape */ ShapeSharedPtr importBackgroundShape(); // throw (ShapeLoadFailedException) /** This method imports presentation-visible shapes (and skips all others). - + @return the generated Shape, or NULL for no more shapes. */ ShapeSharedPtr importShape(); // throw (ConversionFailedException) - + /** Test whether import is done. - + @return true, if all shapes are imported via the importShape() call. */ @@ -107,25 +107,25 @@ private: ::com::sun::star::beans::XPropertySet> const& xPropSet, ::rtl::OUString const& shapeType, ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XLayer> const& xLayer); - + ::com::sun::star::drawing::XLayer> const& xLayer); + ShapeSharedPtr createShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> const& xCurrShape, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> const& xPropSet, ::rtl::OUString const& shapeType ) const; - + void importPolygons(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > const& xPropSet) ; - - struct XShapesEntry + + struct XShapesEntry { ShapeSharedPtr const mpGroupShape; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes> const mxShapes; sal_Int32 const mnCount; sal_Int32 mnPos; - + explicit XShapesEntry( ShapeSharedPtr const& pGroupShape ) : mpGroupShape(pGroupShape), mxShapes( pGroupShape->getXShape(), @@ -137,11 +137,11 @@ private: mnCount(xShapes->getCount()), mnPos(0) {} }; typedef ::std::stack<XShapesEntry> XShapesStack; - + ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage> mxPage; + ::com::sun::star::drawing::XDrawPage> mxPage; ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier; + ::com::sun::star::drawing::XDrawPagesSupplier> mxPagesSupplier; const SlideShowContext& mrContext; PolyPolygonVector maPolygons; XShapesStack maShapesStack; diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx index af899dfe0c94..abedde580cfb 100644 --- a/slideshow/source/inc/shapelistenereventhandler.hxx +++ b/slideshow/source/inc/shapelistenereventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx index 41d1216e5683..c067fb20da9e 100644 --- a/slideshow/source/inc/shapemanager.hxx +++ b/slideshow/source/inc/shapemanager.hxx @@ -1,7 +1,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 @@ -97,7 +97,7 @@ namespace slideshow should be looked up. */ virtual boost::shared_ptr<Shape> lookupShape( - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > const & xShape ) const = 0; /** Register given shape as a hyperlink target diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx index 4f74ea98e753..81e15efa3e78 100644 --- a/slideshow/source/inc/shapemaps.hxx +++ b/slideshow/source/inc/shapemaps.hxx @@ -1,7 +1,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 @@ -48,10 +48,10 @@ namespace slideshow /// Maps XShape to shape listener typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, - boost::shared_ptr< ::cppu::OInterfaceContainerHelper > + boost::shared_ptr< ::cppu::OInterfaceContainerHelper > > ShapeEventListenerMap; - /// Maps XShape to mouse cursor + /// Maps XShape to mouse cursor typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>, sal_Int16> ShapeCursorMap; diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index 8b541d303675..7100bd015e52 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -1,7 +1,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 @@ -68,8 +68,8 @@ namespace slideshow Manager object, where subsets are registered/unregistered */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, - const DocTreeNode& rTreeNode, + ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + const DocTreeNode& rTreeNode, const SubsettableShapeManagerSharedPtr& rSubsetManager ); /** Create a subset from another subset. @@ -85,8 +85,8 @@ namespace slideshow @param rTreeNode Subset of the original subset */ - ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, - const DocTreeNode& rTreeNode ); + ShapeSubset( const ShapeSubsetSharedPtr& rOriginalSubset, + const DocTreeNode& rTreeNode ); /** Create full set for the given shape. @@ -94,7 +94,7 @@ namespace slideshow Original shape, which will be represented as a whole by this object */ - ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, + ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape, const SubsettableShapeManagerSharedPtr& rShapeManager ); ~ShapeSubset(); @@ -104,7 +104,7 @@ namespace slideshow If the subset is currently revoked, this method returns the original shape. */ - AttributableShapeSharedPtr getSubsetShape() const; + AttributableShapeSharedPtr getSubsetShape() const; /** Enable the subset shape. @@ -115,7 +115,7 @@ namespace slideshow @return true, if subsetting was successfully enabled. */ - bool enableSubsetShape(); + bool enableSubsetShape(); /** Disable the subset shape. @@ -123,7 +123,7 @@ namespace slideshow shape. That means, the original shape will again show the hidden range. */ - void disableSubsetShape(); + void disableSubsetShape(); /** Query whether this subset actually is none, but contains the whole original shape's content @@ -139,7 +139,7 @@ namespace slideshow //ShapeSubset(const ShapeSubset&); //ShapeSubset& operator=( const ShapeSubset& ); - AttributableShapeSharedPtr mpOriginalShape; + AttributableShapeSharedPtr mpOriginalShape; AttributableShapeSharedPtr mpSubsetShape; DocTreeNode maTreeNode; SubsettableShapeManagerSharedPtr mpShapeManager; diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 9f4e6b8f5055..3c3bdfd1972f 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -1,7 +1,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 @@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { class XDrawPage; class XDrawPagesSupplier; } - namespace uno { + namespace uno { class XComponentContext; } namespace animations { @@ -61,7 +61,7 @@ namespace slideshow { class RGBColor; class ScreenUpdater; - typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; + typedef ::std::vector< ::cppcanvas::PolyPolygonSharedPtr> PolyPolygonVector; class Slide { public: @@ -105,25 +105,25 @@ namespace slideshow This value is retrieved from the XDrawPage properties. */ - virtual basegfx::B2IVector getSlideSize() const = 0; + virtual basegfx::B2IVector getSlideSize() const = 0; /// Gets the underlying API page virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getXDrawPage() const = 0; - + /// Gets the animation node. - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0; ///Gets the slide Polygons virtual PolyPolygonVector getPolygons() = 0; - + ///Draw the slide Polygons virtual void drawPolygons() const = 0; - + ///Check if slide is already active virtual bool isPaintOverlayActive() const = 0; - + // Slide bitmaps // ------------------------------------------------------------------- @@ -147,7 +147,7 @@ namespace slideshow that the view must have been added to this slide before via viewAdded(). */ - virtual SlideBitmapSharedPtr + virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const = 0; }; @@ -159,7 +159,7 @@ namespace slideshow class ActivitiesQueue; class UserEventQueue; class RGBColor; - + /** Construct from XDrawPage The Slide object generally works in XDrawPage model @@ -167,7 +167,7 @@ namespace slideshow height as specified in the XDrawPage's property set. The top, left corner of the page will be rendered at (0,0) in the given canvas' view coordinate system. - + Does not render anything initially @param xDrawPage @@ -188,20 +188,20 @@ namespace slideshow @param rUserEventQueue UserEeventQueue */ - SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage >& xDrawPage, + SlideSharedPtr createSlide( const ::com::sun::star::uno::Reference< + ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier >& xDrawPages, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xRootNode, - EventQueue& rEventQueue, - EventMultiplexer& rEventMultiplexer, + EventQueue& rEventQueue, + EventMultiplexer& rEventMultiplexer, ScreenUpdater& rScreenUpdater, - ActivitiesQueue& rActivitiesQueue, - UserEventQueue& rUserEventQueue, + ActivitiesQueue& rActivitiesQueue, + UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const ShapeEventListenerMap& rShapeListenerMap, const ShapeCursorMap& rShapeCursorMap, diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx index dcbe49c7a4cf..2f2229f9d095 100644 --- a/slideshow/source/inc/slidebitmap.hxx +++ b/slideshow/source/inc/slidebitmap.hxx @@ -1,7 +1,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 @@ -70,22 +70,22 @@ namespace slideshow public: SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap ); - bool draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const; - ::basegfx::B2ISize getSize() const; + bool draw( const ::cppcanvas::CanvasSharedPtr& rCanvas ) const; + ::basegfx::B2ISize getSize() const; ::basegfx::B2DPoint getOutputPos() const{return maOutputPos;} - void move( const ::basegfx::B2DPoint& rNewPos ); - void clip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - + void move( const ::basegfx::B2DPoint& rNewPos ); + void clip( const ::basegfx::B2DPolyPolygon& rClipPoly ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > getXBitmap(); private: - ::basegfx::B2DPoint maOutputPos; - ::basegfx::B2DPolyPolygon maClipPoly; + ::basegfx::B2DPoint maOutputPos; + ::basegfx::B2DPolyPolygon maClipPoly; // TODO(Q2): Remove UNO bitmap as the transport medium ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > mxBitmap; + ::com::sun::star::rendering::XBitmap > mxBitmap; }; typedef ::boost::shared_ptr< SlideBitmap > SlideBitmapSharedPtr; diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx index 46843dd235f2..dd24d52c8896 100644 --- a/slideshow/source/inc/slideshowcontext.hxx +++ b/slideshow/source/inc/slideshowcontext.hxx @@ -1,7 +1,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 @@ -62,16 +62,16 @@ namespace slideshow @param rShapeManager ShapeManager, which handles all shapes - + @param rEventQueue Event queue, where time-based events are to be scheduled. A node must not schedule events there before it's not resolved. - + @param rEventMultiplexer Event multiplexer. Clients can register there for about any event that happens in the slideshow - + @param rScreenUpdater Screen updater. Gets notified of necessary screen updates. @@ -79,9 +79,9 @@ namespace slideshow @param rActivitiesQueue Activities queue, where repeating activities are to be scheduled. - + @param rUserEventQueue - User event queue + User event queue @param rViewContainer Holds all views added to slideshow @@ -97,20 +97,20 @@ namespace slideshow UserEventQueue& rUserEventQueue, CursorManager& rCursorManager, const UnoViewContainer& rViewContainer, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); void dispose(); boost::shared_ptr<SubsettableShapeManager>& mpSubsettableShapeManager; - EventQueue& mrEventQueue; - EventMultiplexer& mrEventMultiplexer; + EventQueue& mrEventQueue; + EventMultiplexer& mrEventMultiplexer; ScreenUpdater& mrScreenUpdater; - ActivitiesQueue& mrActivitiesQueue; - UserEventQueue& mrUserEventQueue; + ActivitiesQueue& mrActivitiesQueue; + UserEventQueue& mrUserEventQueue; CursorManager& mrCursorManager; const UnoViewContainer& mrViewContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> mxComponentContext; + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XComponentContext> mxComponentContext; }; } } diff --git a/slideshow/source/inc/slideshowexceptions.hxx b/slideshow/source/inc/slideshowexceptions.hxx index 6932d0302dcc..84752224c2cb 100644 --- a/slideshow/source/inc/slideshowexceptions.hxx +++ b/slideshow/source/inc/slideshowexceptions.hxx @@ -1,7 +1,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 @@ -46,7 +46,7 @@ namespace slideshow { ParseError() {} explicit ParseError( const char* ) {} - }; + }; } diff --git a/slideshow/source/inc/slideview.hxx b/slideshow/source/inc/slideview.hxx index 3f8b159423f4..758088baaa51 100644 --- a/slideshow/source/inc/slideview.hxx +++ b/slideshow/source/inc/slideview.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 208f7112e0f4..dd60fb593ab6 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -1,7 +1,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 @@ -50,7 +50,7 @@ namespace slideshow { public: /** Parse a string containing a SMIL value. - + This method parses a string representing a fixed value (i.e. a value that does not change by time). Due to the dynamic view @@ -58,38 +58,38 @@ namespace slideshow this value can sometimes only be determined during runtime of the animation (because e.g. mixed screen/view coordinates are - involved), and is thus still returned as an - ExpressionNode object. An example for + involved), and is thus still returned as an + ExpressionNode object. An example for such a case is the "Width+1.0" string, which - contains the width of the shape in user + contains the width of the shape in user coordinate space, and the screen width in device coordinate space. The following grammar is accepted by this method: <code> - identifier = 'pi'|'e'|'X'|'Y'|'Width'|'Height' - + identifier = 'pi'|'e'|'X'|'Y'|'Width'|'Height' + function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan'|'acos'|'asin'|'exp'|'log' - basic_expression = - number | - identifier | - function '(' additive_expression ')' | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + identifier | + function '(' additive_expression ')' | + '(' additive_expression ')' + + unary_expression = '-' basic_expression | basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) - - </code> + </code> @param rSmilValue The string to parse @@ -100,44 +100,44 @@ namespace slideshow the page the shape is part of, i.e. within the [0,1] range. This is necessary, since the string might contain symbolic references to the shape bounding box. - + @throws ParseError if an invalid expression is given. @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError + static ExpressionNodeSharedPtr parseSmilValue( const ::rtl::OUString& rSmilValue, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError /** Parse a string containing a SMIL function. - + This method parses a string representing a possibly time-varying SMIL function. The following grammar is accepted by this method: <code> - identifier = 't'|'pi'|'e'|'X'|'Y'|'Width'|'Height' - + identifier = 't'|'pi'|'e'|'X'|'Y'|'Width'|'Height' + function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan'|'acos'|'asin'|'exp'|'log' - basic_expression = - number | - identifier | - function '(' additive_expression ')' | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + identifier | + function '(' additive_expression ')' | + '(' additive_expression ')' + + unary_expression = '-' basic_expression | basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) - - </code> + </code> @param rSmilFunction The string to parse @@ -153,11 +153,11 @@ namespace slideshow @return the generated function object. */ - static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, - const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError + static ExpressionNodeSharedPtr parseSmilFunction( const ::rtl::OUString& rSmilFunction, + const ::basegfx::B2DRectangle& rRelativeShapeBounds ); // throw ParseError private: - // disabled constructor/destructor, since this is + // disabled constructor/destructor, since this is // supposed to be a singleton SmilFunctionParser(); }; diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx index 1f0a6f9bbc2b..edc10d98bc31 100644 --- a/slideshow/source/inc/soundplayer.hxx +++ b/slideshow/source/inc/soundplayer.hxx @@ -1,7 +1,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 @@ -59,7 +59,7 @@ namespace slideshow /** Create a sound player object. @param rSoundURL - URL to a sound file. + URL to a sound file. @param rComponentContext Reference to a component context, used to create the @@ -72,7 +72,7 @@ namespace slideshow static ::boost::shared_ptr<SoundPlayer> create( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); virtual ~SoundPlayer(); @@ -101,7 +101,7 @@ namespace slideshow SoundPlayer( EventMultiplexer & rEventMultiplexer, const ::rtl::OUString& rSoundURL, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rComponentContext ); EventMultiplexer & mrEventMultiplexer; @@ -109,7 +109,7 @@ namespace slideshow // is available ::boost::shared_ptr<SoundPlayer> mThis; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; - }; + }; typedef ::boost::shared_ptr< SoundPlayer > SoundPlayerSharedPtr; } diff --git a/slideshow/source/inc/state.hxx b/slideshow/source/inc/state.hxx index 8f4ea7805b95..e2d84e8edd0c 100644 --- a/slideshow/source/inc/state.hxx +++ b/slideshow/source/inc/state.hxx @@ -1,7 +1,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 @@ -51,7 +51,7 @@ namespace slideshow public: virtual ~State() {} - /// Abstract, numerically encoded state ID + /// Abstract, numerically encoded state ID typedef ::std::size_t StateId; /** This method returns a numerical state identifier. @@ -61,7 +61,7 @@ namespace slideshow clients can assume that the object's state has changed. - @return an abstract, numerical state ID. + @return an abstract, numerical state ID. */ virtual StateId getStateId() const = 0; }; diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx index 09a04ad65d3d..bea6a0c5a142 100644 --- a/slideshow/source/inc/stringanimation.hxx +++ b/slideshow/source/inc/stringanimation.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/subsettableshapemanager.hxx b/slideshow/source/inc/subsettableshapemanager.hxx index f80777adee80..00ce34b2c793 100644 --- a/slideshow/source/inc/subsettableshapemanager.hxx +++ b/slideshow/source/inc/subsettableshapemanager.hxx @@ -1,7 +1,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 @@ -70,7 +70,7 @@ namespace slideshow @param rSubsetShape The subset to display in the generated shape. */ - virtual boost::shared_ptr<AttributableShape> getSubsetShape( + virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, const DocTreeNode& rTreeNode ) = 0; @@ -87,7 +87,7 @@ namespace slideshow @param rSubsetShape The subset created from rOrigShape */ - virtual void revokeSubset( + virtual void revokeSubset( const boost::shared_ptr<AttributableShape>& rOrigShape, const boost::shared_ptr<AttributableShape>& rSubsetShape ) = 0; @@ -95,7 +95,7 @@ namespace slideshow /** Register an event handler that will be called when user paint parameters change. - + @param rHandler Handler to call when a shape listener changes */ @@ -103,7 +103,7 @@ namespace slideshow virtual void removeIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) = 0; /** Notify that shape-intrinsic animations are now enabled. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) @@ -111,7 +111,7 @@ namespace slideshow virtual bool notifyIntrinsicAnimationsEnabled() = 0; /** Notify that shape-intrinsic animations are now disabled. - + @return true, if this event was processed by anybody. If false is returned, no handler processed this event (and probably, nothing will happen at all) diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 6cbec95fb802..ff2f43f1ba0f 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -1,7 +1,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 @@ -53,9 +53,9 @@ namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } -namespace basegfx -{ - class B2DRange; +namespace basegfx +{ + class B2DRange; class B2DVector; class B2IVector; class B2DHomMatrix; @@ -90,7 +90,7 @@ namespace slideshow reinterpret_cast< ::std::ptrdiff_t >(p) ); return d + (d >> 3); } - + // xxx todo: shift to namespace com::sun::star::uno when // 1.33 is available template <typename T> @@ -114,68 +114,68 @@ namespace slideshow /// loop, but play backwards from end to start CYCLE_PINGPONGLOOP }; - - + + // Value extraction from Any // ========================= /// extract unary double value from Any - bool extractValue( double& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( double& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract int from Any - bool extractValue( sal_Int32& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( sal_Int32& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract enum/constant group value from Any - bool extractValue( sal_Int16& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( sal_Int16& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any - bool extractValue( RGBColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( RGBColor& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract color value from Any - bool extractValue( HSLColor& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( HSLColor& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract plain string from Any - bool extractValue( ::rtl::OUString& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( ::rtl::OUString& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract bool value from Any - bool extractValue( bool& o_rValue, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( bool& o_rValue, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /// extract double 2-tuple from Any - bool extractValue( basegfx::B2DTuple& o_rPair, - const ::com::sun::star::uno::Any& rSourceAny, - const boost::shared_ptr<Shape>& rShape, - const basegfx::B2DVector& rSlideBounds ); + bool extractValue( basegfx::B2DTuple& o_rPair, + const ::com::sun::star::uno::Any& rSourceAny, + const boost::shared_ptr<Shape>& rShape, + const basegfx::B2DVector& rSlideBounds ); /** Search a sequence of NamedValues for a given element. @return true, if the sequence contains the specified element. */ - bool findNamedValue( ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue > const& rSequence, - const ::com::sun::star::beans::NamedValue& rSearchKey ); - + bool findNamedValue( ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::NamedValue > const& rSequence, + const ::com::sun::star::beans::NamedValue& rSearchKey ); + /** Search a sequence of NamedValues for an element with a given name. @param o_pRet @@ -185,10 +185,10 @@ namespace slideshow @return true, if the sequence contains the specified element. */ - bool findNamedValue( ::com::sun::star::beans::NamedValue* o_pRet, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue >& rSequence, - const ::rtl::OUString& rSearchString ); + bool findNamedValue( ::com::sun::star::beans::NamedValue* o_pRet, + const ::com::sun::star::uno::Sequence< + ::com::sun::star::beans::NamedValue >& rSequence, + const ::rtl::OUString& rSearchString ); basegfx::B2DRange calcRelativeShapeBounds( const basegfx::B2DVector& rPageSize, const basegfx::B2DRange& rShapeBounds ); @@ -198,12 +198,12 @@ namespace slideshow @param rBounds Original shape bound rect (to substitute default attribute layer values) - + @param pAttr Attribute set. Might be NULL (then, rBounds is used to set a simple scale and translate of the unit rect to rBounds). */ - basegfx::B2DHomMatrix getShapeTransformation( + basegfx::B2DHomMatrix getShapeTransformation( const basegfx::B2DRange& rBounds, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -211,7 +211,7 @@ namespace slideshow @param rPixelSize Pixel size of the sprite - + @param rOrigSize Original shape size (i.e. the size of the actual sprite content, in the user coordinate system) @@ -222,7 +222,7 @@ namespace slideshow @return the transformation to be applied to the sprite. */ - basegfx::B2DHomMatrix getSpriteTransformation( + basegfx::B2DHomMatrix getSpriteTransformation( const basegfx::B2DVector& rPixelSize, const basegfx::B2DVector& rOrigSize, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -245,9 +245,9 @@ namespace slideshow @param pAttr Current shape attributes */ - basegfx::B2DRange getShapeUpdateArea( + basegfx::B2DRange getShapeUpdateArea( const basegfx::B2DRange& rUnitBounds, - const basegfx::B2DHomMatrix& rShapeTransform, + const basegfx::B2DHomMatrix& rShapeTransform, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); /** Calc update area for a shape. @@ -279,7 +279,7 @@ namespace slideshow it as if aBounds.getMinimum() is the output position and aBounds.getRange() the scaling of the shape. */ - basegfx::B2DRange getShapePosSize( + basegfx::B2DRange getShapePosSize( const basegfx::B2DRange& rOrigBounds, const boost::shared_ptr<ShapeAttributeLayer>& pAttr ); @@ -289,7 +289,7 @@ namespace slideshow /** Convert an IntSRGBA to plain UNO API 32 bit int */ sal_Int32 RGBAColor2UnoColor( cppcanvas::Color::IntSRGBA ); - + /** Fill a plain rectangle on the given canvas with the given color */ void fillRect( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, @@ -300,14 +300,14 @@ namespace slideshow */ void initSlideBackground( const boost::shared_ptr< cppcanvas::Canvas >& rCanvas, const basegfx::B2IVector& rSize ); - + /// Gets a random ordinal [0,n) inline ::std::size_t getRandomOrdinal( const ::std::size_t n ) { return static_cast< ::std::size_t >( double(n) * rand() / (RAND_MAX + 1.0) ); } - + /// To work around ternary operator in initializer lists /// (Solaris compiler problems) template <typename T> @@ -319,12 +319,12 @@ namespace slideshow else return arg2; } - + template <typename ValueType> inline bool getPropertyValue( - ValueType & rValue, + ValueType & rValue, com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + com::sun::star::beans::XPropertySet> const & xPropSet, rtl::OUString const & propName ) { try { @@ -342,11 +342,11 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (com::sun::star::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (com::sun::star::uno::Exception &) { return false; } @@ -354,18 +354,18 @@ namespace slideshow template <typename ValueType> inline bool getPropertyValue( - com::sun::star::uno::Reference< ValueType >& rIfc, + com::sun::star::uno::Reference< ValueType >& rIfc, com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> const & xPropSet, + com::sun::star::beans::XPropertySet> const & xPropSet, rtl::OUString const & propName ) { - try + try { - const com::sun::star::uno::Any& a( + const com::sun::star::uno::Any& a( xPropSet->getPropertyValue( propName )); rIfc.set( a, com::sun::star::uno::UNO_QUERY ); - + bool const bRet = rIfc.is(); #if OSL_DEBUG_LEVEL > 0 if( !bRet ) @@ -378,22 +378,22 @@ namespace slideshow #endif return bRet; } - catch (com::sun::star::uno::RuntimeException &) + catch (com::sun::star::uno::RuntimeException &) { throw; } - catch (com::sun::star::uno::Exception &) + catch (com::sun::star::uno::Exception &) { return false; } } /// Get the content of the BoundRect shape property - basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference< + basegfx::B2DRange getAPIShapeBounds( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); /// Get the content of the ZOrder shape property - double getAPIShapePrio( const ::com::sun::star::uno::Reference< + double getAPIShapePrio( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); basegfx::B2IVector getSlideSizePixel( const basegfx::B2DVector& rSize, diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx index d9a6683d31e6..51f0d403aaca 100644 --- a/slideshow/source/inc/transitionfactory.hxx +++ b/slideshow/source/inc/transitionfactory.hxx @@ -1,7 +1,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 @@ -73,11 +73,11 @@ namespace slideshow transition effect */ static AnimationActivitySharedPtr createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition ); @@ -115,29 +115,29 @@ namespace slideshow ScreenUpdater& rScreenUpdater, EventMultiplexer& rEventMultiplexer, const com::sun::star::uno::Reference< - com::sun::star::presentation::XTransitionFactory>& + com::sun::star::presentation::XTransitionFactory>& xOptionalFactory, sal_Int16 nTransitionType, sal_Int16 nTransitionSubType, bool bTransitionDirection, const RGBColor& rTransitionFadeColor, const SoundPlayerSharedPtr& rSoundPlayer ); - + private: static const TransitionInfo* getTransitionInfo( sal_Int16 nTransitionType, sal_Int16 nTransitionSubType ); static const TransitionInfo* getRandomTransitionInfo(); static AnimationActivitySharedPtr createShapeTransition( - const ActivitiesFactory::CommonParameters& rParms, - const AnimatableShapeSharedPtr& rShape, - const ShapeManagerSharedPtr& rShapeManager, + const ActivitiesFactory::CommonParameters& rParms, + const AnimatableShapeSharedPtr& rShape, + const ShapeManagerSharedPtr& rShapeManager, const ::basegfx::B2DVector& rSlideSize, - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > const& xTransition, - sal_Int16 nTransitionType, - sal_Int16 nTransitionSubType ); - + sal_Int16 nTransitionType, + sal_Int16 nTransitionSubType ); + // static factory TransitionFactory(); ~TransitionFactory(); diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx index bc0076c7aff1..95129db49c56 100644 --- a/slideshow/source/inc/transitioninfo.hxx +++ b/slideshow/source/inc/transitioninfo.hxx @@ -1,7 +1,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 @@ -35,47 +35,47 @@ namespace slideshow { namespace internal { struct TransitionInfo -{ +{ // the following two member serve as the search key // for an incoming XTransitionFilter node // // { - + sal_Int16 mnTransitionType; sal_Int16 mnTransitionSubType; - + // } // - + /** This enum classifies a transition type */ enum TransitionClass - { + { /// Invalid type TRANSITION_INVALID, - + /// Transition expressed by parametric clip polygon TRANSITION_CLIP_POLYPOLYGON, - + /// Transition expressed by hand-crafted function TRANSITION_SPECIAL }; - + /// class of effect handling TransitionClass meTransitionClass; - + /// Rotation angle of clip polygon double mnRotationAngle; - + /// X scaling of clip polygon (negative values mirror) double mnScaleX; - + /// Y scaling of clip polygon (negative values mirror) double mnScaleY; - + /** This enum determines the method how to reverse a parametric clip polygon transition. - + A reversed transition runs in the geometrically opposite direction. For a left-to-right bar wipe, the reversed transition is a right-to-left wipe, whereas @@ -89,39 +89,39 @@ struct TransitionInfo (if it has no sensible meaning for this transition) */ REVERSEMETHOD_IGNORE, - + /** Revert by changing the direction of the parameter sweep (from 1->0 instead of 0->1) */ REVERSEMETHOD_INVERT_SWEEP, - + /** Revert by subtracting the generated polygon from the target bound rect */ REVERSEMETHOD_SUBTRACT_POLYGON, - + /** Combination of REVERSEMETHOD_INVERT_SWEEP and REVERSEMETHOD_SUBTRACT_POLYGON. */ REVERSEMETHOD_SUBTRACT_AND_INVERT, - + /// Reverse by rotating polygon 180 degrees REVERSEMETHOD_ROTATE_180, - + /// Reverse by flipping polygon at the y (!) axis REVERSEMETHOD_FLIP_X, - + /// Reverse by flipping polygon at the x (!) axis REVERSEMETHOD_FLIP_Y }; - + /** Indicating the method to use when transition should be 'reversed'. - + @see ReverseMethod */ ReverseMethod meReverseMethod; - + /** When true, transition 'out' effects are realized by inverting the parameter sweep direction (1->0 instead of 0->1). Otherwise, 'out' effects are @@ -129,14 +129,14 @@ struct TransitionInfo the parametric poly-polygon. */ bool mbOutInvertsSweep; - + /** when true, scale clip polygon isotrophically to target size. when false, scale is anisotrophically. */ bool mbScaleIsotrophically; - - + + /// Compare against type and subtype class Comparator { diff --git a/slideshow/source/inc/unoview.hxx b/slideshow/source/inc/unoview.hxx index c9c02b712c4c..aac543e555d3 100644 --- a/slideshow/source/inc/unoview.hxx +++ b/slideshow/source/inc/unoview.hxx @@ -1,7 +1,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 @@ -57,9 +57,9 @@ namespace slideshow /** Retrieve the underlying UNO slide view. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView > getUnoView() const = 0; - + /** Dispose view - + This needs to be different from Disposable interface, as the UNO XComponent also provides a dispose() (only with a different calling convention under Windows). @@ -77,8 +77,8 @@ namespace slideshow virtual void setIsSoundEnabled (const bool bValue) = 0; }; - typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; - typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; + typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr; + typedef ::std::vector< UnoViewSharedPtr > UnoViewVector; } } diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx index a459b290b257..71ebc57345cf 100644 --- a/slideshow/source/inc/unoviewcontainer.hxx +++ b/slideshow/source/inc/unoviewcontainer.hxx @@ -1,7 +1,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 @@ -38,7 +38,7 @@ #include "unoview.hxx" -namespace com { namespace sun { namespace star { namespace presentation +namespace com { namespace sun { namespace star { namespace presentation { class XSlideShowView; } } } } @@ -77,7 +77,7 @@ namespace slideshow removed, and an empty shared_ptr otherwise (e.g. if this view wasn't added in the first place) */ - UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference< + UnoViewSharedPtr removeView( const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowView >& xView ); /// Dispose all stored views. Implies clear(). @@ -91,15 +91,15 @@ namespace slideshow void clear() { maViews.clear(); } - - UnoViewVector::iterator begin() { return maViews.begin(); } - UnoViewVector::const_iterator begin() const { return maViews.begin(); } - UnoViewVector::iterator end() { return maViews.end(); } - UnoViewVector::const_iterator end() const { return maViews.end(); } + + UnoViewVector::iterator begin() { return maViews.begin(); } + UnoViewVector::const_iterator begin() const { return maViews.begin(); } + UnoViewVector::iterator end() { return maViews.end(); } + UnoViewVector::const_iterator end() const { return maViews.end(); } private: /// All added views - UnoViewVector maViews; + UnoViewVector maViews; }; typedef ::boost::shared_ptr< UnoViewContainer > UnoViewContainerSharedPtr; diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index 851afa64b423..63f7965b58a9 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -1,7 +1,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 @@ -52,14 +52,14 @@ class MouseEnterHandler; class MouseLeaveHandler; /** This class schedules user-activated events. - + This class registeres at the EventMultiplexer and fires events registered for certain user actions. Note that all events will not be fired immediately after the user action occured, but always added to the EventQueue (and fired the next time that queue is processed). Which is actually a feature. - + Conceptually, an event is an object that typically is fired only once. After that, the event is exhausted, and should be discarded. Therefore, all events registered on @@ -70,11 +70,11 @@ class UserEventQueue : private ::boost::noncopyable { public: /** Create a user event queue - + @param rEventMultiplexer The slideshow-global event source, where this class registeres its event handlers. - + @param rEventQueue Reference to the main event queue. Since we hold this object by plain reference, it must live longer than we @@ -91,22 +91,22 @@ public: EventQueue& rEventQueue, CursorManager& rCursorManager ); ~UserEventQueue(); - + /** Query whether there are any events still pending. */ bool isEmpty() const; - + /** Clear all registered events. - + This method clears all registered, but not-yet-executed events. This comes in handy when force-ending a slide, to avoid interference with the next slide's event registration. */ void clear(); - + /** Set advance on click behaviour. - + @param bAdvanceOnClick When true, a click somewhere on the slide will also generate next effect event. In this case, it is @@ -114,28 +114,28 @@ public: i.e. the shape need not be hit by the mouse. */ void setAdvanceOnClick( bool bAdvanceOnClick ); - + /** Register an event that will be fired when the slide is just shown. - + Note that <em>all</em> registered events will be fired when the slide start occurs. This is in contrast to the mouse events below. */ void registerSlideStartEvent( const EventSharedPtr& rEvent ); - + /** Register an event that will be fired when the slide is about to vanish. - + Note that <em>all</em> registered events will be fired when the slide end occurs. This is in contrast to the mouse events below. */ void registerSlideEndEvent( const EventSharedPtr& rEvent ); - + /** Register an event that will be fired when the given animation node starts. - + Note that <em>all</em> registered events will be fired when the animation start occurs. This is in contrast to the mouse events below. @@ -144,10 +144,10 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that will be fired when the given animation node ends its active duration. - + Note that <em>all</em> registered events will be fired when the animation end occurs. This is in contrast to the mouse events below. @@ -156,10 +156,10 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that will be fired when audio output stopped for the given animation node. - + Note that <em>all</em> registered events will be fired when the audio stopping occurs. This is in contrast to the mouse events below. @@ -168,9 +168,9 @@ public: const EventSharedPtr& rEvent, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode>& xNode ); - + /** Register an event that is fired when a shape is clicked - + For every mouse click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -179,7 +179,7 @@ public: */ void registerShapeClickEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Registes an event that is fired when the current effects(s) are skipped, .e.g. when the left mouse button is pressed. Then, all registered events are fired and removed from this @@ -195,16 +195,16 @@ public: void registerSkipEffectEvent( EventSharedPtr const& pEvent, const bool bSkipTriggersNextEffect); - + /** Registes an event that is fired when the current effects(s) are rewound, .e.g. when the right mouse button is pressed. Then, all registered events are fired and removed from this queue. */ void registerRewindEffectEvent( EventSharedPtr const& rEvent ); - + /** Register an event that is fired to show the next event - + For every next effect event, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -217,10 +217,10 @@ public: not be hit by the mouse. */ void registerNextEffectEvent( const EventSharedPtr& rEvent ); - + /** Register an event that is fired on a double mouse click on a shape - + For every mouse double click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -231,9 +231,9 @@ public: */ void registerShapeDoubleClickEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Register an event that is fired on a double mouse click - + For every mouse double click, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event @@ -243,10 +243,10 @@ public: the mouse. */ void registerDoubleClickEvent( const EventSharedPtr& rEvent ); - + /** Register an event that is fired when the mouse enters the area of the given shape - + For every enter, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event registered will @@ -255,10 +255,10 @@ public: */ void registerMouseEnterEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - + /** Register an event that is fired when the mouse leaves the area of the given shape - + For every leave, only one of the events registered here is fired. The order of fired events is the order of registration, i.e. the first event registered will @@ -276,29 +276,29 @@ public: private: /** Generically register an event on one of the handlers. - + If the handler is not yet created, do that and register it via the Functor */ - template< typename Handler, typename Functor > + template< typename Handler, typename Functor > void registerEvent( ::boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, const Functor& rRegistrationFunctor ); - + /** Generically register an event on one of the handlers. - + If the handler is not yet created, do that and register it via the Functor. This version of the registerEvent method takes an additional parameter rArg, which is passed as the second argument to rHandler's addEvent() method. */ - template< typename Handler, typename Arg, typename Functor > + template< typename Handler, typename Arg, typename Functor > void registerEvent( ::boost::shared_ptr< Handler >& rHandler, const EventSharedPtr& rEvent, const Arg& rArg, const Functor& rRegistrationFunctor ); - + EventMultiplexer& mrMultiplexer; EventQueue& mrEventQueue; CursorManager& mrCursorManager; @@ -316,7 +316,7 @@ private: ::boost::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler; ::boost::shared_ptr<MouseEnterHandler> mpMouseEnterHandler; ::boost::shared_ptr<MouseLeaveHandler> mpMouseLeaveHandler; - + bool mbAdvanceOnClick; }; diff --git a/slideshow/source/inc/userpainteventhandler.hxx b/slideshow/source/inc/userpainteventhandler.hxx index 5a4c567f52cc..471c2b35c706 100644 --- a/slideshow/source/inc/userpainteventhandler.hxx +++ b/slideshow/source/inc/userpainteventhandler.hxx @@ -1,7 +1,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 @@ -37,7 +37,7 @@ namespace slideshow namespace internal { class RGBColor; - + /** Interface for handling user paint state changes. Classes implementing this interface can be added to an diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx index 6df52ee14114..60c514b7b7d2 100644 --- a/slideshow/source/inc/view.hxx +++ b/slideshow/source/inc/view.hxx @@ -1,7 +1,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 @@ -47,7 +47,7 @@ namespace slideshow { public: /** Create a new view layer for this view - + @param rLayerBounds Specifies the bound rect of the layer relative to the user view coordinate system. @@ -79,7 +79,7 @@ namespace slideshow virtual void setViewSize( const ::basegfx::B2DVector& ) = 0; /** Change the view's mouse cursor. - + @param nPointerShape One of the ::com::sun::star::awt::SystemPointer constant group members. @@ -87,8 +87,8 @@ namespace slideshow virtual void setCursorShape( sal_Int16 nPointerShape ) = 0; }; - typedef ::boost::shared_ptr< View > ViewSharedPtr; - typedef ::std::vector< ViewSharedPtr > ViewVector; + typedef ::boost::shared_ptr< View > ViewSharedPtr; + typedef ::std::vector< ViewSharedPtr > ViewVector; } } diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx index 18f2e931e580..93ed651ad653 100644 --- a/slideshow/source/inc/vieweventhandler.hxx +++ b/slideshow/source/inc/vieweventhandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx index 54aa4c4eaa68..fd6adf88ab22 100644 --- a/slideshow/source/inc/viewlayer.hxx +++ b/slideshow/source/inc/viewlayer.hxx @@ -1,7 +1,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 @@ -31,17 +31,17 @@ #include <sal/config.h> #include <boost/shared_ptr.hpp> -namespace basegfx -{ - class B1DRange; - class B2DRange; +namespace basegfx +{ + class B1DRange; + class B2DRange; class B2DVector; class B2DHomMatrix; class B2DPolyPolygon; } namespace cppcanvas -{ - class Canvas; +{ + class Canvas; class CustomSprite; } @@ -116,7 +116,7 @@ namespace slideshow layer, i.e. the z position in relation to other layers on the parent view. The higher the priority range, the further in front the layer resides. - + @param rRange Priority range, must be in the range [0,1] */ diff --git a/slideshow/source/inc/viewrepainthandler.hxx b/slideshow/source/inc/viewrepainthandler.hxx index f66ffd5819d5..6720a33b8f01 100644 --- a/slideshow/source/inc/viewrepainthandler.hxx +++ b/slideshow/source/inc/viewrepainthandler.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/viewupdate.hxx b/slideshow/source/inc/viewupdate.hxx index 52f048d99ae0..7656a311d1c0 100644 --- a/slideshow/source/inc/viewupdate.hxx +++ b/slideshow/source/inc/viewupdate.hxx @@ -1,7 +1,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 diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx index 58e818a91459..0ae0729a5cfb 100644 --- a/slideshow/source/inc/wakeupevent.hxx +++ b/slideshow/source/inc/wakeupevent.hxx @@ -1,7 +1,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 @@ -40,7 +40,7 @@ namespace internal { /** Little helper class, used to set Activities active again after some sleep period. - + Clients can use this class to schedule wakeup events at the EventQueue, to avoid busy-waiting for the next discrete time instant. @@ -52,17 +52,17 @@ public: WakeupEvent( ::boost::shared_ptr< ::canvas::tools::ElapsedTime > const& pTimeBase, ActivitiesQueue & rActivityQueue ); - + virtual void dispose(); virtual bool fire(); virtual bool isCharged() const; virtual double getActivationTime( double nCurrentTime ) const; - + /// Start the internal timer void start(); - + /** Set the next timeout this object should generate. - + @param nextTime Absolute time, measured from the last start() call, when this event should wakeup the Activity again. If @@ -70,14 +70,14 @@ public: every setNextTimeout() call. */ void setNextTimeout( double nextTime ); - + /** Set activity to wakeup. - + The activity given here will be reinserted into the ActivitiesQueue, once the timeout is reached. */ void setActivity( const ActivitySharedPtr& rActivity ); - + private: ::canvas::tools::ElapsedTime maTimer; double mnNextTime; |